| Message ID | 20190822153244.14818-2-kleber.souza@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | Fix bpf selftest compilation (LP: #1840935) | expand |
On 8/22/19 8:32 AM, Kleber Sacilotto de Souza wrote: > BugLink: https://bugs.launchpad.net/bugs/1840935 > > Commit a25d38b54163 (bpf: relax verifier restriction on BPF_MOV | > BPF_ALU), upstream commit e434b8cdf788568ba65a0a0fd9f3cb41f3ca1803, > breaks the compilation of bpf selftests because Bionic misses > 111e6b45315c (selftests/bpf: make test_verifier run most programs), > which adds the 'retval' member to struct bpf_test. > > Fix it by removing the setting of '.retval = 0', which isn't needed for > the current code in Bionic. > > Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com> Acked-by: Connor Kuehl <connor.kuehl@canonical.com> > --- > tools/testing/selftests/bpf/test_verifier.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/tools/testing/selftests/bpf/test_verifier.c b/tools/testing/selftests/bpf/test_verifier.c > index 5a25a4d7d81f..95e9e751862a 100644 > --- a/tools/testing/selftests/bpf/test_verifier.c > +++ b/tools/testing/selftests/bpf/test_verifier.c > @@ -2170,7 +2170,6 @@ static struct bpf_test tests[] = { > BPF_EXIT_INSN(), > }, > .result = ACCEPT, > - .retval = 0, > }, > { > "unpriv: partial copy of pointer", >
Acked-by: Kamal Mostafa <kamal@canonical.com> -Kamal On Thu, Aug 22, 2019 at 05:32:44PM +0200, Kleber Sacilotto de Souza wrote: > BugLink: https://bugs.launchpad.net/bugs/1840935 > > Commit a25d38b54163 (bpf: relax verifier restriction on BPF_MOV | > BPF_ALU), upstream commit e434b8cdf788568ba65a0a0fd9f3cb41f3ca1803, > breaks the compilation of bpf selftests because Bionic misses > 111e6b45315c (selftests/bpf: make test_verifier run most programs), > which adds the 'retval' member to struct bpf_test. > > Fix it by removing the setting of '.retval = 0', which isn't needed for > the current code in Bionic. > > Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com> > --- > tools/testing/selftests/bpf/test_verifier.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/tools/testing/selftests/bpf/test_verifier.c b/tools/testing/selftests/bpf/test_verifier.c > index 5a25a4d7d81f..95e9e751862a 100644 > --- a/tools/testing/selftests/bpf/test_verifier.c > +++ b/tools/testing/selftests/bpf/test_verifier.c > @@ -2170,7 +2170,6 @@ static struct bpf_test tests[] = { > BPF_EXIT_INSN(), > }, > .result = ACCEPT, > - .retval = 0, > }, > { > "unpriv: partial copy of pointer", > -- > 2.17.1 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
diff --git a/tools/testing/selftests/bpf/test_verifier.c b/tools/testing/selftests/bpf/test_verifier.c index 5a25a4d7d81f..95e9e751862a 100644 --- a/tools/testing/selftests/bpf/test_verifier.c +++ b/tools/testing/selftests/bpf/test_verifier.c @@ -2170,7 +2170,6 @@ static struct bpf_test tests[] = { BPF_EXIT_INSN(), }, .result = ACCEPT, - .retval = 0, }, { "unpriv: partial copy of pointer",
BugLink: https://bugs.launchpad.net/bugs/1840935 Commit a25d38b54163 (bpf: relax verifier restriction on BPF_MOV | BPF_ALU), upstream commit e434b8cdf788568ba65a0a0fd9f3cb41f3ca1803, breaks the compilation of bpf selftests because Bionic misses 111e6b45315c (selftests/bpf: make test_verifier run most programs), which adds the 'retval' member to struct bpf_test. Fix it by removing the setting of '.retval = 0', which isn't needed for the current code in Bionic. Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com> --- tools/testing/selftests/bpf/test_verifier.c | 1 - 1 file changed, 1 deletion(-)