diff options
| author |   Marc Kleine-Budde <mkl@pengutronix.de> | 2021-02-18 21:58:36 +0100 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2021-03-16 08:40:04 +0100 |
| commit | e4912459bd5edd493b61bc7c3a5d9b2eb17f5a89 (patch) | |
| tree | 63014a47b280971b782c16f2b144821366ac1482 /net/can/isotp.c | |
| parent | can: dev: Move device back to init netns on owning netns delete (diff) | |
| download | wireguard-linux-e4912459bd5edd493b61bc7c3a5d9b2eb17f5a89.tar.xz wireguard-linux-e4912459bd5edd493b61bc7c3a5d9b2eb17f5a89.zip | |
can: isotp: isotp_setsockopt(): only allow to set low level TX flags for CAN-FD
CAN-FD frames have struct canfd_frame::flags, while classic CAN frames
don't.
This patch refuses to set TX flags (struct
can_isotp_ll_options::tx_flags) on non CAN-FD isotp sockets.
Fixes: e057dd3fc20f ("can: add ISO 15765-2:2016 transport protocol")
Link: https://lore.kernel.org/r/20210218215434.1708249-2-mkl@pengutronix.de
Cc: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'net/can/isotp.c')
| -rw-r--r-- | net/can/isotp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/can/isotp.c b/net/can/isotp.c index 3ef7f78e553b..e32d446c121e 100644 --- a/net/can/isotp.c +++ b/net/can/isotp.c @@ -1228,7 +1228,8 @@ static int isotp_setsockopt(struct socket *sock, int level, int optname, if (ll.mtu != CAN_MTU && ll.mtu != CANFD_MTU) return -EINVAL; - if (ll.mtu == CAN_MTU && ll.tx_dl > CAN_MAX_DLEN) + if (ll.mtu == CAN_MTU && + (ll.tx_dl > CAN_MAX_DLEN || ll.tx_flags != 0)) return -EINVAL; memcpy(&so->ll, &ll, sizeof(ll)); |