[PATCH net-next] sock: Fix SO_ZEROCOPY switch case

Subsystems: networking [general], networking [sockets], the rest

STALE3148d REVIEWED: 1 (1M)

1 review trailer (1 from subsystem maintainers).

3 messages, 3 authors, 2018-03-07 · open the first message on its own page

[PATCH net-next] sock: Fix SO_ZEROCOPY switch case

From: Jesus Sanchez-Palencia <hidden>
Date: 2018-03-07 17:43:27

Fix the SO_ZEROCOPY switch case on sock_setsockopt() avoiding the
ret values to be overwritten by the one set on the default case.

Fixes: 28190752c7092 ("sock: permit SO_ZEROCOPY on PF_RDS socket")
Signed-off-by: Jesus Sanchez-Palencia <redacted>
Acked-by: Willem de Bruijn <willemb@google.com>
---
 net/core/sock.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net/core/sock.c b/net/core/sock.c
index 507d8c6c4319..27f218bba43f 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1062,8 +1062,9 @@ int sock_setsockopt(struct socket *sock, int level, int optname,
 				ret = -EINVAL;
 			else
 				sock_valbool_flag(sk, SOCK_ZEROCOPY, valbool);
-			break;
 		}
+		break;
+
 	default:
 		ret = -ENOPROTOOPT;
 		break;
-- 
2.16.2

Re: [PATCH net-next] sock: Fix SO_ZEROCOPY switch case

From: Sowmini Varadhan <hidden>
Date: 2018-03-07 17:54:20

On (03/07/18 09:40), Jesus Sanchez-Palencia wrote:
Fix the SO_ZEROCOPY switch case on sock_setsockopt() avoiding the
ret values to be overwritten by the one set on the default case.
Acked-by: Sowmini Varadhan <redacted>

Re: [PATCH net-next] sock: Fix SO_ZEROCOPY switch case

From: David Miller <davem@davemloft.net>
Date: 2018-03-07 20:55:30

From: Jesus Sanchez-Palencia <redacted>
Date: Wed,  7 Mar 2018 09:40:57 -0800
Fix the SO_ZEROCOPY switch case on sock_setsockopt() avoiding the
ret values to be overwritten by the one set on the default case.

Fixes: 28190752c7092 ("sock: permit SO_ZEROCOPY on PF_RDS socket")
Signed-off-by: Jesus Sanchez-Palencia <redacted>
Acked-by: Willem de Bruijn <willemb@google.com>
Applied, thank you.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help