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

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

[Xie He]

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>
---
 drivers/net/wan/hdlc_fr.c | 5 ++---
 1 file 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;
 }
 
-- 
2.27.0

Re: [PATCH net] Revert "drivers/net/wan/hdlc_fr: Fix a double free in pvc_xmit"

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net.git (refs/heads/master):

On Sun,  2 May 2021 20:51:36 -0700 you wrote:
> 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??
> 
> [...]

Here is the summary with links:
  - [net] Revert "drivers/net/wan/hdlc_fr: Fix a double free in pvc_xmit"
    https://git.kernel.org/netdev/net/c/d362fd0be456

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html