diff options
| author | Oliver Hartkopp <socketcan@hartkopp.net> | 2023-10-31 10:29:14 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-11-08 17:30:50 +0100 |
| commit | de3c02383aa678f6799402ac47fdd89cf4bfcaa9 (patch) | |
| tree | c705c7d4a5cbd9b9fb843ca6fb5d6dc45aa6e809 | |
| parent | 0386f37047899b3af95b00090b1f4ff4f5990f8d (diff) | |
| download | linux-stable-de3c02383aa678f6799402ac47fdd89cf4bfcaa9.tar.gz linux-stable-de3c02383aa678f6799402ac47fdd89cf4bfcaa9.tar.bz2 linux-stable-de3c02383aa678f6799402ac47fdd89cf4bfcaa9.zip | |
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>
| -rw-r--r-- | net/can/isotp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/can/isotp.c b/net/can/isotp.c index 902cb61b6495..87de9a08cc85 100644 --- a/net/can/isotp.c +++ b/net/can/isotp.c @@ -1129,6 +1129,9 @@ static int isotp_bind(struct socket *sock, struct sockaddr *uaddr, int len) if (len < ISOTP_MIN_NAMELEN) return -EINVAL; + if (addr->can_family != AF_CAN) + return -EINVAL; + /* sanitize tx/rx CAN identifiers */ tx_id = addr->can_addr.tp.tx_id; if (tx_id & CAN_EFF_FLAG) |