diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-12 06:49:43 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-12 06:49:43 +0200 |
commit | 17af4ec052a4e628ec6142e19398fdfabb4206e8 (patch) | |
tree | f8d0953c9460749b598e30a56c3bb325dfc6aeb9 /0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch | |
parent | 168917328214e94a54dbd4ef227dab46029b8134 (diff) | |
parent | e9f1331084c27ee3ba0be15c1e5c9eae4b15a6cb (diff) | |
download | kernel-17af4ec052a4e628ec6142e19398fdfabb4206e8.tar.gz kernel-17af4ec052a4e628ec6142e19398fdfabb4206e8.tar.xz kernel-17af4ec052a4e628ec6142e19398fdfabb4206e8.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200611gitb29482fde649.1.vanilla.1.fc33kernel-5.8.0-0.rc0.20200611gitb29482fde649.1.vanilla.1.fc32kernel-5.8.0-0.rc0.20200611gitb29482fde649.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 03835d66c..c3808a692 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 c3ae2adaeccd..7b23725a1940 100644 +index 9693730833d2..c629d286f540 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -24,6 +24,7 @@ |