diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-25 20:23:31 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-25 20:23:31 +0200 |
commit | d48a756e71e269ecef24682ba38b6b49ed2a6abe (patch) | |
tree | eedcffbdc006249cf78c978921353f2d48ea1eb7 /0001-bpf-Add-tech-preview-taint-for-syscall.patch | |
parent | 0fef10ff99cd9135af6241b94fc9ca8a1aaba78e (diff) | |
parent | a79d8affb70a95069c35a0ccf7085e230c22a98d (diff) | |
download | kernel-d48a756e71e269ecef24682ba38b6b49ed2a6abe.tar.gz kernel-d48a756e71e269ecef24682ba38b6b49ed2a6abe.tar.xz kernel-d48a756e71e269ecef24682ba38b6b49ed2a6abe.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.7.0-0.rc7.1.vanilla.1.fc33kernel-5.7.0-0.rc7.1.vanilla.1.fc32kernel-5.7.0-0.rc7.1.vanilla.1.fc31kernel-5.7.0-0.rc7.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 | 4 |
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 e62b5a3c9..7f1de1099 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 0ef4f2f203fd..b8f8bf3aca50 100644 +index 77ecd8b47d70..759670262445 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c -@@ -3687,11 +3687,17 @@ static int link_update(union bpf_attr *attr) +@@ -3698,11 +3698,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; |