can: cc770: Fix use after free in cc770_tx_interrupt()
authorAndri Yngvason <andri.yngvason@marel.com>
Thu, 15 Mar 2018 18:23:17 +0000 (18:23 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Sat, 16 Jun 2018 21:22:44 +0000 (22:22 +0100)
commit 9ffd7503944ec7c0ef41c3245d1306c221aef2be upstream.

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")
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/net/can/cc770/cc770.c

index ad41aa3616fd433392a17fb7fb430decf911d6df..b8f4614fb02f312a5682925c9540e4f9eae63ca8 100644 (file)
@@ -705,13 +705,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);