[PATCH v1] drivers/pinctrl/renesas: Switch to use kmemdup_array()

[PATCH v1] drivers/pinctrl/renesas: Switch to use kmemdup_array()

[Shen Lichuan]

Let the kememdup_array() take care about
multiplication and possible overflows.

Signed-off-by: Shen Lichuan <shenlichuan@vivo.com>
---
 drivers/pinctrl/renesas/pinctrl-rzg2l.c | 4 ++--
 drivers/pinctrl/renesas/pinctrl-rzv2m.c | 4 ++--
 drivers/pinctrl/renesas/pinctrl.c       | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/pinctrl/renesas/pinctrl-rzg2l.c b/drivers/pinctrl/renesas/pinctrl-rzg2l.c
index 5e3d735a8570..afee3427763e 100644
--- a/drivers/pinctrl/renesas/pinctrl-rzg2l.c
+++ b/drivers/pinctrl/renesas/pinctrl-rzg2l.c
@@ -528,8 +528,8 @@ static int rzg2l_map_add_config(struct pinctrl_map *map,
 {
 	unsigned long *cfgs;
 
-	cfgs = kmemdup(configs, num_configs * sizeof(*cfgs),
-		       GFP_KERNEL);
+	cfgs = kmemdup_array(configs, num_configs,
+				sizeof(*cfgs), GFP_KERNEL);
 	if (!cfgs)
 		return -ENOMEM;
 
diff --git a/drivers/pinctrl/renesas/pinctrl-rzv2m.c b/drivers/pinctrl/renesas/pinctrl-rzv2m.c
index 0cae5472ac67..d3e1f42f4a56 100644
--- a/drivers/pinctrl/renesas/pinctrl-rzv2m.c
+++ b/drivers/pinctrl/renesas/pinctrl-rzv2m.c
@@ -196,8 +196,8 @@ static int rzv2m_map_add_config(struct pinctrl_map *map,
 {
 	unsigned long *cfgs;
 
-	cfgs = kmemdup(configs, num_configs * sizeof(*cfgs),
-		       GFP_KERNEL);
+	cfgs = kmemdup_array(configs, num_configs,
+				sizeof(*cfgs), GFP_KERNEL);
 	if (!cfgs)
 		return -ENOMEM;
 
diff --git a/drivers/pinctrl/renesas/pinctrl.c b/drivers/pinctrl/renesas/pinctrl.c
index 03e9bdbc82b9..cfcef35f0e7f 100644
--- a/drivers/pinctrl/renesas/pinctrl.c
+++ b/drivers/pinctrl/renesas/pinctrl.c
@@ -83,8 +83,8 @@ static int sh_pfc_map_add_config(struct pinctrl_map *map,
 {
 	unsigned long *cfgs;
 
-	cfgs = kmemdup(configs, num_configs * sizeof(*cfgs),
-		       GFP_KERNEL);
+	cfgs = kmemdup_array(configs, num_configs,
+				sizeof(*cfgs), GFP_KERNEL);
 	if (cfgs == NULL)
 		return -ENOMEM;
 
-- 
2.17.1

Re: [PATCH v1] drivers/pinctrl/renesas: Switch to use kmemdup_array()

[Geert Uytterhoeven]

Hi Shen,

Thanks for your patch!

"pinctrl: renesas: ..."

On Thu, Aug 22, 2024 at 8:15 AM Shen Lichuan <shenlichuan@vivo.com> wrote:
> Let the kememdup_array() take care about

kmemdup_array

> multiplication and possible overflows.
>
> Signed-off-by: Shen Lichuan <shenlichuan@vivo.com>

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
i.e. will queue in renesas-pinctrl for v6.12 with the above fixed.

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH v1] drivers/pinctrl/renesas: Switch to use kmemdup_array()

[Andy Shevchenko]

On Thu, Aug 22, 2024 at 02:14:38PM +0800, Shen Lichuan wrote:
> Let the kememdup_array() take care about
> multiplication and possible overflows.

> +	cfgs = kmemdup_array(configs, num_configs,
> +				sizeof(*cfgs), GFP_KERNEL);

Geert, don't you want to fix the indentation issues?
Perhaps even combining these to a single line?

...

> +	cfgs = kmemdup_array(configs, num_configs,
> +				sizeof(*cfgs), GFP_KERNEL);
>  	if (!cfgs)
>  		return -ENOMEM;

Ditto.

...

> +	cfgs = kmemdup_array(configs, num_configs,
> +				sizeof(*cfgs), GFP_KERNEL);

Ditto.

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH v1] drivers/pinctrl/renesas: Switch to use kmemdup_array()

[Geert Uytterhoeven]

Hi Andy,

On Fri, Aug 23, 2024 at 5:22 PM Andy Shevchenko
<andriy.shevchenko@intel.com> wrote:
> On Thu, Aug 22, 2024 at 02:14:38PM +0800, Shen Lichuan wrote:
> > Let the kememdup_array() take care about
> > multiplication and possible overflows.
>
> > +     cfgs = kmemdup_array(configs, num_configs,
> > +                             sizeof(*cfgs), GFP_KERNEL);
>
> Geert, don't you want to fix the indentation issues?
> Perhaps even combining these to a single line?

I have already done so while applying ;-)

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds