lkml.org 
[lkml]   [2014]   [Dec]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13.y-ckt 04/96] vxlan: fix a use after free in vxlan_encap_bypass
    Date
    3.13.11-ckt13 -stable review patch.  If anyone has any objections, please let me know.

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

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

    [ Upstream commit ce6502a8f9572179f044a4d62667c4645256d6e4 ]

    when netif_rx() is done, the netif_rx handled skb maybe be freed,
    and should not be used.

    Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/net/vxlan.c | 8 +++++---
    1 file changed, 5 insertions(+), 3 deletions(-)

    diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
    index 5543eb1..311d63d 100644
    --- a/drivers/net/vxlan.c
    +++ b/drivers/net/vxlan.c
    @@ -1679,6 +1679,8 @@ static void vxlan_encap_bypass(struct sk_buff *skb, struct vxlan_dev *src_vxlan,
    struct pcpu_tstats *rx_stats = this_cpu_ptr(dst_vxlan->dev->tstats);
    union vxlan_addr loopback;
    union vxlan_addr *remote_ip = &dst_vxlan->default_dst.remote_ip;
    + struct net_device *dev = skb->dev;
    + int len = skb->len;

    skb->pkt_type = PACKET_HOST;
    skb->encapsulation = 0;
    @@ -1700,16 +1702,16 @@ static void vxlan_encap_bypass(struct sk_buff *skb, struct vxlan_dev *src_vxlan,

    u64_stats_update_begin(&tx_stats->syncp);
    tx_stats->tx_packets++;
    - tx_stats->tx_bytes += skb->len;
    + tx_stats->tx_bytes += len;
    u64_stats_update_end(&tx_stats->syncp);

    if (netif_rx(skb) == NET_RX_SUCCESS) {
    u64_stats_update_begin(&rx_stats->syncp);
    rx_stats->rx_packets++;
    - rx_stats->rx_bytes += skb->len;
    + rx_stats->rx_bytes += len;
    u64_stats_update_end(&rx_stats->syncp);
    } else {
    - skb->dev->stats.rx_dropped++;
    + dev->stats.rx_dropped++;
    }
    }

    --
    1.9.1


    \
     
     \ /
      Last update: 2014-12-15 21:21    [W:2.760 / U:0.124 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site