diff mbox series

[23/26] media: staging: imgu: use array_size

Message ID	20230623211457.102544-24-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: Sakari Ailus <sakari.ailus@linux.intel.com> Cc: keescook@chromium.org, kernel-janitors@vger.kernel.org, Bingbu Cao <bingbu.cao@intel.com>, Tianshu Qiu <tian.shu.qiu@intel.com>, Mauro Carvalho Chehab <mchehab@kernel.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 23/26] media: staging: imgu: use array_size Date: Fri, 23 Jun 2023 23:14:54 +0200 Message-Id: <20230623211457.102544-24-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>

---
 drivers/staging/media/ipu3/ipu3-mmu.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Bingbu Cao June 25, 2023, 4:59 a.m. UTC | #1

Julia,

Thanks for your patch.

On 6/24/23 5:14 AM, 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/staging/media/ipu3/ipu3-mmu.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/staging/media/ipu3/ipu3-mmu.c b/drivers/staging/media/ipu3/ipu3-mmu.c
> index cb9bf5fb29a5..9c4adb815c94 100644
> --- a/drivers/staging/media/ipu3/ipu3-mmu.c
> +++ b/drivers/staging/media/ipu3/ipu3-mmu.c
> @@ -464,7 +464,7 @@ struct imgu_mmu_info *imgu_mmu_init(struct device *parent, void __iomem *base)
>  	 * Allocate the array of L2PT CPU pointers, initialized to zero,
>  	 * which means the dummy L2PT allocated above.
>  	 */
> -	mmu->l2pts = vzalloc(IPU3_PT_PTES * sizeof(*mmu->l2pts));
> +	mmu->l2pts = vzalloc(array_size(IPU3_PT_PTES, sizeof(*mmu->l2pts)));
>  	if (!mmu->l2pts)
>  		goto fail_l2pt;
>  
>

Reviewed-by: Bingbu Cao <bingbu.cao@intel.com>

Julia Lawall June 27, 2023, 5:35 p.m. UTC | #2

On Fri, 23 Jun 2023, 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/staging/media/ipu3/ipu3-mmu.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/staging/media/ipu3/ipu3-mmu.c b/drivers/staging/media/ipu3/ipu3-mmu.c
> index cb9bf5fb29a5..9c4adb815c94 100644
> --- a/drivers/staging/media/ipu3/ipu3-mmu.c
> +++ b/drivers/staging/media/ipu3/ipu3-mmu.c
> @@ -464,7 +464,7 @@ struct imgu_mmu_info *imgu_mmu_init(struct device *parent, void __iomem *base)
>  	 * Allocate the array of L2PT CPU pointers, initialized to zero,
>  	 * which means the dummy L2PT allocated above.
>  	 */
> -	mmu->l2pts = vzalloc(IPU3_PT_PTES * sizeof(*mmu->l2pts));
> +	mmu->l2pts = vzalloc(array_size(IPU3_PT_PTES, sizeof(*mmu->l2pts)));
>  	if (!mmu->l2pts)
>  		goto fail_l2pt;

I think that this patch can be dropped.  Since it is a multiplcation of
two constants, if there is an overflow, I guess the compiler would detect
it?

julia

Sakari Ailus June 29, 2023, 7:34 a.m. UTC | #3

Hi Julia, Bingbu,

On Tue, Jun 27, 2023 at 07:35:47PM +0200, Julia Lawall wrote:
> 
> 
> On Fri, 23 Jun 2023, 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/staging/media/ipu3/ipu3-mmu.c |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/staging/media/ipu3/ipu3-mmu.c b/drivers/staging/media/ipu3/ipu3-mmu.c
> > index cb9bf5fb29a5..9c4adb815c94 100644
> > --- a/drivers/staging/media/ipu3/ipu3-mmu.c
> > +++ b/drivers/staging/media/ipu3/ipu3-mmu.c
> > @@ -464,7 +464,7 @@ struct imgu_mmu_info *imgu_mmu_init(struct device *parent, void __iomem *base)
> >  	 * Allocate the array of L2PT CPU pointers, initialized to zero,
> >  	 * which means the dummy L2PT allocated above.
> >  	 */
> > -	mmu->l2pts = vzalloc(IPU3_PT_PTES * sizeof(*mmu->l2pts));
> > +	mmu->l2pts = vzalloc(array_size(IPU3_PT_PTES, sizeof(*mmu->l2pts)));
> >  	if (!mmu->l2pts)
> >  		goto fail_l2pt;
> 
> I think that this patch can be dropped.  Since it is a multiplcation of
> two constants, if there is an overflow, I guess the compiler would detect
> it?

Indeed. vcalloc() would be perhaps nicer but the original isn't wrong
either.

diff mbox series

Patch

diff --git a/drivers/staging/media/ipu3/ipu3-mmu.c b/drivers/staging/media/ipu3/ipu3-mmu.c
index cb9bf5fb29a5..9c4adb815c94 100644
--- a/drivers/staging/media/ipu3/ipu3-mmu.c
+++ b/drivers/staging/media/ipu3/ipu3-mmu.c
@@ -464,7 +464,7 @@  struct imgu_mmu_info *imgu_mmu_init(struct device *parent, void __iomem *base)
 	 * Allocate the array of L2PT CPU pointers, initialized to zero,
 	 * which means the dummy L2PT allocated above.
 	 */
-	mmu->l2pts = vzalloc(IPU3_PT_PTES * sizeof(*mmu->l2pts));
+	mmu->l2pts = vzalloc(array_size(IPU3_PT_PTES, sizeof(*mmu->l2pts)));
 	if (!mmu->l2pts)
 		goto fail_l2pt;