diff options
author | Linyu Yuan <linyyuan@codeaurora.org> | 2021-06-17 07:32:32 +0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-06-23 14:41:26 +0200 |
commit | 81de2ed06df8b5451e050fe6a318af3263dbff3f (patch) | |
tree | 6850a4c9effc840464c2ebc9142eee8bdeef5ade | |
parent | a49cbb762ef20655f5c91abdc13658b0af5e159d (diff) | |
download | linux-stable-81de2ed06df8b5451e050fe6a318af3263dbff3f.tar.gz linux-stable-81de2ed06df8b5451e050fe6a318af3263dbff3f.tar.bz2 linux-stable-81de2ed06df8b5451e050fe6a318af3263dbff3f.zip |
net: cdc_eem: fix tx fixup skb leak
[ Upstream commit c3b26fdf1b32f91c7a3bc743384b4a298ab53ad7 ]
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.
Fixes: 9f722c0978b0 ("usbnet: CDC EEM support (v5)")
Signed-off-by: Linyu Yuan <linyyuan@codeaurora.org>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r-- | drivers/net/usb/cdc_eem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/usb/cdc_eem.c b/drivers/net/usb/cdc_eem.c index 0eeec80bec31..e4a570366646 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: |