Merge branch 'reject-ptr-scalar-mix'

Browse source

Daniel Borkmann says:

====================
Follow-up fix to 979d63d50c ("bpf: prevent out of bounds speculation
on pointer arithmetic") in order to reject a corner case for sanitation
when ptr / scalars are mixed in the same alu op.
====================

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

...

This commit is contained in:

Alexei Starovoitov 2019-01-05 21:32:39 -08:00

parent 466f89e9ec 1cbbcfbbd5

commit 97274b6126

3 changed files with 169 additions and 13 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

1

include/linux/bpf_verifier.h

View file

61

kernel/bpf/verifier.c

View file

120

tools/testing/selftests/bpf/test_verifier.c

View file