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: linux-can/can-utils#347 (comment) From: Derek Will <[email protected]> Tested-by: Derek Will <[email protected]> Signed-off-by: Oliver Hartkopp <[email protected]>
hartkopp · Mar 28, 2022 · bbdcc0b · bbdcc0b
1 parent a32302a
commit bbdcc0b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/net/can/isotp.c b/net/can/isotp.c
@@ -1045,7 +1045,7 @@ static int isotp_recvmsg(struct kiocb *iocb, struct socket *sock,
 	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)