summaryrefslogtreecommitdiffstats
path: root/0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-08-27 19:48:54 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-08-27 19:48:54 +0200
commitbe305682f0f037608ba1884e677c56d30877d699 (patch)
tree53a33b12b4434182720920a9da81e27d2d40c7ed /0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch
parent8646321dee2344a7d6b8c53bc1694c23d6992fe8 (diff)
parent13bd6da63cf611a8325774f77a657cf8a6a0fc66 (diff)
downloadkernel-be305682f0f037608ba1884e677c56d30877d699.tar.gz
kernel-be305682f0f037608ba1884e677c56d30877d699.tar.xz
kernel-be305682f0f037608ba1884e677c56d30877d699.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc2.20200827git15bc20c6af4c.1.vanilla.2.fc32
Diffstat (limited to '0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch')
-rw-r--r--0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch b/0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch
index 7dcb0ac74..dc574435b 100644
--- a/0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch
+++ b/0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch
@@ -66,7 +66,7 @@ index 8d3eaa27b082..c93ba7fc65da 100644
#define TAINT_FLAGS_COUNT 32
#define TAINT_FLAGS_MAX ((1UL << TAINT_FLAGS_COUNT) - 1)
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
-index 86299a292214..ae1d88925f73 100644
+index 1bf960aa615c..df6479d7ff5f 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -24,6 +24,7 @@