diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-24 05:31:22 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-24 05:56:43 +0200 |
commit | 837cd03f031f1daaa2dda23d584cda25b0dfd51e (patch) | |
tree | 5a62f9127c7daa3d8f96e1394ef74421a7fb53e7 /0001-bpf-Add-tech-preview-taint-for-syscall.patch | |
parent | 536dec0b3393550051e61fc345aede447477bf94 (diff) | |
parent | d1b6f8c7af0eb9a0a44b2d4723e58dde5eafa236 (diff) | |
download | kernel-837cd03f031f1daaa2dda23d584cda25b0dfd51e.tar.gz kernel-837cd03f031f1daaa2dda23d584cda25b0dfd51e.tar.xz kernel-837cd03f031f1daaa2dda23d584cda25b0dfd51e.zip |
merge masterkernel-5.7.0-0.rc2.20200423git7adc4b399952.1.vanilla.1.fc33kernel-5.7.0-0.rc2.20200423git7adc4b399952.1.vanilla.1.fc32kernel-5.7.0-0.rc2.20200423git7adc4b399952.1.vanilla.1.fc31kernel-5.7.0-0.rc2.20200423git7adc4b399952.1.vanilla.1.fc30
Diffstat (limited to '0001-bpf-Add-tech-preview-taint-for-syscall.patch')
-rw-r--r-- | 0001-bpf-Add-tech-preview-taint-for-syscall.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/0001-bpf-Add-tech-preview-taint-for-syscall.patch b/0001-bpf-Add-tech-preview-taint-for-syscall.patch new file mode 100644 index 000000000..03c9e8152 --- /dev/null +++ b/0001-bpf-Add-tech-preview-taint-for-syscall.patch @@ -0,0 +1,53 @@ +From 0126c84a2e7cdad9c0f0f74005c4bf1900ceac9c Mon Sep 17 00:00:00 2001 +From: Eugene Syromiatnikov <esyr@redhat.com> +Date: Thu, 14 Jun 2018 16:36:08 -0400 +Subject: [PATCH] bpf: Add tech preview taint for syscall + +Message-id: <394af3a9985d1ad9ea6741cb95ff145312d106b9.1528991396.git.esyr@redhat.com> +Patchwork-id: 8251 +O-Subject: [kernel team] [RHEL8 PATCH v4 3/5] [bpf] bpf: Add tech preview taint for syscall +Bugzilla: 1559877 +RH-Acked-by: Jiri Benc <jbenc@redhat.com> +RH-Acked-by: Jesper Dangaard Brouer <brouer@redhat.com> + +Adding tech preview taint for using the eBPF syscall. + +Based on a RHEL 7 commit "bpf: Add tech preview taint for syscall" by +Jiri Olsa. + +Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1559877 +Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=16716594 + +Upstream Status: RHEL only +Signed-off-by: Jiri Olsa <jolsa@redhat.com> +Signed-off-by: Eugene Syromiatnikov <esyr@redhat.com> +Signed-off-by: Herton R. Krzesinski <herton@redhat.com> +--- + kernel/bpf/syscall.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c +index 39c033265bae..28ed55c3dd18 100644 +--- a/kernel/bpf/syscall.c ++++ b/kernel/bpf/syscall.c +@@ -3678,11 +3678,17 @@ static int link_update(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)) + return -EPERM; + ++ if (!marked) { ++ mark_tech_preview("eBPF syscall", NULL); ++ marked = true; ++ } ++ + err = bpf_check_uarg_tail_zero(uattr, sizeof(attr), size); + if (err) + return err; +-- +2.26.0 + |