diff options
| author | Oliver Hartkopp <socketcan@hartkopp.net> | 2022-11-04 08:50:00 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-11-16 09:57:17 +0100 |
| commit | f8e0edeaa0f2b860bdbbf0aafb4492533043d650 (patch) | |
| tree | 7b26504ab9222cc8f69a15974d19a3fd2cdc2116 /net | |
| parent | 0b692d41ee5c88097ecf5dbb37c59083044c996a (diff) | |
| download | linux-f8e0edeaa0f2b860bdbbf0aafb4492533043d650.tar.gz linux-f8e0edeaa0f2b860bdbbf0aafb4492533043d650.tar.bz2 linux-f8e0edeaa0f2b860bdbbf0aafb4492533043d650.zip | |
can: j1939: j1939_send_one(): fix missing CAN header initialization
commit 3eb3d283e8579a22b81dd2ac3987b77465b2a22f 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: 9d71dd0c7009 ("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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/can/j1939/main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/can/j1939/main.c b/net/can/j1939/main.c index ca75d1b8f415..9da8fbc81c04 100644 --- a/net/can/j1939/main.c +++ b/net/can/j1939/main.c @@ -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)); |