From: Marc Kleine-Budde <mkl@pengutronix.de>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, linux-can@vger.kernel.org,
kernel@pengutronix.de,
Stephane Grosjean <s.grosjean@peak-system.com>,
linux-stable <stable@vger.kernel.org>,
Marc Kleine-Budde <mkl@pengutronix.de>
Subject: [PATCH 6/7] can: peak_usb: fix potential double kfree_skb()
Date: Wed, 24 Jul 2019 15:03:21 +0200 [thread overview]
Message-ID: <20190724130322.31702-7-mkl@pengutronix.de> (raw)
In-Reply-To: <20190724130322.31702-1-mkl@pengutronix.de>
From: Stephane Grosjean <s.grosjean@peak-system.com>
When closing the CAN device while tx skbs are inflight, echo skb could
be released twice. By calling close_candev() before unlinking all
pending tx urbs, then the internal echo_skb[] array is fully and
correctly cleared before the USB write callback and, therefore,
can_get_echo_skb() are called, for each aborted URB.
Fixes: bb4785551f64 ("can: usb: PEAK-System Technik USB adapters driver core")
Signed-off-by: Stephane Grosjean <s.grosjean@peak-system.com>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/usb/peak_usb/pcan_usb_core.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_core.c b/drivers/net/can/usb/peak_usb/pcan_usb_core.c
index 458154c9b482..22b9c8e6d040 100644
--- a/drivers/net/can/usb/peak_usb/pcan_usb_core.c
+++ b/drivers/net/can/usb/peak_usb/pcan_usb_core.c
@@ -568,16 +568,16 @@ static int peak_usb_ndo_stop(struct net_device *netdev)
dev->state &= ~PCAN_USB_STATE_STARTED;
netif_stop_queue(netdev);
+ close_candev(netdev);
+
+ dev->can.state = CAN_STATE_STOPPED;
+
/* unlink all pending urbs and free used memory */
peak_usb_unlink_all_urbs(dev);
if (dev->adapter->dev_stop)
dev->adapter->dev_stop(dev);
- close_candev(netdev);
-
- dev->can.state = CAN_STATE_STOPPED;
-
/* can set bus off now */
if (dev->adapter->dev_set_bus) {
int err = dev->adapter->dev_set_bus(dev, 0);
--
2.20.1
next prev parent reply other threads:[~2019-07-24 13:03 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-24 13:03 pull-request: can 2019-07-24 Marc Kleine-Budde
2019-07-24 13:03 ` [PATCH 1/7] can: dev: call netif_carrier_off() in register_candev() Marc Kleine-Budde
2019-07-24 13:03 ` [PATCH 2/7] can: rcar_canfd: fix possible IRQ storm on high load Marc Kleine-Budde
[not found] ` <20190724210328.D91DF21873@mail.kernel.org>
2019-07-25 13:29 ` Nikita Yushchenko
2019-07-25 13:41 ` Marc Kleine-Budde
2019-07-24 13:03 ` [PATCH 3/7] can: mcp251x: add error check when wq alloc failed Marc Kleine-Budde
2019-07-24 13:03 ` [PATCH 4/7] can: flexcan: fix an use-after-free in flexcan_setup_stop_mode() Marc Kleine-Budde
2019-07-24 13:03 ` [PATCH 5/7] can: flexcan: fix stop mode acknowledgment Marc Kleine-Budde
2019-07-24 13:03 ` Marc Kleine-Budde [this message]
2019-07-24 13:03 ` [PATCH 7/7] can: gw: Fix error path of cgw_module_init Marc Kleine-Budde
2019-07-24 21:15 ` pull-request: can 2019-07-24 David Miller
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=20190724130322.31702-7-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=davem@davemloft.net \
--cc=kernel@pengutronix.de \
--cc=linux-can@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=s.grosjean@peak-system.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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