]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
can: isotp: check CAN address family in isotp_bind()
authorOliver Hartkopp <socketcan@hartkopp.net>
Tue, 31 Oct 2023 09:30:21 +0000 (10:30 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 8 Nov 2023 16:26:48 +0000 (17:26 +0100)
commit2fc6f337257f4f7c21ecff429241f7acaa6df4e8
treebccf830f278d1dd44db3bc2798959dcc26572f9f
parentf8c3bd211cf358575da40960bac990d799b1eb61
can: isotp: check CAN address family in isotp_bind()

commit c6adf659a8ba85913e16a571d5a9bcd17d3d1234 upstream

Add missing check to block non-AF_CAN binds.

Syzbot created some code which matched the right sockaddr struct size
but used AF_XDP (0x2C) instead of AF_CAN (0x1D) in the address family
field:

bind$xdp(r2, &(0x7f0000000540)={0x2c, 0x0, r4, 0x0, r2}, 0x10)
                                ^^^^
This has no funtional impact but the userspace should be notified about
the wrong address family field content.

Link: https://syzkaller.appspot.com/text?tag=CrashLog&x=11ff9d8c480000
Reported-by: syzbot+5aed6c3aaba661f5b917@syzkaller.appspotmail.com
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Link: https://lore.kernel.org/all/20230104201844.13168-1-socketcan@hartkopp.net
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/can/isotp.c