diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-15 05:42:19 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-15 05:42:19 +0200 |
| commit | d0b8941357b7ce0c26d19376bc4d827042d6bb12 (patch) | |
| tree | 61138493dd96ee303830bc148d607fb915562b77 /0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch | |
| parent | f7ab3f33fe442b453cab73ec62b87ea9a757e0c7 (diff) | |
| parent | dadba4a34d797d91b5524e2ea22dc6374a2d85b1 (diff) | |
| download | kernel-d0b8941357b7ce0c26d19376bc4d827042d6bb12.tar.gz kernel-d0b8941357b7ce0c26d19376bc4d827042d6bb12.tar.xz kernel-d0b8941357b7ce0c26d19376bc4d827042d6bb12.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc1.1.vanilla.1.fc33kernel-5.8.0-0.rc1.1.vanilla.1.fc32kernel-5.8.0-0.rc1.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 | 4 |
1 files changed, 2 insertions, 2 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 c3808a692..a5f4f93da 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 9693730833d2..c629d286f540 100644 +index 8da159936bab..8f5546ec2d1f 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -24,6 +24,7 @@ @@ -105,7 +105,7 @@ index 9693730833d2..c629d286f540 100644 static const struct bpf_map_ops * const bpf_map_types[] = { #define BPF_PROG_TYPE(_id, _name, prog_ctx_type, kern_ctx_type) diff --git a/kernel/panic.c b/kernel/panic.c -index 087392cd7dc8..d4b2c5b197cb 100644 +index 534bc76e43da..e3bae852d92f 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -399,7 +399,7 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = { |