aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/sock.c
diff options
context:
space:
mode:
authorJesus Sanchez-Palencia <jesus.sanchez-palencia@intel.com>2018-03-07 09:40:57 -0800
committerDavid S. Miller <davem@davemloft.net>2018-03-07 15:54:46 -0500
commit334e6413134bf8335ec93a9e60213cbc61ef7a62 (patch)
tree25c4f939120aa1b81d8e544255d4e3f0c6b5e6bf /net/core/sock.c
parentMerge branch 'mvpp2-ucast-filter' (diff)
downloadlinux-dev-334e6413134bf8335ec93a9e60213cbc61ef7a62.tar.xz
linux-dev-334e6413134bf8335ec93a9e60213cbc61ef7a62.zip
sock: Fix SO_ZEROCOPY switch case
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 <jesus.sanchez-palencia@intel.com> Acked-by: Willem de Bruijn <willemb@google.com> Acked-by: Sowmini Varadhan <sowmini.varadhan@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/sock.c')
-rw-r--r--net/core/sock.c3
1 files changed, 2 insertions, 1 deletions
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 @@ set_rcvbuf:
ret = -EINVAL;
else
sock_valbool_flag(sk, SOCK_ZEROCOPY, valbool);
- break;
}
+ break;
+
default:
ret = -ENOPROTOOPT;
break;