diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-25 20:23:31 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-25 20:23:31 +0200 |
commit | d48a756e71e269ecef24682ba38b6b49ed2a6abe (patch) | |
tree | eedcffbdc006249cf78c978921353f2d48ea1eb7 /0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch | |
parent | 0fef10ff99cd9135af6241b94fc9ca8a1aaba78e (diff) | |
parent | a79d8affb70a95069c35a0ccf7085e230c22a98d (diff) | |
download | kernel-d48a756e71e269ecef24682ba38b6b49ed2a6abe.tar.gz kernel-d48a756e71e269ecef24682ba38b6b49ed2a6abe.tar.xz kernel-d48a756e71e269ecef24682ba38b6b49ed2a6abe.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.7.0-0.rc7.1.vanilla.1.fc33kernel-5.7.0-0.rc7.1.vanilla.1.fc32kernel-5.7.0-0.rc7.1.vanilla.1.fc31kernel-5.7.0-0.rc7.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 ea35a5447..ba329b723 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 2843bbba9ca1..0ef4f2f203fd 100644 +index 4e6dee19a668..77ecd8b47d70 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -24,6 +24,7 @@ |