diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-07-11 06:08:21 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-07-11 06:08:21 +0200 |
| commit | e35e769d8cb3726d2e5a009d4223037ba45a5157 (patch) | |
| tree | 36a0264da942601ba6c15491620ac4cde2c4ea44 /0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch | |
| parent | 74d01250fa4f11788cf5b4569d67c3f5af4b9f50 (diff) | |
| parent | d8d578bfa82493a49b71c8665b2f48c3e6df3617 (diff) | |
| download | kernel-e35e769d8cb3726d2e5a009d4223037ba45a5157.tar.gz kernel-e35e769d8cb3726d2e5a009d4223037ba45a5157.tar.xz kernel-e35e769d8cb3726d2e5a009d4223037ba45a5157.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc4.20200710git42f82040ee66.1.vanilla.1.fc32kernel-5.8.0-0.rc4.20200710git42f82040ee66.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 | 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 a5f4f93da..a9f2600da 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 28be75396242..0a0081b10edb 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 8da159936bab..8f5546ec2d1f 100644 +index 859053ddf05b..dcdf7649f4b7 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -24,6 +24,7 @@ |