This is a note to let you know that I've just added the patch titled
vxlan: using pskb_may_pull as early as possible
to the 3.14-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:
vxlan-using-pskb_may_pull-as-early-as-possible.patch
and it can be found in the queue-3.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Fri Nov 7 11:37:05 PST 2014
From: Li RongQing <roy.qing.li@xxxxxxxxx>
Date: Thu, 16 Oct 2014 09:17:18 +0800
Subject: vxlan: using pskb_may_pull as early as possible
From: Li RongQing <roy.qing.li@xxxxxxxxx>
[ Upstream commit 91269e390d062b526432f2ef1352b8df82e0e0bc ]
pskb_may_pull should be used to check if skb->data has enough space,
skb->len can not ensure that.
Cc: Cong Wang <xiyou.wangcong@xxxxxxxxx>
Signed-off-by: Li RongQing <roy.qing.li@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/vxlan.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -1447,9 +1447,6 @@ static int neigh_reduce(struct net_devic
if (!in6_dev)
goto out;
- if (!pskb_may_pull(skb, skb->len))
- goto out;
-
iphdr = ipv6_hdr(skb);
saddr = &iphdr->saddr;
daddr = &iphdr->daddr;
@@ -1979,7 +1976,8 @@ static netdev_tx_t vxlan_xmit(struct sk_
return arp_reduce(dev, skb);
#if IS_ENABLED(CONFIG_IPV6)
else if (ntohs(eth->h_proto) == ETH_P_IPV6 &&
- skb->len >= sizeof(struct ipv6hdr) + sizeof(struct nd_msg) &&
+ pskb_may_pull(skb, sizeof(struct ipv6hdr)
+ + sizeof(struct nd_msg)) &&
ipv6_hdr(skb)->nexthdr == IPPROTO_ICMPV6) {
struct nd_msg *msg;
Patches currently in stable-queue which might be from roy.qing.li@xxxxxxxxx are
queue-3.14/vxlan-fix-a-use-after-free-in-vxlan_encap_bypass.patch
queue-3.14/vxlan-using-pskb_may_pull-as-early-as-possible.patch
queue-3.14/vxlan-fix-a-free-after-use.patch
queue-3.14/ipv4-fix-a-potential-use-after-free-in-ip_tunnel_core.c.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html