summaryrefslogtreecommitdiffstats
path: root/0001-bpf-Add-tech-preview-taint-for-syscall.patch
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-07-13 19:13:24 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-07-13 19:13:24 +0200
commitfda836ec43c28561c5521309060648d2e67239e8 (patch)
treeda0abeb4b963206fc5154a7d98e299906f17608e /0001-bpf-Add-tech-preview-taint-for-syscall.patch
parente35e769d8cb3726d2e5a009d4223037ba45a5157 (diff)
parentaa5ab7f890a036ab6802c7a0c8cf8459a324e3c2 (diff)
downloadkernel-fda836ec43c28561c5521309060648d2e67239e8.tar.gz
kernel-fda836ec43c28561c5521309060648d2e67239e8.tar.xz
kernel-fda836ec43c28561c5521309060648d2e67239e8.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc5.1.vanilla.1.fc33kernel-5.8.0-0.rc5.1.vanilla.1.fc32kernel-5.8.0-0.rc5.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.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/0001-bpf-Add-tech-preview-taint-for-syscall.patch b/0001-bpf-Add-tech-preview-taint-for-syscall.patch
index 6b048f448..2487c60f1 100644
--- a/0001-bpf-Add-tech-preview-taint-for-syscall.patch
+++ b/0001-bpf-Add-tech-preview-taint-for-syscall.patch
@@ -27,10 +27,10 @@ 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 dcdf7649f4b7..2751eb3cfe06 100644
+index 60f70f31060e..628d0ba68106 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
-@@ -4096,11 +4096,17 @@ static int bpf_iter_create(union bpf_attr *attr)
+@@ -4094,11 +4094,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;