From: Greg Kroah-Hartman Date: Tue, 23 Aug 2022 11:12:49 +0000 (+0200) Subject: drop queue-4.19/selftests-bpf-fix-dubious-pointer-arithmetic-test.patch X-Git-Tag: v4.9.326~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=58c2e7b7bb4c9bfbcacdaf3e19ae4c6c01dcae5f;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-4.19/selftests-bpf-fix-dubious-pointer-arithmetic-test.patch --- diff --git a/queue-4.19/selftests-bpf-fix-dubious-pointer-arithmetic-test.patch b/queue-4.19/selftests-bpf-fix-dubious-pointer-arithmetic-test.patch deleted file mode 100644 index 13b0c05807d..00000000000 --- a/queue-4.19/selftests-bpf-fix-dubious-pointer-arithmetic-test.patch +++ /dev/null @@ -1,53 +0,0 @@ -From foo@baz Sat Aug 13 03:11:42 PM CEST 2022 -From: Ovidiu Panait -Date: Tue, 9 Aug 2022 10:39:47 +0300 -Subject: selftests/bpf: Fix "dubious pointer arithmetic" test -To: stable@vger.kernel.org -Cc: Jean-Philippe Brucker , John Fastabend , Alexei Starovoitov , Ovidiu Panait -Message-ID: <20220809073947.33804-5-ovidiu.panait@windriver.com> - -From: Ovidiu Panait - -From: Jean-Philippe Brucker - -commit 3615bdf6d9b19db12b1589861609b4f1c6a8d303 upstream. - -The verifier trace changed following a bugfix. After checking the 64-bit -sign, only the upper bit mask is known, not bit 31. Update the test -accordingly. - -Signed-off-by: Jean-Philippe Brucker -Acked-by: John Fastabend -Signed-off-by: Alexei Starovoitov -[OP: adjust for 4.19 selftests] -Signed-off-by: Ovidiu Panait -Signed-off-by: Greg Kroah-Hartman ---- - tools/testing/selftests/bpf/test_align.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - ---- a/tools/testing/selftests/bpf/test_align.c -+++ b/tools/testing/selftests/bpf/test_align.c -@@ -475,10 +475,10 @@ static struct bpf_align_test tests[] = { - */ - {7, "R5=inv(id=0,smin_value=-9223372036854775806,smax_value=9223372036854775806,umin_value=2,umax_value=18446744073709551614,var_off=(0x2; 0xfffffffffffffffc)"}, - /* Checked s>=0 */ -- {9, "R5=inv(id=0,umin_value=2,umax_value=9223372034707292158,var_off=(0x2; 0x7fffffff7ffffffc)"}, -+ {9, "R5=inv(id=0,umin_value=2,umax_value=9223372036854775806,var_off=(0x2; 0x7ffffffffffffffc)"}, - /* packet pointer + nonnegative (4n+2) */ -- {11, "R6_w=pkt(id=1,off=0,r=0,umin_value=2,umax_value=9223372034707292158,var_off=(0x2; 0x7fffffff7ffffffc)"}, -- {13, "R4=pkt(id=1,off=4,r=0,umin_value=2,umax_value=9223372034707292158,var_off=(0x2; 0x7fffffff7ffffffc)"}, -+ {11, "R6_w=pkt(id=1,off=0,r=0,umin_value=2,umax_value=9223372036854775806,var_off=(0x2; 0x7ffffffffffffffc)"}, -+ {13, "R4=pkt(id=1,off=4,r=0,umin_value=2,umax_value=9223372036854775806,var_off=(0x2; 0x7ffffffffffffffc)"}, - /* NET_IP_ALIGN + (4n+2) == (4n), alignment is fine. - * We checked the bounds, but it might have been able - * to overflow if the packet pointer started in the -@@ -486,7 +486,7 @@ static struct bpf_align_test tests[] = { - * So we did not get a 'range' on R6, and the access - * attempt will fail. - */ -- {15, "R6=pkt(id=1,off=0,r=0,umin_value=2,umax_value=9223372034707292158,var_off=(0x2; 0x7fffffff7ffffffc)"}, -+ {15, "R6=pkt(id=1,off=0,r=0,umin_value=2,umax_value=9223372036854775806,var_off=(0x2; 0x7ffffffffffffffc)"}, - } - }, - { diff --git a/queue-4.19/series b/queue-4.19/series index 541190ab164..ee0a5e2e8b3 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -23,7 +23,6 @@ drm-nouveau-fix-another-off-by-one-in-nvbios_addr.patch drm-amdgpu-check-bo-s-requested-pinning-domains-against-its-preferred_domains.patch bpf-verifer-adjust_scalar_min_max_vals-to-always-call-update_reg_bounds.patch selftests-bpf-fix-test_align-verifier-log-patterns.patch -selftests-bpf-fix-dubious-pointer-arithmetic-test.patch iio-light-isl29028-fix-the-warning-in-isl29028_remove.patch fuse-limit-nsec.patch serial-mvebu-uart-uart2-error-bits-clearing.patch