lkml.org 
[lkml]   [2014]   [Nov]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.17 006/319] vxlan: using pskb_may_pull as early as possible
    Date
    3.17-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Li RongQing <roy.qing.li@gmail.com>

    [ 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@gmail.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>
    ---
    drivers/net/vxlan.c | 6 ++----
    1 file changed, 2 insertions(+), 4 deletions(-)

    --- a/drivers/net/vxlan.c
    +++ b/drivers/net/vxlan.c
    @@ -1440,9 +1440,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;
    @@ -1929,7 +1926,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;




    \
     
     \ /
      Last update: 2014-11-12 05:41    [W:6.194 / U:0.928 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site