]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
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)
committerSasha Levin <alexander.levin@microsoft.com>
Wed, 23 May 2018 01:33:53 +0000 (21:33 -0400)
[ Upstream commit 9ffd7503944ec7c0ef41c3245d1306c221aef2be ]

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>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
drivers/net/can/cc770/cc770.c

index fbfcc5d000243c350c03ede142866d8c73d49534..76b3c1462139ce54d9bee948ff4e3b9de0955023 100644 (file)
@@ -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);