lkml.org 
[lkml]   [2016]   [Oct]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.4 037/125] macvlan: fix leak in macvlan_handle_frame
    Date
    From: Sabrina Dubroca <sd@queasysnail.net>

    3.4.113-rc1 review patch. If anyone has any objections, please let me know.

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


    commit e639b8d8a7a728f0b05ef2df6cb6b45dc3d4e556 upstream.

    Reset pskb in macvlan_handle_frame in case skb_share_check returned a
    clone.

    Fixes: 8a4eb5734e8d ("net: introduce rx_handler results and logic around that")
    Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Zefan Li <lizefan@huawei.com>
    ---
    drivers/net/macvlan.c | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
    index 6749acf..e735239 100644
    --- a/drivers/net/macvlan.c
    +++ b/drivers/net/macvlan.c
    @@ -173,6 +173,7 @@ static rx_handler_result_t macvlan_handle_frame(struct sk_buff **pskb)
    skb = ip_check_defrag(skb, IP_DEFRAG_MACVLAN);
    if (!skb)
    return RX_HANDLER_CONSUMED;
    + *pskb = skb;
    eth = eth_hdr(skb);
    src = macvlan_hash_lookup(port, eth->h_source);
    if (!src)
    @@ -222,6 +223,7 @@ static rx_handler_result_t macvlan_handle_frame(struct sk_buff **pskb)
    if (!skb)
    goto out;

    + *pskb = skb;
    skb->dev = dev;
    skb->pkt_type = PACKET_HOST;

    --
    1.9.1
    \
     
     \ /
      Last update: 2016-10-12 14:47    [W:4.107 / U:0.304 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site