From: "Michael S. Tsirkin" <mst@redhat.com>
To: Julia Lawall <Julia.Lawall@inria.fr>
Cc: David Hildenbrand <david@redhat.com>,
keescook@chromium.org, kernel-janitors@vger.kernel.org,
Jason Wang <jasowang@redhat.com>,
Xuan Zhuo <xuanzhuo@linux.alibaba.com>,
virtualization@lists.linux-foundation.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 08/26] virtio-mem: use array_size
Date: Mon, 26 Jun 2023 06:59:09 -0400 [thread overview]
Message-ID: <20230626065202-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <20230623211457.102544-9-Julia.Lawall@inria.fr>
On Fri, Jun 23, 2023 at 11:14:39PM +0200, Julia Lawall 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>
>
> ---
> drivers/virtio/virtio_mem.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
can't hurt I guess.
Acked-by: Michael S. Tsirkin <mst@redhat.com>
> diff --git a/drivers/virtio/virtio_mem.c b/drivers/virtio/virtio_mem.c
> index 835f6cc2fb66..a4dfe7aab288 100644
> --- a/drivers/virtio/virtio_mem.c
> +++ b/drivers/virtio/virtio_mem.c
> @@ -399,7 +399,7 @@ static int virtio_mem_bbm_bb_states_prepare_next_bb(struct virtio_mem *vm)
> if (vm->bbm.bb_states && old_pages == new_pages)
> return 0;
>
> - new_array = vzalloc(new_pages * PAGE_SIZE);
> + new_array = vzalloc(array_size(new_pages, PAGE_SIZE));
> if (!new_array)
> return -ENOMEM;
>
> @@ -465,7 +465,7 @@ static int virtio_mem_sbm_mb_states_prepare_next_mb(struct virtio_mem *vm)
> if (vm->sbm.mb_states && old_pages == new_pages)
> return 0;
>
> - new_array = vzalloc(new_pages * PAGE_SIZE);
> + new_array = vzalloc(array_size(new_pages, PAGE_SIZE));
> if (!new_array)
> return -ENOMEM;
>
> @@ -588,7 +588,7 @@ static int virtio_mem_sbm_sb_states_prepare_next_mb(struct virtio_mem *vm)
> if (vm->sbm.sb_states && old_pages == new_pages)
> return 0;
>
> - new_bitmap = vzalloc(new_pages * PAGE_SIZE);
> + new_bitmap = vzalloc(array_size(new_pages, PAGE_SIZE));
> if (!new_bitmap)
> return -ENOMEM;
>
WARNING: multiple messages have this Message-ID (diff)
From: "Michael S. Tsirkin" <mst@redhat.com>
To: Julia Lawall <Julia.Lawall@inria.fr>
Cc: Xuan Zhuo <xuanzhuo@linux.alibaba.com>,
keescook@chromium.org, kernel-janitors@vger.kernel.org,
linux-kernel@vger.kernel.org,
virtualization@lists.linux-foundation.org
Subject: Re: [PATCH 08/26] virtio-mem: use array_size
Date: Mon, 26 Jun 2023 06:59:09 -0400 [thread overview]
Message-ID: <20230626065202-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <20230623211457.102544-9-Julia.Lawall@inria.fr>
On Fri, Jun 23, 2023 at 11:14:39PM +0200, Julia Lawall 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>
>
> ---
> drivers/virtio/virtio_mem.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
can't hurt I guess.
Acked-by: Michael S. Tsirkin <mst@redhat.com>
> diff --git a/drivers/virtio/virtio_mem.c b/drivers/virtio/virtio_mem.c
> index 835f6cc2fb66..a4dfe7aab288 100644
> --- a/drivers/virtio/virtio_mem.c
> +++ b/drivers/virtio/virtio_mem.c
> @@ -399,7 +399,7 @@ static int virtio_mem_bbm_bb_states_prepare_next_bb(struct virtio_mem *vm)
> if (vm->bbm.bb_states && old_pages == new_pages)
> return 0;
>
> - new_array = vzalloc(new_pages * PAGE_SIZE);
> + new_array = vzalloc(array_size(new_pages, PAGE_SIZE));
> if (!new_array)
> return -ENOMEM;
>
> @@ -465,7 +465,7 @@ static int virtio_mem_sbm_mb_states_prepare_next_mb(struct virtio_mem *vm)
> if (vm->sbm.mb_states && old_pages == new_pages)
> return 0;
>
> - new_array = vzalloc(new_pages * PAGE_SIZE);
> + new_array = vzalloc(array_size(new_pages, PAGE_SIZE));
> if (!new_array)
> return -ENOMEM;
>
> @@ -588,7 +588,7 @@ static int virtio_mem_sbm_sb_states_prepare_next_mb(struct virtio_mem *vm)
> if (vm->sbm.sb_states && old_pages == new_pages)
> return 0;
>
> - new_bitmap = vzalloc(new_pages * PAGE_SIZE);
> + new_bitmap = vzalloc(array_size(new_pages, PAGE_SIZE));
> if (!new_bitmap)
> return -ENOMEM;
>
_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
next prev parent reply other threads:[~2023-06-26 11:00 UTC|newest]
Thread overview: 81+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-23 21:14 [Intel-gfx] [PATCH 00/26] use array_size Julia Lawall
2023-06-23 21:14 ` Julia Lawall
2023-06-23 21:14 ` Julia Lawall
2023-06-23 21:14 ` [PATCH 01/26] lib/test_vmalloc.c: " Julia Lawall
2023-06-23 21:14 ` [PATCH 02/26] octeon_ep: " Julia Lawall
2023-06-24 15:46 ` Simon Horman
2023-06-24 22:28 ` Jakub Kicinski
2023-06-25 20:14 ` Christophe JAILLET
2023-06-25 20:25 ` Julia Lawall
2023-06-25 20:32 ` Christophe JAILLET
2023-06-25 20:57 ` Julia Lawall
2023-06-23 21:14 ` [PATCH 03/26] drm/gud: " Julia Lawall
2023-06-23 21:14 ` Julia Lawall
2023-06-23 21:14 ` [PATCH 04/26] gve: " Julia Lawall
2023-06-24 15:47 ` Simon Horman
2023-06-23 21:14 ` [PATCH 05/26] RDMA/erdma: " Julia Lawall
2023-06-27 9:32 ` Cheng Xu
2023-06-23 21:14 ` [PATCH 06/26] dma-buf: system_heap: " Julia Lawall
2023-06-23 21:14 ` Julia Lawall
2023-06-23 21:42 ` John Stultz
2023-06-23 21:42 ` John Stultz
2023-06-23 21:14 ` [PATCH 07/26] scsi: fnic: " Julia Lawall
2023-06-23 21:14 ` [PATCH 08/26] virtio-mem: " Julia Lawall
2023-06-25 1:39 ` Xuan Zhuo
2023-06-25 1:39 ` Xuan Zhuo
2023-06-26 7:40 ` David Hildenbrand
2023-06-26 7:40 ` David Hildenbrand
2023-06-26 10:59 ` Michael S. Tsirkin [this message]
2023-06-26 10:59 ` Michael S. Tsirkin
2023-06-23 21:14 ` [PATCH 09/26] pds_core: " Julia Lawall
2023-06-24 15:47 ` Simon Horman
2023-06-26 16:02 ` Shannon Nelson
2023-06-23 21:14 ` [PATCH 10/26] bus: mhi: host: " Julia Lawall
2023-06-23 21:30 ` Jeffrey Hugo
2023-06-23 21:45 ` Julia Lawall
2023-06-23 22:09 ` Jeffrey Hugo
2023-06-23 23:45 ` Kees Cook
2023-06-24 16:06 ` Jeffrey Hugo
2023-06-26 11:46 ` Dan Carpenter
2023-06-26 14:53 ` Jeffrey Hugo
2023-06-23 21:14 ` [PATCH 11/26] ionic: " Julia Lawall
2023-06-24 15:47 ` Simon Horman
2023-06-26 16:03 ` Shannon Nelson
2023-06-23 21:14 ` [PATCH 12/26] btrfs: zoned: " Julia Lawall
2023-06-26 6:08 ` Johannes Thumshirn
2023-06-26 7:59 ` Naohiro Aota
2023-06-29 14:30 ` David Sterba
2023-06-23 21:14 ` [PATCH 13/26] iommu/tegra: gart: " Julia Lawall
2023-06-23 21:14 ` [PATCH 14/26] RDMA/siw: " Julia Lawall
2023-06-26 11:23 ` Bernard Metzler
2023-06-23 21:14 ` [PATCH 15/26] habanalabs: " Julia Lawall
2023-06-23 21:14 ` Julia Lawall
2023-06-23 21:14 ` [Intel-gfx] [PATCH 16/26] drm/i915/gvt: " Julia Lawall
2023-06-23 21:14 ` Julia Lawall
2023-06-23 21:14 ` Julia Lawall
2023-06-26 9:26 ` [Intel-gfx] " Andi Shyti
2023-06-26 9:26 ` Andi Shyti
2023-06-26 9:26 ` Andi Shyti
2023-06-26 11:54 ` Dan Carpenter
2023-06-26 11:54 ` Dan Carpenter
2023-06-26 11:54 ` Dan Carpenter
2023-06-23 21:14 ` [PATCH 17/26] kcov: " Julia Lawall
2023-06-24 5:34 ` Dmitry Vyukov
2023-06-23 21:14 ` [PATCH 18/26] net: enetc: " Julia Lawall
2023-06-24 15:48 ` Simon Horman
2023-06-23 21:14 ` [PATCH 19/26] RDMA/bnxt_re: " Julia Lawall
2023-06-23 21:14 ` [PATCH 20/26] drm/vmwgfx: " Julia Lawall
2023-06-23 21:14 ` Julia Lawall
2023-06-27 17:33 ` Julia Lawall
2023-06-27 17:33 ` Julia Lawall
2023-06-23 21:14 ` [PATCH 21/26] x86/sgx: " Julia Lawall
2023-07-10 22:02 ` Jarkko Sakkinen
2023-06-23 21:14 ` [PATCH 22/26] net: mana: " Julia Lawall
2023-06-24 15:48 ` Simon Horman
2023-06-23 21:14 ` [PATCH 23/26] media: staging: imgu: " Julia Lawall
2023-06-25 4:59 ` Bingbu Cao
2023-06-27 17:35 ` Julia Lawall
2023-06-29 7:34 ` Sakari Ailus
2023-06-23 21:14 ` [PATCH 24/26] scsi: qla2xxx: " Julia Lawall
2023-06-23 21:14 ` [PATCH 25/26] vduse: " Julia Lawall
2023-06-23 21:14 ` [PATCH 26/26] comedi: " Julia Lawall
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230626065202-mutt-send-email-mst@kernel.org \
--to=mst@redhat.com \
--cc=Julia.Lawall@inria.fr \
--cc=david@redhat.com \
--cc=jasowang@redhat.com \
--cc=keescook@chromium.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=virtualization@lists.linux-foundation.org \
--cc=xuanzhuo@linux.alibaba.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.