diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-03 21:03:07 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-03 21:03:07 +0200 |
| commit | b16f4ddd7e5422a842beaeaeea0c411bd432d0f4 (patch) | |
| tree | 3268a5a64dd96a1ebc80d1af24cdaa093d496385 /0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch | |
| parent | d5e4e88fb9466ff04a7cd07c1ae8323bbbc36b8b (diff) | |
| parent | 95dc4cf28c756d993d2080a495935006100a62a2 (diff) | |
| download | kernel-5.8.0-0.rc0.20200603gitd6f9469a03d8.1.vanilla.1.fc31.tar.gz kernel-5.8.0-0.rc0.20200603gitd6f9469a03d8.1.vanilla.1.fc31.tar.xz kernel-5.8.0-0.rc0.20200603gitd6f9469a03d8.1.vanilla.1.fc31.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200603gitd6f9469a03d8.1.vanilla.1.fc33kernel-5.8.0-0.rc0.20200603gitd6f9469a03d8.1.vanilla.1.fc32kernel-5.8.0-0.rc0.20200603gitd6f9469a03d8.1.vanilla.1.fc31
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.patch | 6 |
1 files changed, 3 insertions, 3 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 5641f2f78..8fa586555 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 c041d4e950f4..8588bb62e74c 100644 #define TAINT_FLAGS_COUNT 32 diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c -index 4e6dee19a668..77ecd8b47d70 100644 +index 42c7a42fc9c8..cf20a460c82c 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -24,6 +24,7 @@ @@ -75,9 +75,9 @@ index 4e6dee19a668..77ecd8b47d70 100644 #include <linux/audit.h> +#include <linux/init.h> #include <uapi/linux/btf.h> + #include <asm/pgtable.h> #include <linux/bpf_lsm.h> - -@@ -43,7 +44,25 @@ static DEFINE_SPINLOCK(prog_idr_lock); +@@ -44,7 +45,25 @@ static DEFINE_SPINLOCK(prog_idr_lock); static DEFINE_IDR(map_idr); static DEFINE_SPINLOCK(map_idr_lock); |