diff mbox series

[17/26] kcov: use array_size

Message ID	20230623211457.102544-18-Julia.Lawall@inria.fr
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; From: Julia Lawall <Julia.Lawall@inria.fr> To: Dmitry Vyukov <dvyukov@google.com> Cc: keescook@chromium.org, kernel-janitors@vger.kernel.org, Andrey Konovalov <andreyknvl@gmail.com>, kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org Subject: [PATCH 17/26] kcov: use array_size Date: Fri, 23 Jun 2023 23:14:48 +0200 Message-Id: <20230623211457.102544-18-Julia.Lawall@inria.fr> In-Reply-To: <20230623211457.102544-1-Julia.Lawall@inria.fr> References: <20230623211457.102544-1-Julia.Lawall@inria.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	use array_size \| [00/26] use array_size [01/26] lib/test_vmalloc.c: use array_size [02/26] octeon_ep: use array_size [03/26] drm/gud: use array_size [04/26] gve: use array_size [05/26] RDMA/erdma: use array_size [06/26] dma-buf: system_heap: use array_size [07/26] scsi: fnic: use array_size [08/26] virtio-mem: use array_size [09/26] pds_core: use array_size [10/26] bus: mhi: host: use array_size [11/26] ionic: use array_size [12/26] btrfs: zoned: use array_size [13/26] iommu/tegra: gart: use array_size [14/26] RDMA/siw: use array_size [15/26] habanalabs: use array_size [16/26] drm/i915/gvt: use array_size [17/26] kcov: use array_size [18/26] net: enetc: use array_size [19/26] RDMA/bnxt_re: use array_size [20/26] drm/vmwgfx: use array_size [21/26] x86/sgx: use array_size [22/26] net: mana: use array_size [23/26] media: staging: imgu: use array_size [24/26] scsi: qla2xxx: use array_size [25/26] vduse: use array_size [26/26] comedi: use array_size

Commit Message

Julia Lawall June 23, 2023, 9:14 p.m. UTC

  Use array_size to protect against multiplication overflows.

The changes were done using the following Coccinelle semantic patch:

// <smpl>
@@
    expression E1, E2;
    constant C1, C2;
    identifier alloc = {vmalloc,vzalloc};
@@
    
(
      alloc(C1 * C2,...)
|
      alloc(
-           (E1) * (E2)
+           array_size(E1, E2)
      ,...)
)
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@inria.fr>

---
 kernel/kcov.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Dmitry Vyukov June 24, 2023, 5:34 a.m. UTC | #1

On Fri, 23 Jun 2023 at 23:15, Julia Lawall <Julia.Lawall@inria.fr> wrote:
>
> Use array_size to protect against multiplication overflows.
>
> The changes were done using the following Coccinelle semantic patch:
>
> // <smpl>
> @@
>     expression E1, E2;
>     constant C1, C2;
>     identifier alloc = {vmalloc,vzalloc};
> @@
>
> (
>       alloc(C1 * C2,...)
> |
>       alloc(
> -           (E1) * (E2)
> +           array_size(E1, E2)
>       ,...)
> )
> // </smpl>
>
> Signed-off-by: Julia Lawall <Julia.Lawall@inria.fr>

Reviewed-by: Dmitry Vyukov <dvyukov@google.com>

> ---
>  kernel/kcov.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/kernel/kcov.c b/kernel/kcov.c
> index 84c717337df0..631444760644 100644
> --- a/kernel/kcov.c
> +++ b/kernel/kcov.c
> @@ -900,7 +900,7 @@ void kcov_remote_start(u64 handle)
>         /* Can only happen when in_task(). */
>         if (!area) {
>                 local_unlock_irqrestore(&kcov_percpu_data.lock, flags);
> -               area = vmalloc(size * sizeof(unsigned long));
> +               area = vmalloc(array_size(size, sizeof(unsigned long)));
>                 if (!area) {
>                         kcov_put(kcov);
>                         return;
>

diff mbox series

Patch

diff --git a/kernel/kcov.c b/kernel/kcov.c
index 84c717337df0..631444760644 100644
--- a/kernel/kcov.c
+++ b/kernel/kcov.c
@@ -900,7 +900,7 @@  void kcov_remote_start(u64 handle)
 	/* Can only happen when in_task(). */
 	if (!area) {
 		local_unlock_irqrestore(&kcov_percpu_data.lock, flags);
-		area = vmalloc(size * sizeof(unsigned long));
+		area = vmalloc(array_size(size, sizeof(unsigned long)));
 		if (!area) {
 			kcov_put(kcov);
 			return;