Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit affbad02 authored by Vincent Mailhol's avatar Vincent Mailhol Committed by Greg Kroah-Hartman
Browse files

can: pch_can: pch_can_rx_normal: fix use after free 

commit 94cddf1e9227a171b27292509d59691819c458db upstream.

After calling netif_receive_skb(skb), dereferencing skb is unsafe.
Especially, the can_frame cf which aliases skb memory is dereferenced
just after the call netif_receive_skb(skb).

Reordering the lines solves the issue.

Fixes: b21d18b5 ("can: Topcliff: Add PCH_CAN driver.")
Link: https://lore.kernel.org/all/20211123111654.621610-1-mailhol.vincent@wanadoo.fr


Cc: stable@vger.kernel.org
Signed-off-by: default avatarVincent Mailhol <mailhol.vincent@wanadoo.fr>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a4252958

drivers/net/can/pch_can.c

+1 −1
Original line number Diff line number Diff line
@@ -703,11 +703,11 @@ static int pch_can_rx_normal(struct net_device *ndev, u32 obj_num, int quota) 
			cf->data[i + 1] = data_reg >> 8;

		}



		netif_receive_skb(skb);

		rcv_pkts++;

		stats->rx_packets++;

		quota--;

		stats->rx_bytes += cf->can_dlc;

		netif_receive_skb(skb);



		pch_fifo_thresh(priv, obj_num);

		obj_num++;