Skip to contentSkip to conversation

Patch "tun_dst: Fix potential NULL dereference" has been added to the 4.3-stable tree

PATCH [email protected] 1 participant 1 message Nov 17, 2015

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

tun_dst: Fix potential NULL dereference

to the 4.3-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
tun_dst-fix-potential-null-dereference.patch
and it can be found in the queue-4.3 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Tue Nov 17 14:33:46 PST 2015

From: Tobias Klauser <[email protected]>
Date: Wed, 4 Nov 2015 13:49:49 +0100
Subject: tun_dst: Fix potential NULL dereference

From: Tobias Klauser <[email protected]>

[ Upstream commit f63ce5b6fa5e9a0faf7a0e1ef2993a502878c78a ]

In tun_dst_unclone() the return value of skb_metadata_dst() is checked for being NULL after it is dereferenced. Fix this by moving the dereference after the NULL check.

Found by the Coverity scanner (CID 1338068).

Fixes fc4099f17240 ("openvswitch: Fix egress tunnel info.")
Cc Pravin B Shelar <[email protected]>
---
 include/net/dst_metadata.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
include/net/dst_metadata.h +2 -1
@@ -63,12 +63,13 @@ static inline struct metadata_dst *tun_r
 static inline struct metadata_dst *tun_dst_unclone(struct sk_buff *skb)
 {
 	struct metadata_dst *md_dst = skb_metadata_dst(skb);
-	int md_size = md_dst->u.tun_info.options_len;
+	int md_size;
 	struct metadata_dst *new_md;
 
 	if (!md_dst)
 		return ERR_PTR(-EINVAL);
 
+	md_size = md_dst->u.tun_info.options_len;
 	new_md = metadata_dst_alloc(md_size, GFP_ATOMIC);
 	if (!new_md)
 		return ERR_PTR(-ENOMEM);

Patches currently in stable-queue which might be from [email protected] are

queue-4.3/tun_dst-fix-potential-null-dereference.patch