diff options
| author | David S. Miller <davem@davemloft.net> | 2018-11-01 03:34:08 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-11-01 03:34:08 +0300 |
| commit | df975da4e578eb06453f41a3ecd73c2a4c28044d (patch) | |
| tree | 74dd370bd058feb814e2303bcc4999b8210d42de /net/ipv4/tcp_bpf.c | |
| parent | e2acdddde01511c74e4f6f1d5951a0f5d9bea14a (diff) | |
| parent | dfeb8f4c9692fd5e6c3eef19c2e4ae5338dbdb01 (diff) | |
| download | linux-df975da4e578eb06453f41a3ecd73c2a4c28044d.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Daniel Borkmann says:
====================
pull-request: bpf 2018-11-01
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) Fix tcp_bpf_recvmsg() to return -EAGAIN instead of 0 in non-blocking
case when no data is available yet, from John.
2) Fix a compilation error in libbpf_attach_type_by_name() when compiled
with clang 3.8, from Andrey.
3) Fix a partial copy of map pointer on scalar alu and remove id
generation for RET_PTR_TO_MAP_VALUE return types, from Daniel.
4) Add unlimited memlock limit for kernel selftest's flow_dissector_load
program, from Yonghong.
5) Fix ping for some BPF shell based kselftests where distro does not
ship "ping -6" anymore, from Li.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_bpf.c')
| -rw-r--r-- | net/ipv4/tcp_bpf.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/tcp_bpf.c b/net/ipv4/tcp_bpf.c index b7918d4caa30..3b45fe530f91 100644 --- a/net/ipv4/tcp_bpf.c +++ b/net/ipv4/tcp_bpf.c @@ -145,6 +145,7 @@ msg_bytes_ready: ret = err; goto out; } + copied = -EAGAIN; } ret = copied; out: |