summaryrefslogtreecommitdiffstats
path: root/0001-bpf-Add-tech-preview-taint-for-syscall.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2020-06-04 16:46:33 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2020-06-04 16:46:33 -0500
commit728cc6ed65d0536c42e067ed0c544d614988087e (patch)
treef5991a19b0130c8354171a2796150c2ee0cb6b2d /0001-bpf-Add-tech-preview-taint-for-syscall.patch
parent95dc4cf28c756d993d2080a495935006100a62a2 (diff)
downloadkernel-728cc6ed65d0536c42e067ed0c544d614988087e.tar.gz
kernel-728cc6ed65d0536c42e067ed0c544d614988087e.tar.xz
kernel-728cc6ed65d0536c42e067ed0c544d614988087e.zip
kernel-5.8.0-0.rc0.20200604git9fb4c5250f10.1
* Thu Jun 04 2020 Justin M. Forbes <jforbes@fedoraproject.org> [5.8.0-0.rc0.20200604git9fb4c5250f10.1] - More Fedora config work ("Justin M. Forbes") Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to '0001-bpf-Add-tech-preview-taint-for-syscall.patch')
-rw-r--r--0001-bpf-Add-tech-preview-taint-for-syscall.patch6
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) {