From: Daniel Borkmann <daniel@iogearbox.net>
Date: Fri, 21 Dec 2018 13:04:46 +0000 (+0100)
Subject: bpf: fix segfault in test_verifier selftest
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7fa4bd739fc0fa209fa5120383aab17f6e9600f7;p=linux.git

bpf: fix segfault in test_verifier selftest

Minor fallout from merge resolution, test_verifier was segfaulting
because the REJECT result was correct, but errstr was NULL. Properly
fix it as in 339bbff2d6e0.

Fixes: 339bbff2d6e0 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next")
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/tools/testing/selftests/bpf/test_verifier.c b/tools/testing/selftests/bpf/test_verifier.c
index baafe5c76aca2..33f7d38849b82 100644
--- a/tools/testing/selftests/bpf/test_verifier.c
+++ b/tools/testing/selftests/bpf/test_verifier.c
@@ -14194,7 +14194,8 @@ static struct bpf_test tests[] = {
 		},
 		.prog_type = BPF_PROG_TYPE_SOCKET_FILTER,
 		.errstr_unpriv = "function calls to other bpf functions are allowed for root only",
-                .result = REJECT,
+		.errstr = "!read_ok",
+		.result = REJECT,
 	},
 	{
 		"jset: functional",