pull-request: can 2018-03-19

pull-request: can 2018-03-19

[Marc Kleine-Budde]

Hello David,

this is a pull reqeust of one patch for net/master.

The patch is by Andri Yngvason and fixes a potential use-after-free bug
in the cc770 driver introduced in the previous pull-request.

regards,
Marc

---

The following changes since commit a069215cf5985f3aa1bba550264907d6bd05c5f7:

  net: fec: Fix unbalanced PM runtime calls (2018-03-18 16:32:47 -0400)

are available in the Git repository at:

  ssh://git@gitolite.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git tags/linux-can-fixes-for-4.16-20180319

for you to fetch changes up to 9ffd7503944ec7c0ef41c3245d1306c221aef2be:

  can: cc770: Fix use after free in cc770_tx_interrupt() (2018-03-19 10:57:29 +0100)

----------------------------------------------------------------
linux-can-fixes-for-4.16-20180319

----------------------------------------------------------------
Andri Yngvason (1):
      can: cc770: Fix use after free in cc770_tx_interrupt()

 drivers/net/can/cc770/cc770.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

[PATCH] can: cc770: Fix use after free in cc770_tx_interrupt()

[Marc Kleine-Budde]

From: Andri Yngvason <andri.yngvason@marel.com>

This fixes use after free introduced by the last cc770 patch.

Signed-off-by: Andri Yngvason <andri.yngvason@marel.com>
Fixes: 746201235b3f ("can: cc770: Fix queue stall & dropped RTR reply")
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 drivers/net/can/cc770/cc770.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/can/cc770/cc770.c b/drivers/net/can/cc770/cc770.c
index 2743d82d4424..6da69af103e6 100644
--- a/drivers/net/can/cc770/cc770.c
+++ b/drivers/net/can/cc770/cc770.c
@@ -706,13 +706,12 @@ static void cc770_tx_interrupt(struct net_device *dev, unsigned int o)
 		return;
 	}
 
-	can_put_echo_skb(priv->tx_skb, dev, 0);
-	can_get_echo_skb(dev, 0);
-
 	cf = (struct can_frame *)priv->tx_skb->data;
 	stats->tx_bytes += cf->can_dlc;
 	stats->tx_packets++;
 
+	can_put_echo_skb(priv->tx_skb, dev, 0);
+	can_get_echo_skb(dev, 0);
 	priv->tx_skb = NULL;
 
 	netif_wake_queue(dev);
-- 
2.16.2

Re: pull-request: can 2018-03-19

[David Miller]

From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Mon, 19 Mar 2018 11:14:30 +0100

> this is a pull reqeust of one patch for net/master.
> 
> The patch is by Andri Yngvason and fixes a potential use-after-free bug
> in the cc770 driver introduced in the previous pull-request.

Pulled, thank you.