Merge branch 'prog_test_run-improvement'

Browse source

Lorenz Bauer says:

====================
Right now, there is no safe way to use BPF_PROG_TEST_RUN with data_out.
This is because bpf_test_finish copies the output buffer to user space
without checking its size. This can lead to the kernel overwriting
data in user space after the buffer if xdp_adjust_head and friends are
in play.

Thanks to everyone for their advice and patience with this patch set!

Changes in v5:
* Fix up libbpf.map

Changes in v4:
* Document bpf_prog_test_run and bpf_prog_test_run_xattr
* Use struct bpf_prog_test_run_attr for return values

Changes in v3:
* Introduce bpf_prog_test_run_xattr instead of modifying the existing
  function

Changes in v2:
* Make the syscall return ENOSPC if data_size_out is too small
* Make bpf_prog_test_run return EINVAL if size_out is missing
* Document the new behaviour of data_size_out
====================

Signed-off-by: Alexei Starovoitov <ast@kernel.org>

...

This commit is contained in:

Alexei Starovoitov 2018-12-04 08:18:14 -08:00

parent d59dd69d55 df47fc376d

commit 2a95471c33

7 changed files with 120 additions and 7 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

7

include/uapi/linux/bpf.h

View file

15

net/bpf/test_run.c

View file

7

tools/include/uapi/linux/bpf.h

View file

23

tools/lib/bpf/bpf.c

View file

19

tools/lib/bpf/bpf.h

View file

1

tools/lib/bpf/libbpf.map

View file

55

tools/testing/selftests/bpf/test_progs.c

View file