diff options
| author | Hangyu Hua <hbh25y@gmail.com> | 2022-02-28 16:36:39 +0800 |
|---|---|---|
| committer | Treehugger Robot <treehugger-gerrit@google.com> | 2022-06-23 15:42:45 +0000 |
| commit | 466e95df8c7c7fb00ccbb4fce288cd8a733f4a3a (patch) | |
| tree | 2a2181db4993d5c03b949fc858b5b970c746428d | |
| parent | 3f6b004931f024db8ec3c44a65305deb64fc3962 (diff) | |
| download | common-android-gs-raviole-5.10-t-beta-4.tar.gz | |
BACKPORT: can: ems_usb: ems_usb_start_xmit(): fix double dev_kfree_skb() in error pathandroid-t-beta-4_r0.5android-13.0.0_r0.4android-13.0.0_r0.15android-13.0.0_r0.14android-gs-raviole-5.10-t-beta-4
commit c70222752228a62135cee3409dccefd494a24646 upstream.
There is no need to call dev_kfree_skb() when usb_submit_urb() fails
beacause can_put_echo_skb() deletes the original skb and
can_free_echo_skb() deletes the cloned skb.
Bug: 228694391
Link: https://lore.kernel.org/all/20220228083639.38183-1-hbh25y@gmail.com
Fixes: 702171adeed3 ("ems_usb: Added support for EMS CPC-USB/ARM7 CAN/USB interface")
Cc: stable@vger.kernel.org
Cc: Sebastian Haas <haas@ems-wuensche.com>
Signed-off-by: Hangyu Hua <hbh25y@gmail.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Change-Id: Ia678a0b249eae6e80823461f18eb315ec5385eab
(cherry picked from commit 9292423a3e5fcf8b341ffbd135487f32f7e33d41)
| -rw-r--r-- | drivers/net/can/usb/ems_usb.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c index 249d2fba28c7..6458da9c13b9 100644 --- a/drivers/net/can/usb/ems_usb.c +++ b/drivers/net/can/usb/ems_usb.c @@ -823,7 +823,6 @@ static netdev_tx_t ems_usb_start_xmit(struct sk_buff *skb, struct net_device *ne usb_unanchor_urb(urb); usb_free_coherent(dev->udev, size, buf, urb->transfer_dma); - dev_kfree_skb(skb); atomic_dec(&dev->active_tx_urbs); |