From: Greg Kroah-Hartman Date: Mon, 25 Oct 2021 18:48:38 +0000 (+0200) Subject: 5.10-stable patches X-Git-Tag: v4.4.290~12 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0f2136925780edf473976f8c982360cd847337dc;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 00000000000..b75ddd48d65 --- /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 +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 +Message-ID: <20211025160619.501058-1-lmb@cloudflare.com> + +From: Lorenz Bauer + +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 +Signed-off-by: Greg Kroah-Hartman +--- + 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 7f1ddf0dabc..8816adcfe7b 100644 --- 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