github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 22:52:35 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Revert "drivers/net/wan/hdlc_fr: Fix a double free in pvc_xmit"

Browse Source 
commit d362fd0be4 upstream.

This reverts commit 1b479fb801
("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: 1b479fb801 ("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>
This commit is contained in:
Xie He 2021-05-02 20:51:36 -07:00 committed by Greg Kroah-Hartman
parent 96e308a36e
commit 545dbb1bbe
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/wan/hdlc_fr.c
View File

@ -415,7 +415,7 @@ static netdev_tx_t pvc_xmit(struct sk_buff *skb, struct net_device *dev)
if (pad > 0) { /* Pad the frame with zeros */ if (pad > 0) { /* Pad the frame with zeros */
if (__skb_pad(skb, pad, false)) if (__skb_pad(skb, pad, false))
goto out; goto drop;
skb_put(skb, pad); skb_put(skb, pad);
} }
} }
@ -448,9 +448,8 @@ static netdev_tx_t pvc_xmit(struct sk_buff *skb, struct net_device *dev)
return NETDEV_TX_OK; return NETDEV_TX_OK;
drop: drop:
kfree_skb(skb);
out:
dev->stats.tx_dropped++; dev->stats.tx_dropped++;
kfree_skb(skb);
return NETDEV_TX_OK; return NETDEV_TX_OK;
} }