Revision 04901aab40ea3779f6fc6383ef74d8e130e817bf authored by Yonghong Song on 31 December 2020, 05:24:18 UTC, committed by Daniel Borkmann on 03 January 2021, 00:41:32 UTC
Latest bpf tree has a bug for bpf_iter selftest:

  $ ./test_progs -n 4/25
  test_bpf_sk_storage_get:PASS:bpf_iter_bpf_sk_storage_helpers__open_and_load 0 nsec
  test_bpf_sk_storage_get:PASS:socket 0 nsec
  ...
  do_dummy_read:PASS:read 0 nsec
  test_bpf_sk_storage_get:FAIL:bpf_map_lookup_elem map value wasn't set correctly
                          (expected 1792, got -1, err=0)
  #4/25 bpf_sk_storage_get:FAIL
  #4 bpf_iter:FAIL
  Summary: 0/0 PASSED, 0 SKIPPED, 2 FAILED

When doing merge conflict resolution, Commit 4bfc4714849d missed to
save curr_task to seq_file private data. The task pointer in seq_file
private data is passed to bpf program. This caused NULL-pointer task
passed to bpf program which will immediately return upon checking
whether task pointer is NULL.

This patch added back the assignment of curr_task to seq_file private
data and fixed the issue.

Fixes: 4bfc4714849d ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf")
Signed-off-by: Yonghong Song <yhs@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: John Fastabend <john.fastabend@gmail.com>
Link: https://lore.kernel.org/bpf/20201231052418.577024-1-yhs@fb.com
1 parent da4282c
History
File Mode Size
lxdialog
tests
.gitignore -rw-r--r-- 123 bytes
Makefile -rw-r--r-- 7.6 KB
conf.c -rw-r--r-- 15.7 KB
confdata.c -rw-r--r-- 27.2 KB
expr.c -rw-r--r-- 30.0 KB
expr.h -rw-r--r-- 9.6 KB
gconf-cfg.sh -rwxr-xr-x 733 bytes
gconf.c -rw-r--r-- 38.1 KB
gconf.glade -rw-r--r-- 25.0 KB
images.c -rw-r--r-- 6.4 KB
images.h -rw-r--r-- 857 bytes
lexer.l -rw-r--r-- 9.1 KB
list.h -rw-r--r-- 3.7 KB
lkc.h -rw-r--r-- 4.3 KB
lkc_proto.h -rw-r--r-- 1.9 KB
mconf-cfg.sh -rwxr-xr-x 1.2 KB
mconf.c -rw-r--r-- 27.3 KB
menu.c -rw-r--r-- 22.2 KB
merge_config.sh -rwxr-xr-x 4.6 KB
nconf-cfg.sh -rwxr-xr-x 1.3 KB
nconf.c -rw-r--r-- 38.1 KB
nconf.gui.c -rw-r--r-- 14.8 KB
nconf.h -rw-r--r-- 1.8 KB
parser.y -rw-r--r-- 15.3 KB
preprocess.c -rw-r--r-- 11.0 KB
qconf-cfg.sh -rwxr-xr-x 846 bytes
qconf.cc -rw-r--r-- 43.2 KB
qconf.h -rw-r--r-- 6.4 KB
streamline_config.pl -rwxr-xr-x 16.7 KB
symbol.c -rw-r--r-- 28.6 KB
util.c -rw-r--r-- 2.2 KB

back to top