| From fllinden@amazon.com Sun May 2 13:07:20 2021 |
| From: Frank van der Linden <fllinden@amazon.com> |
| Date: Sat, 1 May 2021 18:05:06 +0000 |
| Subject: bpf: fix up selftests after backports were fixed |
| To: <stable@vger.kernel.org> |
| Cc: <bpf@vger.kernel.org>, <samjonas@amazon.com> |
| Message-ID: <20210501180506.19154-3-fllinden@amazon.com> |
| |
| From: Frank van der Linden <fllinden@amazon.com> |
| |
| After the backport of the changes to fix CVE 2019-7308, the |
| selftests also need to be fixed up, as was done originally |
| in mainline 80c9b2fae87b ("bpf: add various test cases to selftests"). |
| |
| 4.14 commit 03f11a51a19 ("bpf: Fix selftests are changes for CVE 2019-7308") |
| did that, but since there was an error in the backport, some |
| selftests did not change output. So, add them now that this error |
| has been fixed, and their output has actually changed as expected. |
| |
| This adds the rest of the changed test outputs from 80c9b2fae87b. |
| |
| Fixes: 03f11a51a19 ("bpf: Fix selftests are changes for CVE 2019-7308") |
| Signed-off-by: Frank van der Linden <fllinden@amazon.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| tools/testing/selftests/bpf/test_verifier.c | 12 ++++++++++++ |
| 1 file changed, 12 insertions(+) |
| |
| --- a/tools/testing/selftests/bpf/test_verifier.c |
| +++ b/tools/testing/selftests/bpf/test_verifier.c |
| @@ -6207,6 +6207,7 @@ static struct bpf_test tests[] = { |
| }, |
| .fixup_map1 = { 3 }, |
| .errstr = "unbounded min value", |
| + .errstr_unpriv = "R1 has unknown scalar with mixed signed bounds", |
| .result = REJECT, |
| }, |
| { |
| @@ -6231,6 +6232,7 @@ static struct bpf_test tests[] = { |
| }, |
| .fixup_map1 = { 3 }, |
| .errstr = "unbounded min value", |
| + .errstr_unpriv = "R1 has unknown scalar with mixed signed bounds", |
| .result = REJECT, |
| }, |
| { |
| @@ -6257,6 +6259,7 @@ static struct bpf_test tests[] = { |
| }, |
| .fixup_map1 = { 3 }, |
| .errstr = "unbounded min value", |
| + .errstr_unpriv = "R8 has unknown scalar with mixed signed bounds", |
| .result = REJECT, |
| }, |
| { |
| @@ -6282,6 +6285,7 @@ static struct bpf_test tests[] = { |
| }, |
| .fixup_map1 = { 3 }, |
| .errstr = "unbounded min value", |
| + .errstr_unpriv = "R8 has unknown scalar with mixed signed bounds", |
| .result = REJECT, |
| }, |
| { |
| @@ -6330,6 +6334,7 @@ static struct bpf_test tests[] = { |
| }, |
| .fixup_map1 = { 3 }, |
| .errstr = "unbounded min value", |
| + .errstr_unpriv = "R1 has unknown scalar with mixed signed bounds", |
| .result = REJECT, |
| }, |
| { |
| @@ -6401,6 +6406,7 @@ static struct bpf_test tests[] = { |
| }, |
| .fixup_map1 = { 3 }, |
| .errstr = "unbounded min value", |
| + .errstr_unpriv = "R1 has unknown scalar with mixed signed bounds", |
| .result = REJECT, |
| }, |
| { |
| @@ -6452,6 +6458,7 @@ static struct bpf_test tests[] = { |
| }, |
| .fixup_map1 = { 3 }, |
| .errstr = "unbounded min value", |
| + .errstr_unpriv = "R1 has unknown scalar with mixed signed bounds", |
| .result = REJECT, |
| }, |
| { |
| @@ -6479,6 +6486,7 @@ static struct bpf_test tests[] = { |
| }, |
| .fixup_map1 = { 3 }, |
| .errstr = "unbounded min value", |
| + .errstr_unpriv = "R1 has unknown scalar with mixed signed bounds", |
| .result = REJECT, |
| }, |
| { |
| @@ -6505,6 +6513,7 @@ static struct bpf_test tests[] = { |
| }, |
| .fixup_map1 = { 3 }, |
| .errstr = "unbounded min value", |
| + .errstr_unpriv = "R1 has unknown scalar with mixed signed bounds", |
| .result = REJECT, |
| }, |
| { |
| @@ -6534,6 +6543,7 @@ static struct bpf_test tests[] = { |
| }, |
| .fixup_map1 = { 3 }, |
| .errstr = "unbounded min value", |
| + .errstr_unpriv = "R7 has unknown scalar with mixed signed bounds", |
| .result = REJECT, |
| }, |
| { |
| @@ -6592,6 +6602,7 @@ static struct bpf_test tests[] = { |
| }, |
| .fixup_map1 = { 3 }, |
| .errstr = "unbounded min value", |
| + .errstr_unpriv = "R1 has unknown scalar with mixed signed bounds", |
| .result = REJECT, |
| .result_unpriv = REJECT, |
| }, |
| @@ -6644,6 +6655,7 @@ static struct bpf_test tests[] = { |
| }, |
| .fixup_map1 = { 3 }, |
| .errstr = "R0 min value is negative, either use unsigned index or do a if (index >=0) check.", |
| + .errstr_unpriv = "R1 has unknown scalar with mixed signed bounds", |
| .result = REJECT, |
| }, |
| { |