diff options
| author | Oliver Hartkopp <socketcan@hartkopp.net> | 2022-03-28 14:36:11 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-04-08 15:24:12 +0300 |
| commit | f78f56488cd3738f2fa86e93b9af7671648582f6 (patch) | |
| tree | fd8dbf00a4b0033d248f6025e51db3fe0f8beb79 /fs/nls | |
| parent | 3fc81968625a66ae54db37b7188f32edd0c6752c (diff) | |
| download | linux-f78f56488cd3738f2fa86e93b9af7671648582f6.tar.xz | |
can: isotp: restore accidentally removed MSG_PEEK feature
[ Upstream commit e382fea8ae54f5bb62869c6b69b33993d43adeca ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs/nls')
0 files changed, 0 insertions, 0 deletions