diff options
author | David S. Miller <davem@davemloft.net> | 2020-06-17 13:26:55 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2020-06-17 13:26:55 -0700 |
commit | b9d37bbb55b8993d296a86fa21f98fa550b61967 (patch) | |
tree | 73a93a246e9261c7738595af15e6f5a0cf44115a /kernel/trace | |
parent | 69119673bd50b176ded34032fadd41530fb5af21 (diff) | |
parent | 8030e250d882db174cbcd88273570ffb36a13080 (diff) | |
download | linux-b9d37bbb55b8993d296a86fa21f98fa550b61967.tar.bz2 |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Alexei Starovoitov says:
====================
pull-request: bpf 2020-06-17
The following pull-request contains BPF updates for your *net* tree.
We've added 10 non-merge commits during the last 2 day(s) which contain
a total of 14 files changed, 158 insertions(+), 59 deletions(-).
The main changes are:
1) Important fix for bpf_probe_read_kernel_str() return value, from Andrii.
2) [gs]etsockopt fix for large optlen, from Stanislav.
3) devmap allocation fix, from Toke.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/trace')
-rw-r--r-- | kernel/trace/bpf_trace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index e729c9e587a0..a3ac7de98baa 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -241,7 +241,7 @@ bpf_probe_read_kernel_str_common(void *dst, u32 size, const void *unsafe_ptr) if (unlikely(ret < 0)) goto fail; - return 0; + return ret; fail: memset(dst, 0, size); return ret; |