[PATCH net] bpf: fix bpf_setsockopts return value

This patch fixes a bug causing any sock operations to always return EINVAL.

Fixes: a5192c52377e ("bpf: fix to bpf_setsockops").
Reported-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: Yuchung Cheng <redacted>
Acked-by: Neal Cardwell <ncardwell@google.com>
Acked-by: Craig Gallek <redacted>
---
 net/core/filter.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net/core/filter.c b/net/core/filter.c
index 6280a602604c..8eb81e5fae08 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c

@@ -2872,7 +2872,6 @@ BPF_CALL_5(bpf_setsockopt, struct bpf_sock_ops_kern *, bpf_sock,
 				ret = -EINVAL;
 			}
 		}
-		ret = -EINVAL;
 #endif
 	} else {
 		ret = -EINVAL;

-- 
2.14.1.342.g6490525c54-goog

On 08/25/2017 12:48 AM, Yuchung Cheng wrote:

This patch fixes a bug causing any sock operations to always return EINVAL.

Fixes: a5192c52377e ("bpf: fix to bpf_setsockops").
Reported-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: Yuchung Cheng <redacted>
Acked-by: Neal Cardwell <ncardwell@google.com>
Acked-by: Craig Gallek <redacted>

Ohh well, thanks for the fix!

Acked-by: Daniel Borkmann <daniel@iogearbox.net>

On 8/24/17, 4:37 PM, "Daniel Borkmann" [off-list ref] wrote:

    On 08/25/2017 12:48 AM, Yuchung Cheng wrote:
    > This patch fixes a bug causing any sock operations to always return EINVAL.
    >
    > Fixes: a5192c52377e ("bpf: fix to bpf_setsockops").
    > Reported-by: Neal Cardwell [off-list ref]
    > Signed-off-by: Yuchung Cheng [off-list ref]
    > Acked-by: Neal Cardwell [off-list ref]
    > Acked-by: Craig Gallek [off-list ref]
    
    Ohh well, thanks for the fix!
    
    Acked-by: Daniel Borkmann [off-list ref]

Thanks! I never checked return values in by bpf test programs

Acked-by: Lawrence Brakmo <redacted> 
   

From: Yuchung Cheng <redacted>
Date: Thu, 24 Aug 2017 15:48:21 -0700

This patch fixes a bug causing any sock operations to always return EINVAL.

Fixes: a5192c52377e ("bpf: fix to bpf_setsockops").
Reported-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: Yuchung Cheng <redacted>
Acked-by: Neal Cardwell <ncardwell@google.com>
Acked-by: Craig Gallek <redacted>

Applied.