diff options
| author |   Xie He <xie.he.0141@gmail.com> | 2021-05-02 20:51:36 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-05-03 13:37:58 -0700 |
| commit | d362fd0be456dba2d3d58a90b7a193962776562b (patch) | |
| tree | 2e93152ce85df8ab7dd6caea4ef7e6e9f74281a0 /drivers/net/wan | |
| parent | Merge branch 'sctp-race-fix' (diff) | |
| download | linux-dev-d362fd0be456dba2d3d58a90b7a193962776562b.tar.xz linux-dev-d362fd0be456dba2d3d58a90b7a193962776562b.zip | |
Revert "drivers/net/wan/hdlc_fr: Fix a double free in pvc_xmit"
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>
Diffstat (limited to 'drivers/net/wan')
| -rw-r--r-- | drivers/net/wan/hdlc_fr.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c index 4d9dc7d15908..0720f5f92caa 100644 --- 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_buff *skb, struct net_device *dev) 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_buff *skb, struct net_device *dev) return NETDEV_TX_OK; drop: - kfree_skb(skb); -out: dev->stats.tx_dropped++; + kfree_skb(skb); return NETDEV_TX_OK; } |