| Message ID | 20180307011230.24001-2-jesus.sanchez-palencia@intel.com |
|---|---|
| State | RFC, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | Time based packet transmission | expand |
On Tue, Mar 6, 2018 at 8:12 PM, Jesus Sanchez-Palencia <jesus.sanchez-palencia@intel.com> 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. > > 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> Please send this fix to net-next independent from the rest of the patchset.
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;
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> --- net/core/sock.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)