diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-18 19:51:51 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-18 19:51:51 +0200 |
commit | aae208c12f61545f388c2e6d1f22c30ec858c293 (patch) | |
tree | 7a6f6fa03b1360b9df7f2150bd337fa33a9ff8d5 /0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch | |
parent | 81b1269020cd33317e9c61de223f735c3ef35525 (diff) | |
parent | 8bcec8d9026ed6b2c51c7947c2e28628e701dfe8 (diff) | |
download | kernel-aae208c12f61545f388c2e6d1f22c30ec858c293.tar.gz kernel-aae208c12f61545f388c2e6d1f22c30ec858c293.tar.xz kernel-aae208c12f61545f388c2e6d1f22c30ec858c293.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.7.0-0.rc6.1.vanilla.1.fc33kernel-5.7.0-0.rc6.1.vanilla.1.fc32kernel-5.7.0-0.rc6.1.vanilla.1.fc31kernel-5.7.0-0.rc6.1.vanilla.1.fc30
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 d5f7c0d61..ea35a5447 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 7626b8024471..082d4d5f24fd 100644 +index 2843bbba9ca1..0ef4f2f203fd 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -24,6 +24,7 @@ |