* [PATCH] net: cdc_eem: fix tx fixup skb leak
@ 2021-06-16 14:40 Linyu Yuan
2021-06-16 15:05 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Linyu Yuan @ 2021-06-16 14:40 UTC (permalink / raw)
To: Oliver Neukum, David S . Miller, Jakub Kicinski
Cc: linux-usb, netdev, Linyu Yuan
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.
Signed-off-by: Linyu Yuan <linyyuan@codeaurora.org>
---
drivers/net/usb/cdc_eem.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/usb/cdc_eem.c b/drivers/net/usb/cdc_eem.c
index 2e60bc1b9a6b..359ea0d10e59 100644
--- a/drivers/net/usb/cdc_eem.c
+++ b/drivers/net/usb/cdc_eem.c
@@ -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:
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] net: cdc_eem: fix tx fixup skb leak
2021-06-16 14:40 [PATCH] net: cdc_eem: fix tx fixup skb leak Linyu Yuan
@ 2021-06-16 15:05 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2021-06-16 15:05 UTC (permalink / raw)
To: Linyu Yuan
Cc: Oliver Neukum, David S . Miller, Jakub Kicinski, linux-usb, netdev
On Wed, Jun 16, 2021 at 10:40:44PM +0800, Linyu Yuan wrote:
> 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.
>
> Signed-off-by: Linyu Yuan <linyyuan@codeaurora.org>
> ---
> drivers/net/usb/cdc_eem.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
What commit does this "Fix:"? Can you please add that to the
signed-off-by area?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-06-16 15:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-16 14:40 [PATCH] net: cdc_eem: fix tx fixup skb leak Linyu Yuan
2021-06-16 15:05 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).