From: Linyu Yuan <linyyuan@codeaurora•org>
To: Oliver Neukum <oliver@neukum•org>,
"David S . Miller" <davem@davemloft•net>,
Jakub Kicinski <kuba@kernel•org>
Cc: linux-usb@vger•kernel.org, netdev@vger•kernel.org,
Linyu Yuan <linyyuan@codeaurora•org>
Subject: [PATCH] net: cdc_eem: fix tx fixup skb leak
Date: Wed, 16 Jun 2021 22:40:44 +0800 [thread overview]
Message-ID: <20210616144044.20693-1-linyyuan@codeaurora.org> (raw)
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
next reply other threads:[~2021-06-16 14:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-16 14:40 Linyu Yuan [this message]
2021-06-16 15:05 ` [PATCH] net: cdc_eem: fix tx fixup skb leak Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210616144044.20693-1-linyyuan@codeaurora.org \
--to=linyyuan@codeaurora$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=kuba@kernel$(echo .)org \
--cc=linux-usb@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=oliver@neukum$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox