diff options
| author | Oliver Hartkopp <socketcan@hartkopp.net> | 2023-04-06 13:08:45 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-05-24 17:36:53 +0100 |
| commit | 9ac2448c24a926fbda72290edee698427971e0e7 (patch) | |
| tree | d2721e6a1cf79961065f91c9813fb08c54b1911c /net | |
| parent | a17cf315f246b78354e94e7e6bbe8bf86afdc748 (diff) | |
| download | linux-9ac2448c24a926fbda72290edee698427971e0e7.tar.gz linux-9ac2448c24a926fbda72290edee698427971e0e7.tar.bz2 linux-9ac2448c24a926fbda72290edee698427971e0e7.zip | |
can: isotp: recvmsg(): allow MSG_CMSG_COMPAT flag
commit db2773d65b02aed319a93efdfb958087771d4e19 upstream.
The control message provided by isotp support MSG_CMSG_COMPAT but
blocked recvmsg() syscalls that have set this flag, i.e. on 32bit user
space on 64 bit kernels.
Link: https://github.com/hartkopp/can-isotp/issues/59
Cc: Oleksij Rempel <o.rempel@pengutronix.de>
Suggested-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Fixes: 42bf50a1795a ("can: isotp: support MSG_TRUNC flag when reading from socket")
Link: https://lore.kernel.org/20230505110308.81087-2-mkl@pengutronix.de
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/isotp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/can/isotp.c b/net/can/isotp.c index 2a891f47b815..ca69ca39c8fd 100644 --- a/net/can/isotp.c +++ b/net/can/isotp.c @@ -1018,7 +1018,7 @@ static int isotp_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, int noblock = flags & MSG_DONTWAIT; int ret = 0; - if (flags & ~(MSG_DONTWAIT | MSG_TRUNC | MSG_PEEK)) + if (flags & ~(MSG_DONTWAIT | MSG_TRUNC | MSG_PEEK | MSG_CMSG_COMPAT)) return -EINVAL; if (!so->bound) |