diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2020-06-23 15:32:42 -0700 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2020-06-23 15:33:41 -0700 |
| commit | 4e608675e790b3f61b98bc38b3e8a38613b480ab (patch) | |
| tree | 75252ccde9e3922143fe16ec7e346cbe5a4b680d /kernel | |
| parent | tools, bpftool: Correctly evaluate $(BUILD_BPF_SKELS) in Makefile (diff) | |
| parent | bpf: bpf_probe_read_kernel_str() has to return amount of data read on success (diff) | |
| download | linux-4e608675e790b3f61b98bc38b3e8a38613b480ab.tar.gz linux-4e608675e790b3f61b98bc38b3e8a38613b480ab.zip | |
Merge up to bpf_probe_read_kernel_str() fix into bpf-next
Diffstat (limited to 'kernel')
| -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; |