net: cdc_eem: fix tx fixup skb leak
Subsystems (5)
PATCH v2 1/1 net: cdc_eem: fix tx fixup skb leak
when usbnet transmit a skb, eem fixup it in eem_tx_fixup(), if skb_copy_expand() failed, it return NULL, usbnet_start_xmit() will have no chance to free original skb.
fix it by free orginal skb in eem_tx_fixup() first, then check skb clone status, if failed, return NULL to usbnet.
---
v2: add Fixes tag
drivers/net/usb/cdc_eem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/usb/cdc_eem.c +1 -1
@@ -123,10 +123,10 @@ static struct sk_buff *eem_tx_fixup(struct usbnet *dev, struct sk_buff *skb, } skb2 =skb_copy_expand (skb,EEM_HEAD ,ETH_FCS_LEN + padlen, flags); +dev_kfree_skb_any (skb);if (!skb2)return NULL ; -dev_kfree_skb_any (skb); skb = skb2; done:
Signature · 1 line
2.25.1
Quoted 35 lines · Linyu Yuan
when usbnet transmit a skb, eem fixup it in
eem_tx_fixup(), ifskb_copy_expand()failed, it return NULL,usbnet_start_xmit()will have no chance to free original skb.fix it by free orginal skb in
eem_tx_fixup()first, then check skb clone status, if failed, return NULL to usbnet.Fixes 9f722c0978b0 ("usbnet: CDC EEM support (v5)")Signed-off-by Linyu Yuan <[email protected]>---
v2: add Fixes tag
drivers/net/usb/cdc_eem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/net/usb/cdc_eem.c +1
-1@@ -123,10 +123,10 @@ static struct sk_buff *eem_tx_fixup(struct usbnet *dev, struct sk_buff *skb, } skb2 =skb_copy_expand (skb,EEM_HEAD ,ETH_FCS_LEN + padlen, flags); +dev_kfree_skb_any (skb);if (!skb2)return NULL ; -dev_kfree_skb_any (skb); skb = skb2; done:Signature · 1 line
2.25.1
This patch was applied to netdev/net.git (refs/heads/master):
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
Quoted 8 lines · On Thu, 17 Jun 2021 07:32:32 +0800 you wrote:
when usbnet transmit a skb, eem fixup it in
eem_tx_fixup(), ifskb_copy_expand()failed, it return NULL,usbnet_start_xmit()will have no chance to free original skb.fix it by free orginal skb in
eem_tx_fixup()first, then check skb clone status, if failed, return NULL to usbnet.[...]
Here is the summary with links:
- [v2] net: cdc_eem: fix tx fixup skb leak
https://git.kernel.org/netdev/net/c/c3b26fdf1b32
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html