Commit 69e4ebd7 authored Aug 05, 2024 by Oliver Hartkopp Committed by Zhengchao Shao Aug 05, 2024

can: j1939: j1939_send_one(): fix missing CAN header initialization

stable inclusion
from stable-v5.10.155
commit f8e0edeaa0f2b860bdbbf0aafb4492533043d650
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAGEOP
CVE: CVE-2024-42076

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=f8e0edeaa0f2b860bdbbf0aafb4492533043d650

---------------------------

commit 3eb3d283 upstream.

The read access to struct canxl_frame::len inside of a j1939 created
skbuff revealed a missing initialization of reserved and later filled
elements in struct can_frame.

This patch initializes the 8 byte CAN header with zero.

Fixes: 9d71dd0c ("can: add support of SAE J1939 protocol")
Cc: Oleksij Rempel <o.rempel@pengutronix.de>
Link: https://lore.kernel.org/linux-can/20221104052235.GA6474@pengutronix.de


Reported-by:  <syzbot+d168ec0caca4697e03b1@syzkaller.appspotmail.com>
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Link: https://lore.kernel.org/all/20221104075000.105414-1-socketcan@hartkopp.net


Cc: stable@vger.kernel.org
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>

parent 9b16d54a

net/can/j1939/main.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -332,6 +332,9 @@ int j1939_send_one(struct j1939_priv priv, struct sk_buff skb)
		/* re-claim the CAN_HDR from the SKB */
		cf = skb_push(skb, J1939_CAN_HDR);

		/* initialize header structure */
		memset(cf, 0, J1939_CAN_HDR);

		/* make it a full can frame again */
		skb_put(skb, J1939_CAN_FTR + (8 - dlc));