diff options
| author | Vincent Mailhol <mailhol.vincent@wanadoo.fr> | 2021-01-20 20:41:35 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-01-27 11:05:39 +0100 |
| commit | 08ab951787098ae0b6c0364aeea7a8138226f234 (patch) | |
| tree | e47d14f7343c435986e7ac580316cfe63e06b598 | |
| parent | 3d6327020b36598d45ee3bca3a68b46209975d7c (diff) | |
| download | linux-08ab951787098ae0b6c0364aeea7a8138226f234.tar.gz linux-08ab951787098ae0b6c0364aeea7a8138226f234.tar.bz2 linux-08ab951787098ae0b6c0364aeea7a8138226f234.zip | |
can: dev: can_restart: fix use after free bug
[ Upstream commit 03f16c5075b22c8902d2af739969e878b0879c94 ]
After calling netif_rx_ni(skb), dereferencing skb is unsafe.
Especially, the can_frame cf which aliases skb memory is accessed
after the netif_rx_ni() in:
stats->rx_bytes += cf->len;
Reordering the lines solves the issue.
Fixes: 39549eef3587 ("can: CAN Network device driver and Netlink interface")
Link: https://lore.kernel.org/r/20210120114137.200019-2-mailhol.vincent@wanadoo.fr
Signed-off-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/net/can/dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c index f88590074569..953c6fdc75cc 100644 --- a/drivers/net/can/dev.c +++ b/drivers/net/can/dev.c @@ -579,11 +579,11 @@ static void can_restart(struct net_device *dev) } cf->can_id |= CAN_ERR_RESTARTED; - netif_rx_ni(skb); - stats->rx_packets++; stats->rx_bytes += cf->can_dlc; + netif_rx_ni(skb); + restart: netdev_dbg(dev, "restarted\n"); priv->can_stats.restarts++; |