summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLi RongQing <roy.qing.li@gmail.com>2014-10-17 14:06:16 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-14 08:59:43 -0800
commit102c052fd16e1e73fe2d69028f7c13e1b52571c8 (patch)
tree643dcf74a6a24dce6b4043a1610b163191c99241
parent6f75e2f9f7657c9462b2268c2ff97f93bfa2d3c8 (diff)
downloadlinux-stable-102c052fd16e1e73fe2d69028f7c13e1b52571c8.tar.gz
linux-stable-102c052fd16e1e73fe2d69028f7c13e1b52571c8.tar.bz2
linux-stable-102c052fd16e1e73fe2d69028f7c13e1b52571c8.zip
vxlan: fix a free after use
[ Upstream commit 7a9f526fc3ee49b6034af2f243676ee0a27dcaa8 ] pskb_may_pull maybe change skb->data and make eth pointer oboslete, so eth needs to reload Fixes: 91269e390d062 ("vxlan: using pskb_may_pull as early as possible") Cc: Eric Dumazet <edumazet@google.com> Signed-off-by: Li RongQing <roy.qing.li@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/vxlan.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index e1b4e00430ce..0704a0402897 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -1986,6 +1986,7 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
msg->icmph.icmp6_type == NDISC_NEIGHBOUR_SOLICITATION)
return neigh_reduce(dev, skb);
}
+ eth = eth_hdr(skb);
#endif
}