From aaa9d9ffe7b024ca6c95af91ceb1b82b12112faa Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 8 Mar 2022 22:01:37 +0100 Subject: [PATCH] 5.16-stable patches added patches: arm-fix-build-error-when-bpf_syscall-is-disabled.patch --- ...d-error-when-bpf_syscall-is-disabled.patch | 31 +++++++++++++++++++ queue-5.16/series | 1 + 2 files changed, 32 insertions(+) create mode 100644 queue-5.16/arm-fix-build-error-when-bpf_syscall-is-disabled.patch diff --git a/queue-5.16/arm-fix-build-error-when-bpf_syscall-is-disabled.patch b/queue-5.16/arm-fix-build-error-when-bpf_syscall-is-disabled.patch new file mode 100644 index 00000000000..4e3236897ae --- /dev/null +++ b/queue-5.16/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.16/series b/queue-5.16/series index 364b6ea239c..d69e57210ee 100644 --- a/queue-5.16/series +++ b/queue-5.16/series @@ -34,3 +34,4 @@ arm64-mitigate-spectre-style-branch-history-side-channels.patch kvm-arm64-allow-smccc_arch_workaround_3-to-be-discovered-and-migrated.patch arm64-use-the-clearbhb-instruction-in-mitigations.patch arm64-proton-pack-include-unprivileged-ebpf-status-in-spectre-v2-mitigation-reporting.patch +arm-fix-build-error-when-bpf_syscall-is-disabled.patch -- 2.47.2