diff options
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 | 18 |
1 files changed, 9 insertions, 9 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 017a48a4f..03835d66c 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 f3eeecbb3f63..1708658fae27 100644 +index fb95fad81c79..a43287854f8a 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -5233,6 +5233,14 @@ +@@ -5277,6 +5277,14 @@ unknown_nmi_panic [X86] Cause panic on unknown NMI. @@ -53,10 +53,10 @@ index f3eeecbb3f63..1708658fae27 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 c041d4e950f4..8588bb62e74c 100644 +index 28be75396242..0a0081b10edb 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h -@@ -610,7 +610,7 @@ extern enum system_states { +@@ -618,7 +618,7 @@ extern enum system_states { #define TAINT_RESERVED28 28 #define TAINT_RESERVED29 29 #define TAINT_RESERVED30 30 @@ -64,9 +64,9 @@ index c041d4e950f4..8588bb62e74c 100644 +#define TAINT_UNPRIVILEGED_BPF 31 /* End of Red Hat-specific taint flags */ #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 4d530b1d5683..8ec44a344455 100644 +index c3ae2adaeccd..7b23725a1940 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -24,6 +24,7 @@ @@ -75,7 +75,7 @@ index 4d530b1d5683..8ec44a344455 100644 #include <linux/audit.h> +#include <linux/init.h> #include <uapi/linux/btf.h> - #include <asm/pgtable.h> + #include <linux/pgtable.h> #include <linux/bpf_lsm.h> @@ -48,7 +49,25 @@ static DEFINE_SPINLOCK(map_idr_lock); static DEFINE_IDR(link_idr); @@ -105,10 +105,10 @@ index 4d530b1d5683..8ec44a344455 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 02f9b2c36cc1..fa06b8cbc457 100644 +index 087392cd7dc8..d4b2c5b197cb 100644 --- a/kernel/panic.c +++ b/kernel/panic.c -@@ -389,7 +389,7 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = { +@@ -399,7 +399,7 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = { [ TAINT_RESERVED28 ] = { '?', '-', false }, [ TAINT_RESERVED29 ] = { '?', '-', false }, [ TAINT_RESERVED30 ] = { '?', '-', false }, |