lkml.org 
[lkml]   [2020]   [Jan]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 82/91] net: usb: lan78xx: fix possible skb leak
    Date
    From: Eric Dumazet <edumazet@google.com>

    [ Upstream commit 47240ba0cd09bb6fe6db9889582048324999dfa4 ]

    If skb_linearize() fails, we need to free the skb.

    TSO makes skb bigger, and this bug might be the reason
    Raspberry Pi 3B+ users had to disable TSO.

    Fixes: 55d7de9de6c3 ("Microchip's LAN7800 family USB 2/3 to 10/100/1000 Ethernet device driver")
    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Reported-by: RENARD Pierre-Francois <pfrenard@gmail.com>
    Cc: Stefan Wahren <stefan.wahren@i2se.com>
    Cc: Woojung Huh <woojung.huh@microchip.com>
    Cc: Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/usb/lan78xx.c | 9 +++------
    1 file changed, 3 insertions(+), 6 deletions(-)

    --- a/drivers/net/usb/lan78xx.c
    +++ b/drivers/net/usb/lan78xx.c
    @@ -2407,11 +2407,6 @@ static int lan78xx_stop(struct net_devic
    return 0;
    }

    -static int lan78xx_linearize(struct sk_buff *skb)
    -{
    - return skb_linearize(skb);
    -}
    -
    static struct sk_buff *lan78xx_tx_prep(struct lan78xx_net *dev,
    struct sk_buff *skb, gfp_t flags)
    {
    @@ -2422,8 +2417,10 @@ static struct sk_buff *lan78xx_tx_prep(s
    return NULL;
    }

    - if (lan78xx_linearize(skb) < 0)
    + if (skb_linearize(skb)) {
    + dev_kfree_skb_any(skb);
    return NULL;
    + }

    tx_cmd_a = (u32)(skb->len & TX_CMD_A_LEN_MASK_) | TX_CMD_A_FCS_;


    \
     
     \ /
      Last update: 2020-01-11 11:06    [W:4.099 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site