drop queue-5.14/bpf-add-oversize-check-before-call-kvcalloc.patch

diff --git a/queue-5.14/bpf-add-oversize-check-before-call-kvcalloc.patch b/queue-5.14/bpf-add-oversize-check-before-call-kvcalloc.patch
deleted file mode 100644 (file)
index a977d0a..0000000
--- a/queue-5.14/bpf-add-oversize-check-before-call-kvcalloc.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 0e6491b559704da720f6da09dd0a52c4df44c514 Mon Sep 17 00:00:00 2001
-From: Bixuan Cui <cuibixuan@huawei.com>
-Date: Sat, 11 Sep 2021 08:55:57 +0800
-Subject: bpf: Add oversize check before call kvcalloc()
-
-From: Bixuan Cui <cuibixuan@huawei.com>
-
-commit 0e6491b559704da720f6da09dd0a52c4df44c514 upstream.
-
-Commit 7661809d493b ("mm: don't allow oversized kvmalloc() calls") add the
-oversize check. When the allocation is larger than what kmalloc() supports,
-the following warning triggered:
-
-WARNING: CPU: 0 PID: 8408 at mm/util.c:597 kvmalloc_node+0x108/0x110 mm/util.c:597
-Modules linked in:
-CPU: 0 PID: 8408 Comm: syz-executor221 Not tainted 5.14.0-syzkaller #0
-Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
-RIP: 0010:kvmalloc_node+0x108/0x110 mm/util.c:597
-Call Trace:
- kvmalloc include/linux/mm.h:806 [inline]
- kvmalloc_array include/linux/mm.h:824 [inline]
- kvcalloc include/linux/mm.h:829 [inline]
- check_btf_line kernel/bpf/verifier.c:9925 [inline]
- check_btf_info kernel/bpf/verifier.c:10049 [inline]
- bpf_check+0xd634/0x150d0 kernel/bpf/verifier.c:13759
- bpf_prog_load kernel/bpf/syscall.c:2301 [inline]
- __sys_bpf+0x11181/0x126e0 kernel/bpf/syscall.c:4587
- __do_sys_bpf kernel/bpf/syscall.c:4691 [inline]
- __se_sys_bpf kernel/bpf/syscall.c:4689 [inline]
- __x64_sys_bpf+0x78/0x90 kernel/bpf/syscall.c:4689
- do_syscall_x64 arch/x86/entry/common.c:50 [inline]
- do_syscall_64+0x3d/0xb0 arch/x86/entry/common.c:80
- entry_SYSCALL_64_after_hwframe+0x44/0xae
-
-Reported-by: syzbot+f3e749d4c662818ae439@syzkaller.appspotmail.com
-Signed-off-by: Bixuan Cui <cuibixuan@huawei.com>
-Signed-off-by: Alexei Starovoitov <ast@kernel.org>
-Acked-by: Yonghong Song <yhs@fb.com>
-Link: https://lore.kernel.org/bpf/20210911005557.45518-1-cuibixuan@huawei.com
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- kernel/bpf/verifier.c |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/kernel/bpf/verifier.c
-+++ b/kernel/bpf/verifier.c
-@@ -10211,6 +10211,8 @@ static int propagate_liveness_reg(struct
-           /* Or if the read flag from REG is the same as PARENT_REG. */
-           parent_flag == flag)
-               return 0;
-+      if (nr_linfo > INT_MAX / sizeof(struct bpf_line_info))
-+              return -EINVAL;
- 
-       err = mark_reg_read(env, reg, parent_reg, flag);
-       if (err)

diff --git a/queue-5.14/series b/queue-5.14/series
index 74ae4023b891536a132086d177e0afb9d15ba811..8a22a63965333b9184b8b59ccaead509d1c8d67b 100644 (file)
--- a/queue-5.14/series
+++ b/queue-5.14/series
@@ -169,6 +169,5 @@ kvm-x86-handle-srcu-initialization-failure-during-page-track-init.patch
 netfilter-conntrack-serialize-hash-resizes-and-cleanups.patch
 netfilter-nf_tables-fix-oversized-kvmalloc-calls.patch
 drivers-net-mhi-fix-error-path-in-mhi_net_newlink.patch
-bpf-add-oversize-check-before-call-kvcalloc.patch
 objtool-print-out-the-symbol-type-when-complaining-about-it.patch
 hid-amd_sfh-fix-potential-null-pointer-dereference-take-2.patch