diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-30 17:31:55 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-30 17:31:55 +0200 |
commit | e11be5e9f76f0b54aa2a38b67b3cf193a0dfae9a (patch) | |
tree | 724e53ad8d5c0f42dc98ddc9e9ab1f39e1e3c542 /0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch | |
parent | 7b32641801900ee7e32065b436d7318c5d7a972e (diff) | |
parent | d176dfce22f5ead7a6018edb69757bc8840cc008 (diff) | |
download | kernel-e11be5e9f76f0b54aa2a38b67b3cf193a0dfae9a.tar.gz kernel-e11be5e9f76f0b54aa2a38b67b3cf193a0dfae9a.tar.xz kernel-e11be5e9f76f0b54aa2a38b67b3cf193a0dfae9a.zip |
merge origin
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 | 10 |
1 files changed, 5 insertions, 5 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 3f0348b3c..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 @@ -40,7 +40,7 @@ index fb95fad81c79..a43287854f8a 100644 @@ -5277,6 +5277,14 @@ unknown_nmi_panic [X86] Cause panic on unknown NMI. - + + unprivileged_bpf_disabled= + Format: { "0" | "1" } + Sets the initial value of @@ -80,7 +80,7 @@ index 8da159936bab..8f5546ec2d1f 100644 @@ -48,7 +49,25 @@ static DEFINE_SPINLOCK(map_idr_lock); static DEFINE_IDR(link_idr); static DEFINE_SPINLOCK(link_idr_lock); - + -int sysctl_unprivileged_bpf_disabled __read_mostly; +/* RHEL-only: default to 1 */ +int sysctl_unprivileged_bpf_disabled __read_mostly = 1; @@ -101,7 +101,7 @@ index 8da159936bab..8f5546ec2d1f 100644 + return 1; +} +__setup("unprivileged_bpf_disabled=", unprivileged_bpf_setup); - + 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 @@ -115,8 +115,8 @@ index 534bc76e43da..e3bae852d92f 100644 - [ TAINT_RESERVED31 ] = { '?', '-', false }, + [ TAINT_UNPRIVILEGED_BPF ] = { 'u', ' ', false }, }; - + /** -- -2.25.4 +2.26.2 |