Skip to content

Commit 251e2d3

Browse files
borkmannAlexei Starovoitov
authored andcommitted
bpf, samples: Use bpf_probe_read_user where appropriate
Use bpf_probe_read_user() helper instead of bpf_probe_read() for samples that attach to kprobes probing on user addresses. Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Signed-off-by: Alexei Starovoitov <ast@kernel.org> Acked-by: Andrii Nakryiko <andriin@fb.com> Link: https://lore.kernel.org/bpf/5b0144b3f8e031ec5e2438bd7de8d7877e63bf2f.1572649915.git.daniel@iogearbox.net
1 parent 6e07a63 commit 251e2d3

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

samples/bpf/map_perf_test_kern.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,8 @@ int stress_lru_hmap_alloc(struct pt_regs *ctx)
181181
if (addrlen != sizeof(*in6))
182182
return 0;
183183

184-
ret = bpf_probe_read(test_params.dst6, sizeof(test_params.dst6),
185-
&in6->sin6_addr);
184+
ret = bpf_probe_read_user(test_params.dst6, sizeof(test_params.dst6),
185+
&in6->sin6_addr);
186186
if (ret)
187187
goto done;
188188

samples/bpf/test_map_in_map_kern.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ int trace_sys_connect(struct pt_regs *ctx)
118118
if (addrlen != sizeof(*in6))
119119
return 0;
120120

121-
ret = bpf_probe_read(dst6, sizeof(dst6), &in6->sin6_addr);
121+
ret = bpf_probe_read_user(dst6, sizeof(dst6), &in6->sin6_addr);
122122
if (ret) {
123123
inline_ret = ret;
124124
goto done;
@@ -129,7 +129,7 @@ int trace_sys_connect(struct pt_regs *ctx)
129129

130130
test_case = dst6[7];
131131

132-
ret = bpf_probe_read(&port, sizeof(port), &in6->sin6_port);
132+
ret = bpf_probe_read_user(&port, sizeof(port), &in6->sin6_port);
133133
if (ret) {
134134
inline_ret = ret;
135135
goto done;

samples/bpf/test_probe_write_user_kern.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ int bpf_prog1(struct pt_regs *ctx)
3737
if (sockaddr_len > sizeof(orig_addr))
3838
return 0;
3939

40-
if (bpf_probe_read(&orig_addr, sizeof(orig_addr), sockaddr_arg) != 0)
40+
if (bpf_probe_read_user(&orig_addr, sizeof(orig_addr), sockaddr_arg) != 0)
4141
return 0;
4242

4343
mapped_addr = bpf_map_lookup_elem(&dnat_map, &orig_addr);

0 commit comments

Comments
 (0)