5.10-stable patches

added patches:
	selftests-bpf-fix-backported-assert_false.patch

diff --git a/queue-5.10/selftests-bpf-fix-backported-assert_false.patch b/queue-5.10/selftests-bpf-fix-backported-assert_false.patch
new file mode 100644 (file)
index 0000000..b75ddd4
--- /dev/null
+++ b/queue-5.10/selftests-bpf-fix-backported-assert_false.patch
@@ -0,0 +1,32 @@
+From lmb@cloudflare.com  Mon Oct 25 20:46:09 2021
+From: Lorenz Bauer <lmb@cloudflare.com>
+Date: Mon, 25 Oct 2021 17:06:19 +0100
+Subject: selftests: bpf: fix backported ASSERT_FALSE
+To: gregkh@linuxfoundation.org, andrii@kernel.org
+Cc: stable@vger.kernel.org, Lorenz Bauer <lmb@cloudflare.com>
+Message-ID: <20211025160619.501058-1-lmb@cloudflare.com>
+
+From: Lorenz Bauer <lmb@cloudflare.com>
+
+Commit 183d9ebd449c ("selftests/bpf: Fix core_reloc test runner") causes
+builds of selftests/bpf to fail on 5.10.y since the branch doesn't have the
+ASSERT_FALSE macro yet. Replace ASSERT_FALSE with ASSERT_EQ.
+
+Fixes: 183d9ebd449c ("selftests/bpf: Fix core_reloc test runner")
+Signed-off-by: Lorenz Bauer <lmb@cloudflare.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ tools/testing/selftests/bpf/prog_tests/core_reloc.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/tools/testing/selftests/bpf/prog_tests/core_reloc.c
++++ b/tools/testing/selftests/bpf/prog_tests/core_reloc.c
+@@ -857,7 +857,7 @@ void test_core_reloc(void)
+                       goto cleanup;
+               }
+ 
+-              if (!ASSERT_FALSE(test_case->fails, "obj_load_should_fail"))
++              if (!ASSERT_EQ(test_case->fails, false, "obj_load_should_fail"))
+                       goto cleanup;
+ 
+               equal = memcmp(data->out, test_case->output,

diff --git a/queue-5.10/series b/queue-5.10/series
index 7f1ddf0dabc9c7c8bc4caca5ca9f22d0735c341b..8816adcfe7b5f16268fabc4b2e2783493f7f117d 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -90,3 +90,4 @@ usbnet-sanity-check-for-maxpacket.patch
 net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch
 tracing-have-all-levels-of-checks-prevent-recursion.patch
 e1000e-separate-tgp-board-type-from-spt.patch
+selftests-bpf-fix-backported-assert_false.patch