lkml.org 
[lkml]   [2021]   [May]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.11 115/601] Revert "drivers/net/wan/hdlc_fr: Fix a double free in pvc_xmit"
    Date
    From: Xie He <xie.he.0141@gmail.com>

    commit d362fd0be456dba2d3d58a90b7a193962776562b upstream.

    This reverts commit 1b479fb80160
    ("drivers/net/wan/hdlc_fr: Fix a double free in pvc_xmit").

    1. This commit is incorrect. "__skb_pad" will NOT free the skb on
    failure when its "free_on_error" parameter is "false".

    2. This commit claims to fix my commit. But it didn't CC me??

    Fixes: 1b479fb80160 ("drivers/net/wan/hdlc_fr: Fix a double free in pvc_xmit")
    Cc: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
    Signed-off-by: Xie He <xie.he.0141@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/wan/hdlc_fr.c | 5 ++---
    1 file changed, 2 insertions(+), 3 deletions(-)

    --- a/drivers/net/wan/hdlc_fr.c
    +++ b/drivers/net/wan/hdlc_fr.c
    @@ -415,7 +415,7 @@ static netdev_tx_t pvc_xmit(struct sk_bu

    if (pad > 0) { /* Pad the frame with zeros */
    if (__skb_pad(skb, pad, false))
    - goto out;
    + goto drop;
    skb_put(skb, pad);
    }
    }
    @@ -448,9 +448,8 @@ static netdev_tx_t pvc_xmit(struct sk_bu
    return NETDEV_TX_OK;

    drop:
    - kfree_skb(skb);
    -out:
    dev->stats.tx_dropped++;
    + kfree_skb(skb);
    return NETDEV_TX_OK;
    }


    \
     
     \ /
      Last update: 2021-05-12 19:31    [W:4.038 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site