[PATCH] mtd: spinand: Use 2-factor allocator calls

[PATCH] mtd: spinand: Use 2-factor allocator calls

[Kees Cook]

As already done treewide, switch from open-coded multiplication to using
2-factor allocator helpers.

Signed-off-by: Kees Cook <keescook@chromium.org>
---
 drivers/mtd/nand/spi/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c
index 17d207a49cb9..fed9211c6f19 100644
--- a/drivers/mtd/nand/spi/core.c
+++ b/drivers/mtd/nand/spi/core.c
@@ -159,9 +159,9 @@ static int spinand_init_cfg_cache(struct spinand_device *spinand)
 	unsigned int target;
 	int ret;
 
-	spinand->cfg_cache = devm_kzalloc(dev,
-					  sizeof(*spinand->cfg_cache) *
+	spinand->cfg_cache = devm_kcalloc(dev,
 					  nand->memorg.ntargets,
+					  sizeof(*spinand->cfg_cache),
 					  GFP_KERNEL);
 	if (!spinand->cfg_cache)
 		return -ENOMEM;
-- 
2.17.1


-- 
Kees Cook
Pixel Security

Re: [PATCH] mtd: spinand: Use 2-factor allocator calls

[Miquel Raynal]

Hello,

Kees Cook <keescook@chromium.org> wrote on Wed, 4 Jul 2018 10:27:59
-0700:

> As already done treewide, switch from open-coded multiplication to using
> 2-factor allocator helpers.
> 
> Signed-off-by: Kees Cook <keescook@chromium.org>
> ---

Indeed, we'll be more careful about this in the future.

As this code has not been merged upstream yet, do you mind if I
squash this with the initial patch?

Thanks,
Miquèl

Re: [PATCH] mtd: spinand: Use 2-factor allocator calls

[Kees Cook]

On Thu, Jul 5, 2018 at 12:03 AM, Miquel Raynal
<miquel.raynal@bootlin.com> wrote:
> Hello,
>
> Kees Cook <keescook@chromium.org> wrote on Wed, 4 Jul 2018 10:27:59
> -0700:
>
>> As already done treewide, switch from open-coded multiplication to using
>> 2-factor allocator helpers.
>>
>> Signed-off-by: Kees Cook <keescook@chromium.org>
>> ---
>
> Indeed, we'll be more careful about this in the future.
>
> As this code has not been merged upstream yet, do you mind if I
> squash this with the initial patch?

Totally fine by me! Thanks! :)

-Kees


-- 
Kees Cook
Pixel Security

Re: [PATCH] mtd: spinand: Use 2-factor allocator calls

[Miquel Raynal]

Hi Kees,

Kees Cook <keescook@chromium.org> wrote on Wed, 4 Jul 2018 10:27:59
-0700:

> As already done treewide, switch from open-coded multiplication to using
> 2-factor allocator helpers.
> 
> Signed-off-by: Kees Cook <keescook@chromium.org>
> ---

Merged with the original commit.

Thanks,
Miquèl