diff mbox series

[net,1/8] can: isotp: restore accidentally removed MSG_PEEK feature

Message ID 20220331084634.869744-2-mkl@pengutronix.de (mailing list archive)
State Accepted
Commit e382fea8ae54f5bb62869c6b69b33993d43adeca
Delegated to: Netdev Maintainers
Headers show
Series [net,1/8] can: isotp: restore accidentally removed MSG_PEEK feature | expand

Commit Message

Marc Kleine-Budde March 31, 2022, 8:46 a.m. UTC 
From: Oliver Hartkopp <socketcan@hartkopp.net>

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>
---
 net/can/isotp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


base-commit: f9512d654f62604664251dedd437a22fe484974a

Comments

patchwork-bot+netdevbpf@kernel.org March 31, 2022, 3:50 p.m. UTC | #1 
Hello:

This patch was applied to netdev/net.git (master)
by Marc Kleine-Budde <mkl@pengutronix.de>:

On Thu, 31 Mar 2022 10:46:27 +0200 you wrote:
> From: Oliver Hartkopp <socketcan@hartkopp.net>
> 
> 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.
> 
> [...]

Here is the summary with links:
  - [net,1/8] can: isotp: restore accidentally removed MSG_PEEK feature
    https://git.kernel.org/netdev/net/c/e382fea8ae54

You are awesome, thank you!
diff mbox series

Patch

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)