diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2019-11-02 12:39:13 -0700 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2019-11-02 12:45:15 -0700 |
| commit | 358fdb456288d48874d44a064a82bfb0d9963fa0 (patch) | |
| tree | 59237fefc66616b1656f1ade555b2365e8d89d88 /samples/bpf/test_map_in_map_kern.c | |
| parent | e1cb7d2d60d536baf24d2f0fd58786324ce92331 (diff) | |
| parent | fa553d9b57d4a98a160d1926b4e263e7a78c0cf3 (diff) | |
| download | linux-358fdb456288d48874d44a064a82bfb0d9963fa0.tar.gz linux-358fdb456288d48874d44a064a82bfb0d9963fa0.tar.bz2 linux-358fdb456288d48874d44a064a82bfb0d9963fa0.zip | |
Merge branch 'bpf_probe_read_user'
Daniel Borkmann says:
====================
This set adds probe_read_{user,kernel}(), probe_read_str_{user,kernel}()
helpers, fixes probe_write_user() helper and selftests. For details please
see individual patches.
Thanks!
v2 -> v3:
- noticed two more things that are fixed in here:
- bpf uapi helper description used 'int size' for *_str helpers, now u32
- we need TASK_SIZE_MAX + guard page on x86-64 in patch 2 otherwise
we'll trigger the 00c42373d397 warn as well, so full range covered now
v1 -> v2:
- standardize unsafe_ptr terminology in uapi header comment (Andrii)
- probe_read_{user,kernel}[_str] naming scheme (Andrii)
- use global data in last test case, remove relaxed_maps (Andrii)
- add strict non-pagefault kernel read funcs to avoid warning in
kernel probe read helpers (Alexei)
====================
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'samples/bpf/test_map_in_map_kern.c')
| -rw-r--r-- | samples/bpf/test_map_in_map_kern.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/samples/bpf/test_map_in_map_kern.c b/samples/bpf/test_map_in_map_kern.c index 4f80cbe74c72..32ee752f19df 100644 --- a/samples/bpf/test_map_in_map_kern.c +++ b/samples/bpf/test_map_in_map_kern.c @@ -118,7 +118,7 @@ int trace_sys_connect(struct pt_regs *ctx) if (addrlen != sizeof(*in6)) return 0; - ret = bpf_probe_read(dst6, sizeof(dst6), &in6->sin6_addr); + ret = bpf_probe_read_user(dst6, sizeof(dst6), &in6->sin6_addr); if (ret) { inline_ret = ret; goto done; @@ -129,7 +129,7 @@ int trace_sys_connect(struct pt_regs *ctx) test_case = dst6[7]; - ret = bpf_probe_read(&port, sizeof(port), &in6->sin6_port); + ret = bpf_probe_read_user(&port, sizeof(port), &in6->sin6_port); if (ret) { inline_ret = ret; goto done; |