diff options
| author | Oliver Hartkopp <socketcan@hartkopp.net> | 2022-03-28 13:36:11 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2022-03-31 09:46:58 +0200 |
| commit | e382fea8ae54f5bb62869c6b69b33993d43adeca (patch) | |
| tree | 6833f666ce8db31c055e2b59fe8f8efa970d1cdd /net/can | |
| parent | f9512d654f62604664251dedd437a22fe484974a (diff) | |
| download | linux-e382fea8ae54f5bb62869c6b69b33993d43adeca.tar.gz linux-e382fea8ae54f5bb62869c6b69b33993d43adeca.tar.bz2 linux-e382fea8ae54f5bb62869c6b69b33993d43adeca.zip | |
can: isotp: restore accidentally removed MSG_PEEK feature
In commit 42bf50a1795a ("can: isotp: support MSG_TRUNC flag when
reading from socket") a new check for recvmsg flags has been
introduced that only checked for the flags that are handled in
isotp_recvmsg() itself.
This accidentally removed the MSG_PEEK feature flag which is processed
later in the call chain in __skb_try_recv_from_queue().
Add MSG_PEEK to the set of valid flags to restore the feature.
Fixes: 42bf50a1795a ("can: isotp: support MSG_TRUNC flag when reading from socket")
Link: https://github.com/linux-can/can-utils/issues/347#issuecomment-1079554254
Link: https://lore.kernel.org/all/20220328113611.3691-1-socketcan@hartkopp.net
Reported-by: Derek Will <derekrobertwill@gmail.com>
Suggested-by: Derek Will <derekrobertwill@gmail.com>
Tested-by: Derek Will <derekrobertwill@gmail.com>
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'net/can')
| -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 f6f8ba1f816d..bafb0fb5f0e0 100644 --- a/net/can/isotp.c +++ b/net/can/isotp.c @@ -1050,7 +1050,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)) + if (flags & ~(MSG_DONTWAIT | MSG_TRUNC | MSG_PEEK)) return -EINVAL; if (!so->bound) |