]> git.baikalelectronics.ru Git - kernel.git/commit
can: isotp: restore accidentally removed MSG_PEEK feature
authorOliver Hartkopp <socketcan@hartkopp.net>
Mon, 28 Mar 2022 11:36:11 +0000 (13:36 +0200)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Thu, 31 Mar 2022 07:46:58 +0000 (09:46 +0200)
commitd1aadbc634287185ce09612a9be266eac1d16654
tree6833f666ce8db31c055e2b59fe8f8efa970d1cdd
parent55319675c1ac5505d86ea780e1b568bafceb6360
can: isotp: restore accidentally removed MSG_PEEK feature

In commit de1d3e5dc93d ("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: de1d3e5dc93d ("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>
net/can/isotp.c