From: Greg Kroah-Hartman Date: Tue, 8 Mar 2022 21:01:15 +0000 (+0100) Subject: 5.4-stable patches X-Git-Tag: v4.9.306~53 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e7f96d69766f112b380b7e602bf270c0c59f112c;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: arm-fix-build-error-when-bpf_syscall-is-disabled.patch --- diff --git a/queue-5.4/arm-fix-build-error-when-bpf_syscall-is-disabled.patch b/queue-5.4/arm-fix-build-error-when-bpf_syscall-is-disabled.patch new file mode 100644 index 00000000000..4e3236897ae --- /dev/null +++ b/queue-5.4/arm-fix-build-error-when-bpf_syscall-is-disabled.patch @@ -0,0 +1,31 @@ +From 330f4c53d3c2d8b11d86ec03a964b86dc81452f5 Mon Sep 17 00:00:00 2001 +From: Emmanuel Gil Peyrot +Date: Tue, 8 Mar 2022 20:18:20 +0100 +Subject: ARM: fix build error when BPF_SYSCALL is disabled + +From: Emmanuel Gil Peyrot + +commit 330f4c53d3c2d8b11d86ec03a964b86dc81452f5 upstream. + +It was missing a semicolon. + +Signed-off-by: Emmanuel Gil Peyrot +Reviewed-by: Nathan Chancellor +Fixes: 25875aa71dfe ("ARM: include unprivileged BPF status in Spectre V2 reporting"). +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm/kernel/spectre.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arm/kernel/spectre.c ++++ b/arch/arm/kernel/spectre.c +@@ -10,7 +10,7 @@ static bool _unprivileged_ebpf_enabled(v + #ifdef CONFIG_BPF_SYSCALL + return !sysctl_unprivileged_bpf_disabled; + #else +- return false ++ return false; + #endif + } + diff --git a/queue-5.4/series b/queue-5.4/series index 90b2748756b..fce99c7504f 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -15,3 +15,4 @@ arm-early-traps-initialisation.patch arm-use-loadaddr-to-get-load-address-of-sections.patch arm-spectre-bhb-workaround.patch arm-include-unprivileged-bpf-status-in-spectre-v2-reporting.patch +arm-fix-build-error-when-bpf_syscall-is-disabled.patch