Răsfoiți Sursa

can: cc770: Fix use after free in cc770_tx_interrupt()

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>
Andri Yngvason 7 ani în urmă
părinte
comite
9ffd750394
1 a modificat fișierele cu 2 adăugiri și 3 ștergeri
  1. 2 3
      drivers/net/can/cc770/cc770.c

+ 2 - 3
drivers/net/can/cc770/cc770.c

@@ -706,13 +706,12 @@ static void cc770_tx_interrupt(struct net_device *dev, unsigned int o)
 		return;
 		return;
 	}
 	}
 
 
-	can_put_echo_skb(priv->tx_skb, dev, 0);
-	can_get_echo_skb(dev, 0);
-
 	cf = (struct can_frame *)priv->tx_skb->data;
 	cf = (struct can_frame *)priv->tx_skb->data;
 	stats->tx_bytes += cf->can_dlc;
 	stats->tx_bytes += cf->can_dlc;
 	stats->tx_packets++;
 	stats->tx_packets++;
 
 
+	can_put_echo_skb(priv->tx_skb, dev, 0);
+	can_get_echo_skb(dev, 0);
 	priv->tx_skb = NULL;
 	priv->tx_skb = NULL;
 
 
 	netif_wake_queue(dev);
 	netif_wake_queue(dev);