diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-09-07 15:31:14 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-09-07 15:31:14 +0200 |
commit | 7e94b9d93d2b0133f198cfb7315fdb011cdc21bf (patch) | |
tree | 07ca66d809cd994bf470f4a0692d5e84e7be31fb /0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch | |
parent | b006d4c8a7650c95a1504f20f82569221ad8db24 (diff) | |
parent | 45d4c5a623b7a0f6aeb373f4760dd0ce4d841942 (diff) | |
download | kernel-5.9.0-0.rc4.5.vanilla.2.fc31.tar.gz kernel-5.9.0-0.rc4.5.vanilla.2.fc31.tar.xz kernel-5.9.0-0.rc4.5.vanilla.2.fc31.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc4.5.vanilla.2.fc34kernel-5.9.0-0.rc4.5.vanilla.2.fc33kernel-5.9.0-0.rc4.5.vanilla.2.fc32kernel-5.9.0-0.rc4.5.vanilla.2.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 | 2 |
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 673a78bbc..bb6b63bec 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 f14f238dc36a..156d1e44d9f7 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 1bf960aa615c..df6479d7ff5f 100644 +index b999e7ff2583..5e5ac50d9137 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -24,6 +24,7 @@ |