Skip to content

Commit

Permalink
can: isotp: restore accidentally removed MSG_PEEK feature
Browse files Browse the repository at this point in the history
BugLink: https://bugs.launchpad.net/bugs/1969110

[ Upstream commit e382fea ]

In commit 42bf50a ("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: 42bf50a ("can: isotp: support MSG_TRUNC flag when reading from socket")
Link: linux-can/can-utils#347 (comment)
Link: https://lore.kernel.org/all/[email protected]
Reported-by: Derek Will <[email protected]>
Suggested-by: Derek Will <[email protected]>
Tested-by: Derek Will <[email protected]>
Signed-off-by: Oliver Hartkopp <[email protected]>
Signed-off-by: Marc Kleine-Budde <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>
(cherry picked from commit f78f56488cd3738f2fa86e93b9af7671648582f6)
Signed-off-by: Paolo Pisati <[email protected]>
  • Loading branch information
hartkopp authored and smb49 committed May 20, 2022
1 parent a976a55 commit f23a891
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion net/can/isotp.c
Original file line number Diff line number Diff line change
Expand Up @@ -1009,7 +1009,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)
Expand Down

0 comments on commit f23a891

Please sign in to comment.