浏览代码

can: bfin_can: don't touch skb after netif_rx()

There is no guarantee that the skb is in the same state after calling
net_receive_skb() or netif_rx(). It might be freed or reused. Not really
harmful as its a read access, except you turn on the proper debugging options
which catch a use after free.

Cc: Aaron Wu <Aaron.wu@analog.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Marc Kleine-Budde 10 年之前
父节点
当前提交
20926d7924
共有 1 个文件被更改,包括 2 次插入4 次删除
  1. 2 4
      drivers/net/can/bfin_can.c

+ 2 - 4
drivers/net/can/bfin_can.c

@@ -424,10 +424,9 @@ static void bfin_can_rx(struct net_device *dev, u16 isrc)
 		cf->data[6 - i] = (6 - i) < cf->can_dlc ? (val >> 8) : 0;
 		cf->data[6 - i] = (6 - i) < cf->can_dlc ? (val >> 8) : 0;
 	}
 	}
 
 
-	netif_rx(skb);
-
 	stats->rx_packets++;
 	stats->rx_packets++;
 	stats->rx_bytes += cf->can_dlc;
 	stats->rx_bytes += cf->can_dlc;
+	netif_rx(skb);
 }
 }
 
 
 static int bfin_can_err(struct net_device *dev, u16 isrc, u16 status)
 static int bfin_can_err(struct net_device *dev, u16 isrc, u16 status)
@@ -508,10 +507,9 @@ static int bfin_can_err(struct net_device *dev, u16 isrc, u16 status)
 
 
 	priv->can.state = state;
 	priv->can.state = state;
 
 
-	netif_rx(skb);
-
 	stats->rx_packets++;
 	stats->rx_packets++;
 	stats->rx_bytes += cf->can_dlc;
 	stats->rx_bytes += cf->can_dlc;
+	netif_rx(skb);
 
 
 	return 0;
 	return 0;
 }
 }