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-Add-tech-preview-taint-for-syscall.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-Add-tech-preview-taint-for-syscall.patch')
| -rw-r--r-- | 0001-bpf-Add-tech-preview-taint-for-syscall.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/0001-bpf-Add-tech-preview-taint-for-syscall.patch b/0001-bpf-Add-tech-preview-taint-for-syscall.patch index 81734460b..e13040fe8 100644 --- a/0001-bpf-Add-tech-preview-taint-for-syscall.patch +++ b/0001-bpf-Add-tech-preview-taint-for-syscall.patch @@ -27,17 +27,17 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com> 1 file changed, 6 insertions(+) diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c -index cf20a460c82c..50f92fb4e6fe 100644 +index 8ec44a344455..dc862679a5f3 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c -@@ -3701,11 +3701,17 @@ static int link_update(union bpf_attr *attr) +@@ -4097,11 +4097,17 @@ static int bpf_iter_create(union bpf_attr *attr) SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, size) { union bpf_attr attr; + static int marked; int err; - if (sysctl_unprivileged_bpf_disabled && !capable(CAP_SYS_ADMIN)) + if (sysctl_unprivileged_bpf_disabled && !bpf_capable()) return -EPERM; + if (!marked) { |