From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 10 Mar 2022 12:25:32 +0000 (+0100)
Subject: fix up x86-speculation-include-unprivileged-ebpf-status-in-spectre-v2-mitigation... 
X-Git-Tag: v4.9.306~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=31ea36a6edd40829161acd0fd88f4ce46d4a2527;p=thirdparty%2Fkernel%2Fstable-queue.git

fix up x86-speculation-include-unprivileged-ebpf-status-in-spectre-v2-mitigation-reporting.patch

for 5.4 and 4.19
---

diff --git a/queue-4.19/x86-speculation-include-unprivileged-ebpf-status-in-spectre-v2-mitigation-reporting.patch b/queue-4.19/x86-speculation-include-unprivileged-ebpf-status-in-spectre-v2-mitigation-reporting.patch
index a8818ab2ec6..bca0d2f1cdf 100644
--- a/queue-4.19/x86-speculation-include-unprivileged-ebpf-status-in-spectre-v2-mitigation-reporting.patch
+++ b/queue-4.19/x86-speculation-include-unprivileged-ebpf-status-in-spectre-v2-mitigation-reporting.patch
@@ -111,9 +111,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  #else /* !CONFIG_BPF_SYSCALL */
  static inline struct bpf_prog *bpf_prog_get(u32 ufd)
  {
-@@ -801,6 +806,12 @@ static inline int bpf_fd_reuseport_array
+@@ -644,6 +649,12 @@ static inline struct bpf_prog *bpf_prog_
  {
- 	return -EOPNOTSUPP;
+ 	return ERR_PTR(-EOPNOTSUPP);
  }
 +
 +static inline bool unprivileged_ebpf_enabled(void)
@@ -122,8 +122,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +}
 +
  #endif /* CONFIG_BPF_SYSCALL */
- #endif /* defined(CONFIG_INET) && defined(CONFIG_BPF_SYSCALL) */
  
+ static inline struct bpf_prog *bpf_prog_get_type(u32 ufd,
 --- a/kernel/sysctl.c
 +++ b/kernel/sysctl.c
 @@ -251,6 +251,11 @@ static int sysrq_sysctl_handler(struct c
diff --git a/queue-5.4/x86-speculation-include-unprivileged-ebpf-status-in-spectre-v2-mitigation-reporting.patch b/queue-5.4/x86-speculation-include-unprivileged-ebpf-status-in-spectre-v2-mitigation-reporting.patch
index a2eb56ecb09..b7585e63af1 100644
--- a/queue-5.4/x86-speculation-include-unprivileged-ebpf-status-in-spectre-v2-mitigation-reporting.patch
+++ b/queue-5.4/x86-speculation-include-unprivileged-ebpf-status-in-spectre-v2-mitigation-reporting.patch
@@ -112,9 +112,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  #else /* !CONFIG_BPF_SYSCALL */
  static inline struct bpf_prog *bpf_prog_get(u32 ufd)
  {
-@@ -1034,6 +1040,12 @@ static inline int bpf_fd_reuseport_array
+@@ -881,6 +887,12 @@ static inline int bpf_prog_test_run_flow
  {
- 	return -EOPNOTSUPP;
+ 	return -ENOTSUPP;
  }
 +
 +static inline bool unprivileged_ebpf_enabled(void)
@@ -123,8 +123,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +}
 +
  #endif /* CONFIG_BPF_SYSCALL */
- #endif /* defined(CONFIG_INET) && defined(CONFIG_BPF_SYSCALL) */
  
+ static inline struct bpf_prog *bpf_prog_get_type(u32 ufd,
 --- a/kernel/sysctl.c
 +++ b/kernel/sysctl.c
 @@ -251,6 +251,11 @@ static int sysrq_sysctl_handler(struct c