diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-13 20:17:57 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-13 20:17:57 +0200 |
commit | f05c02032c007399078784ea2ace322385f869b9 (patch) | |
tree | 7c1bd28f37be1d28a3c8ace051c55472ba8bdd63 /0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch | |
parent | 55576abe986db86a9f4e2b105d2451800d652217 (diff) | |
parent | f7a3bf654752fa0e92c7ab3e57e48d3415632852 (diff) | |
download | kernel-f05c02032c007399078784ea2ace322385f869b9.tar.gz kernel-f05c02032c007399078784ea2ace322385f869b9.tar.xz kernel-f05c02032c007399078784ea2ace322385f869b9.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
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 | 12 |
1 files changed, 6 insertions, 6 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 042d8b999..3832fffbf 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 @@ -34,10 +34,10 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com> 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index fb95fad81c79..a43287854f8a 100644 +index 98ea67f27809..352afb16f424 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -5277,6 +5277,14 @@ +@@ -5373,6 +5373,14 @@ unknown_nmi_panic [X86] Cause panic on unknown NMI. @@ -53,10 +53,10 @@ index fb95fad81c79..a43287854f8a 100644 [USB] Default USB device authorization: (default -1 = authorized except for wireless USB, diff --git a/include/linux/kernel.h b/include/linux/kernel.h -index 28be75396242..0a0081b10edb 100644 +index 8d3eaa27b082..c93ba7fc65da 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h -@@ -618,7 +618,7 @@ extern enum system_states { +@@ -617,7 +617,7 @@ extern enum system_states { #define TAINT_RESERVED28 28 #define TAINT_RESERVED29 29 #define TAINT_RESERVED30 30 @@ -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 0fd80ac81f70..60f70f31060e 100644 +index 2f343ce15747..f7e570292afe 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -24,6 +24,7 @@ @@ -105,7 +105,7 @@ index 0fd80ac81f70..60f70f31060e 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 534bc76e43da..e3bae852d92f 100644 +index fe1d3decf61c..2c483bec82d6 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -399,7 +399,7 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = { |