Merge branch 'fix-lpm-map'

Browse source

Yonghong Song says:

====================
A kernel page fault which happens in lpm map trie_get_next_key is reported
by syzbot and Eric. The issue was introduced by commit b471f2f1de
("bpf: implement MAP_GET_NEXT_KEY command for LPM_TRIE map").
Patch #1 fixed the issue in the kernel and patch #2 adds a multithreaded
test case in tools/testing/selftests/bpf/test_lpm_map.
====================

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

...

This commit is contained in:

Alexei Starovoitov 2018-01-26 17:06:23 -08:00

parent 1651e39e4a af32efeede

commit 8223967fe0

3 changed files with 107 additions and 16 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

26

kernel/bpf/lpm_trie.c

View file

2

tools/testing/selftests/bpf/Makefile

View file

95

tools/testing/selftests/bpf/test_lpm_map.c

View file