Re: [PATCH] pinctrl: intel: merrifield: fix dup size in probe

[Linus Walleij]

On Wed, Aug 31, 2016 at 2:30 PM, Vincent Stehlé
 wrote:

> In function mrfld_pinctrl_probe(), when duplicating the mrfld_families
> array the requested memory region length is multiplied once too many by the
> number of elements in the original array. Fix this to spare some memory.
>
> Fixes: 4e80c8f505741cbd ("pinctrl: intel: Add Intel Merrifield pin controller 
> support")
> Signed-off-by: Vincent Stehlé 
> Cc: Andy Shevchenko 
> Cc: Linus Walleij 

Patch applied for fixes with Andy's ACK.

Yours,
Linus Walleij

Re: [PATCH] pinctrl: intel: merrifield: fix dup size in probe

[Andy Shevchenko]

On Wed, 2016-08-31 at 14:30 +0200, Vincent Stehlé wrote:
> In function mrfld_pinctrl_probe(), when duplicating the mrfld_families
> array the requested memory region length is multiplied once too many
> by the
> number of elements in the original array. Fix this to spare some
> memory.

Good catch!
Acked-by: Andy Shevchenko 

P.S. Linus, perhaps this is material for -rc5.

> 
> Fixes: 4e80c8f505741cbd ("pinctrl: intel: Add Intel Merrifield pin
> controller support")
> Signed-off-by: Vincent Stehlé 
> Cc: Andy Shevchenko 
> Cc: Linus Walleij 
> ---
>  drivers/pinctrl/intel/pinctrl-merrifield.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/pinctrl/intel/pinctrl-merrifield.c
> b/drivers/pinctrl/intel/pinctrl-merrifield.c
> index 7fb7656..7826c7f 100644
> --- a/drivers/pinctrl/intel/pinctrl-merrifield.c
> +++ b/drivers/pinctrl/intel/pinctrl-merrifield.c
> @@ -854,7 +854,7 @@ static int mrfld_pinctrl_probe(struct
> platform_device *pdev)
>    */
>   nfamilies = ARRAY_SIZE(mrfld_families),
>   families = devm_kmemdup(&pdev->dev, mrfld_families,
> - nfamilies *
> sizeof(mrfld_families),
> + sizeof(mrfld_families),
>   GFP_KERNEL);
>   if (!families)
>   return -ENOMEM;

-- 
Andy Shevchenko 
Intel Finland Oy

[PATCH] pinctrl: intel: merrifield: fix dup size in probe

[Vincent Stehlé]

In function mrfld_pinctrl_probe(), when duplicating the mrfld_families
array the requested memory region length is multiplied once too many by the
number of elements in the original array. Fix this to spare some memory.

Fixes: 4e80c8f505741cbd ("pinctrl: intel: Add Intel Merrifield pin controller 
support")
Signed-off-by: Vincent Stehlé 
Cc: Andy Shevchenko 
Cc: Linus Walleij 
---
 drivers/pinctrl/intel/pinctrl-merrifield.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pinctrl/intel/pinctrl-merrifield.c 
b/drivers/pinctrl/intel/pinctrl-merrifield.c
index 7fb7656..7826c7f 100644
--- a/drivers/pinctrl/intel/pinctrl-merrifield.c
+++ b/drivers/pinctrl/intel/pinctrl-merrifield.c
@@ -854,7 +854,7 @@ static int mrfld_pinctrl_probe(struct platform_device *pdev)
 */
nfamilies = ARRAY_SIZE(mrfld_families),
families = devm_kmemdup(&pdev->dev, mrfld_families,
-   nfamilies * sizeof(mrfld_families),
+   sizeof(mrfld_families),
GFP_KERNEL);
if (!families)
return -ENOMEM;
-- 
2.9.3