From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 1 Apr 2020 11:14:41 +0000 (+0200)
Subject: 5.6-stable patches
X-Git-Tag: v5.6.2~22
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c1a9ed5b7e492a450f1fb79d1d2ba7686c81bf09;p=thirdparty%2Fkernel%2Fstable-queue.git

5.6-stable patches

added patches:
	bpf-update-jmp32-test-cases-to-fix-range-bound-deduction.patch
---

diff --git a/queue-5.6/bpf-update-jmp32-test-cases-to-fix-range-bound-deduction.patch b/queue-5.6/bpf-update-jmp32-test-cases-to-fix-range-bound-deduction.patch
new file mode 100644
index 00000000000..a5e8efe89a7
--- /dev/null
+++ b/queue-5.6/bpf-update-jmp32-test-cases-to-fix-range-bound-deduction.patch
@@ -0,0 +1,53 @@
+From 6b5ca133b9fbd57f0ca4acd7999c4e9a93e702be Mon Sep 17 00:00:00 2001
+From: Daniel Borkmann <daniel@iogearbox.net>
+Date: Fri, 24 Jan 2020 14:21:14 +0000
+Subject: bpf: update jmp32 test cases to fix range bound deduction
+
+From: Daniel Borkmann <daniel@iogearbox.net>
+
+[ no upstream commit ]
+
+Since commit f2d67fec0b43 ("bpf: Undo incorrect __reg_bound_offset32 handling")
+has been backported to stable, we also need to update related test cases that
+started to (expectedly) fail on stable. Given the functionality has been reverted
+we need to move the result to REJECT.
+
+Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org>
+Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ tools/testing/selftests/bpf/verifier/jmp32.c |    9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+--- a/tools/testing/selftests/bpf/verifier/jmp32.c
++++ b/tools/testing/selftests/bpf/verifier/jmp32.c
+@@ -783,7 +783,8 @@
+ 	},
+ 	.prog_type = BPF_PROG_TYPE_SCHED_CLS,
+ 	.fixup_map_hash_48b = { 4 },
+-	.result = ACCEPT,
++	.result = REJECT,
++	.errstr = "R8 unbounded memory access",
+ 	.flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
+ },
+ {
+@@ -811,7 +812,8 @@
+ 	},
+ 	.prog_type = BPF_PROG_TYPE_SCHED_CLS,
+ 	.fixup_map_hash_48b = { 4 },
+-	.result = ACCEPT,
++	.result = REJECT,
++	.errstr = "R8 unbounded memory access",
+ 	.flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
+ },
+ {
+@@ -839,6 +841,7 @@
+ 	},
+ 	.prog_type = BPF_PROG_TYPE_SCHED_CLS,
+ 	.fixup_map_hash_48b = { 4 },
+-	.result = ACCEPT,
++	.result = REJECT,
++	.errstr = "R8 unbounded memory access",
+ 	.flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
+ },
diff --git a/queue-5.6/series b/queue-5.6/series
new file mode 100644
index 00000000000..edb199742ec
--- /dev/null
+++ b/queue-5.6/series
@@ -0,0 +1 @@
+bpf-update-jmp32-test-cases-to-fix-range-bound-deduction.patch