diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-05 06:28:48 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-05 06:28:48 +0200 |
commit | d2c10672fc73b0484b5bd441c7a43087a20cfc61 (patch) | |
tree | 7efced3b710d2f69710737776735c8dffe23642e /0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch | |
parent | b16f4ddd7e5422a842beaeaeea0c411bd432d0f4 (diff) | |
parent | 728cc6ed65d0536c42e067ed0c544d614988087e (diff) | |
download | kernel-d2c10672fc73b0484b5bd441c7a43087a20cfc61.tar.gz kernel-d2c10672fc73b0484b5bd441c7a43087a20cfc61.tar.xz kernel-d2c10672fc73b0484b5bd441c7a43087a20cfc61.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200604git9fb4c5250f10.1.vanilla.1.fc33kernel-5.8.0-0.rc0.20200604git9fb4c5250f10.1.vanilla.1.fc32kernel-5.8.0-0.rc0.20200604git9fb4c5250f10.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 | 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 8fa586555..69229c402 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 4379c6ac3265..0344ce405595 100644 +index 89386f6f3ab6..f7ee70888a60 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -5188,6 +5188,14 @@ +@@ -5228,6 +5228,14 @@ unknown_nmi_panic [X86] Cause panic on unknown NMI. @@ -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 42c7a42fc9c8..cf20a460c82c 100644 +index 4d530b1d5683..8ec44a344455 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -24,6 +24,7 @@ @@ -77,9 +77,9 @@ index 42c7a42fc9c8..cf20a460c82c 100644 #include <uapi/linux/btf.h> #include <asm/pgtable.h> #include <linux/bpf_lsm.h> -@@ -44,7 +45,25 @@ static DEFINE_SPINLOCK(prog_idr_lock); - static DEFINE_IDR(map_idr); - static DEFINE_SPINLOCK(map_idr_lock); +@@ -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 */ |