Commit d362fd0b authored by Xie He's avatar Xie He Committed by David S. Miller
Browse files

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



This reverts commit 1b479fb8
("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: 1b479fb8 ("drivers/net/wan/hdlc_fr: Fix a double free in pvc_xmit")
Cc: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
Signed-off-by: default avatarXie He <xie.he.0141@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d89ecd15

drivers/net/wan/hdlc_fr.c

+2 −3
Original line number Diff line number Diff line
@@ -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;

}