]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
bpf, sockmap: fix bpf_tcp_sendmsg sock error handling
authorDaniel Borkmann <daniel@iogearbox.net>
Wed, 8 Aug 2018 17:23:13 +0000 (19:23 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 15 Aug 2018 16:10:57 +0000 (18:10 +0200)
commitf2be94d24f6a7f43087158209391a159a90fe492
tree18b78089e85e66ae8f2a3e1bd5d8326c2cacc5ef
parent5c6850e8f7364a98729dd57435b8d9d55696b90c
bpf, sockmap: fix bpf_tcp_sendmsg sock error handling

commit 5121700b346b6160ccc9411194e3f1f417c340d1 upstream.

While working on bpf_tcp_sendmsg() code, I noticed that when a
sk->sk_err is set we error out with err = sk->sk_err. However
this is problematic since sk->sk_err is a positive error value
and therefore we will neither go into sk_stream_error() nor will
we report an error back to user space. I had this case with EPIPE
and user space was thinking sendmsg() succeeded since EPIPE is
a positive value, thinking we submitted 32 bytes. Fix it by
negating the sk->sk_err value.

Fixes: 4f738adba30a ("bpf: create tcp_bpf_ulp allowing BPF to monitor socket TX/RX data")
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
kernel/bpf/sockmap.c