Commit 9ad86d37 authored by Dario Binacchi's avatar Dario Binacchi Committed by Marc Kleine-Budde
Browse files

can: hi311x: hi3110_can_ist(): fix potential use-after-free 



The commit a22bd630 ("can: hi311x: do not report txerr and rxerr
during bus-off") removed the reporting of rxerr and txerr even in case
of correct operation (i. e. not bus-off).

The error count information added to the CAN frame after netif_rx() is
a potential use after free, since there is no guarantee that the skb
is in the same state. It might be freed or reused.

Fix the issue by postponing the netif_rx() call in case of txerr and
rxerr reporting.

Fixes: a22bd630 ("can: hi311x: do not report txerr and rxerr during bus-off")
Signed-off-by: default avatarDario Binacchi <dario.binacchi@amarulasolutions.com>
Link: https://patch.msgid.link/20241122221650.633981-5-dario.binacchi@amarulasolutions.com


Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent ee6bf367

drivers/net/can/spi/hi311x.c

+2 −1
Original line number Diff line number Diff line
@@ -671,9 +671,9 @@ static irqreturn_t hi3110_can_ist(int irq, void *dev_id) 
			tx_state = txerr >= rxerr ? new_state : 0;

			rx_state = txerr <= rxerr ? new_state : 0;

			can_change_state(net, cf, tx_state, rx_state);

			netif_rx(skb);



			if (new_state == CAN_STATE_BUS_OFF) {

				netif_rx(skb);

				can_bus_off(net);

				if (priv->can.restart_ms == 0) {

					priv->force_quit = 1;
@@ -684,6 +684,7 @@ static irqreturn_t hi3110_can_ist(int irq, void *dev_id) 
				cf->can_id |= CAN_ERR_CNT;

				cf->data[6] = txerr;

				cf->data[7] = rxerr;

				netif_rx(skb);

			}

		}