All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] pinctrl: mediatek: fix a memleak when do dt maps.
@ 2015-11-17  2:34 ` Hongzhou Yang
  0 siblings, 0 replies; 27+ messages in thread
From: Hongzhou Yang @ 2015-11-17  2:34 UTC (permalink / raw)
  To: Linus Walleij, Matthias Brugger
  Cc: Hongzhou Yang, Yingjoe Chen, Axel Lin, Maoguang Meng,
	Colin Ian King, linux-gpio, linux-arm-kernel, linux-mediatek,
	linux-kernel, srv_heupstream, Sascha Hauer, biao.huang

configs will kmemdup to dup_configs in pictrl util function.
So configs need to be freed.

Signed-off-by: Hongzhou Yang <hongzhou.yang@mediatek.com>
---
 Fix a memleak issue.

 drivers/pinctrl/mediatek/pinctrl-mtk-common.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
index bbf0230..0000b5a 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
@@ -568,9 +568,10 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
 		}
 	}
 
-	return 0;
+	err = 0;
 
 fail:
+	kfree(configs);
 	return err;
 }
 
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 27+ messages in thread
* [PATCH] pinctrl: mediatek: fix a memleak when do dt maps.
@ 2015-11-17  2:34 ` Hongzhou Yang
  0 siblings, 0 replies; 27+ messages in thread
From: Hongzhou Yang @ 2015-11-17  2:34 UTC (permalink / raw)
  To: Linus Walleij, Matthias Brugger
  Cc: Hongzhou Yang, Yingjoe Chen, Axel Lin, Maoguang Meng,
	Colin Ian King, linux-gpio, linux-arm-kernel, linux-mediatek,
	linux-kernel, srv_heupstream, Sascha Hauer, biao.huang

configs will kmemdup to dup_configs in pictrl util function.
So configs need to be freed.

Signed-off-by: Hongzhou Yang <hongzhou.yang@mediatek.com>
---
 Fix a memleak issue.

 drivers/pinctrl/mediatek/pinctrl-mtk-common.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
index bbf0230..0000b5a 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
@@ -568,9 +568,10 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
 		}
 	}
 
-	return 0;
+	err = 0;
 
 fail:
+	kfree(configs);
 	return err;
 }
 
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 27+ messages in thread
* [PATCH] pinctrl: mediatek: fix a memleak when do dt maps.
@ 2015-11-17  2:34 ` Hongzhou Yang
  0 siblings, 0 replies; 27+ messages in thread
From: Hongzhou Yang @ 2015-11-17  2:34 UTC (permalink / raw)
  To: linux-arm-kernel

configs will kmemdup to dup_configs in pictrl util function.
So configs need to be freed.

Signed-off-by: Hongzhou Yang <hongzhou.yang@mediatek.com>
---
 Fix a memleak issue.

 drivers/pinctrl/mediatek/pinctrl-mtk-common.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
index bbf0230..0000b5a 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
@@ -568,9 +568,10 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
 		}
 	}
 
-	return 0;
+	err = 0;
 
 fail:
+	kfree(configs);
 	return err;
 }
 
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 27+ messages in thread
* Re: [PATCH] pinctrl: mediatek: fix a memleak when do dt maps.
  2015-11-17  2:34 ` Hongzhou Yang
  (?)
@ 2015-11-17  2:50   ` Daniel Kurtz
  -1 siblings, 0 replies; 27+ messages in thread
From: Daniel Kurtz @ 2015-11-17  2:50 UTC (permalink / raw)
  To: Hongzhou Yang
  Cc: Linus Walleij, Matthias Brugger, Yingjoe Chen, Axel Lin,
	Maoguang Meng, Colin Ian King, linux-gpio, linux-arm-kernel,
	linux-mediatek, linux-kernel, srv_heupstream, Sascha Hauer,
	biao.huang

On Tue, Nov 17, 2015 at 10:34 AM, Hongzhou Yang
<hongzhou.yang@mediatek.com> wrote:
> configs will kmemdup to dup_configs in pictrl util function.
> So configs need to be freed.
>
> Signed-off-by: Hongzhou Yang <hongzhou.yang@mediatek.com>
> ---
>  Fix a memleak issue.
>
>  drivers/pinctrl/mediatek/pinctrl-mtk-common.c |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> index bbf0230..0000b5a 100644
> --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> @@ -568,9 +568,10 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>                 }
>         }
>
> -       return 0;
> +       err = 0;
>
>  fail:

This isn't just 'fail' case anymore, so change label name to something
like "exit".

> +       kfree(configs);

Do we also need to kfree in the "if (!num_pins || !maps_per_pin)" error case?

>         return err;
>  }
>
> --
> 1.7.9.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

^ permalink raw reply	[flat|nested] 27+ messages in thread
* Re: [PATCH] pinctrl: mediatek: fix a memleak when do dt maps.
@ 2015-11-17  2:50   ` Daniel Kurtz
  0 siblings, 0 replies; 27+ messages in thread
From: Daniel Kurtz @ 2015-11-17  2:50 UTC (permalink / raw)
  To: Hongzhou Yang
  Cc: Linus Walleij, Matthias Brugger, Yingjoe Chen, Axel Lin,
	Maoguang Meng, Colin Ian King, linux-gpio, linux-arm-kernel,
	linux-mediatek, linux-kernel, srv_heupstream, Sascha Hauer,
	biao.huang

On Tue, Nov 17, 2015 at 10:34 AM, Hongzhou Yang
<hongzhou.yang@mediatek.com> wrote:
> configs will kmemdup to dup_configs in pictrl util function.
> So configs need to be freed.
>
> Signed-off-by: Hongzhou Yang <hongzhou.yang@mediatek.com>
> ---
>  Fix a memleak issue.
>
>  drivers/pinctrl/mediatek/pinctrl-mtk-common.c |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> index bbf0230..0000b5a 100644
> --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> @@ -568,9 +568,10 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>                 }
>         }
>
> -       return 0;
> +       err = 0;
>
>  fail:

This isn't just 'fail' case anymore, so change label name to something
like "exit".

> +       kfree(configs);

Do we also need to kfree in the "if (!num_pins || !maps_per_pin)" error case?

>         return err;
>  }
>
> --
> 1.7.9.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

^ permalink raw reply	[flat|nested] 27+ messages in thread
* [PATCH] pinctrl: mediatek: fix a memleak when do dt maps.
@ 2015-11-17  2:50   ` Daniel Kurtz
  0 siblings, 0 replies; 27+ messages in thread
From: Daniel Kurtz @ 2015-11-17  2:50 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Nov 17, 2015 at 10:34 AM, Hongzhou Yang
<hongzhou.yang@mediatek.com> wrote:
> configs will kmemdup to dup_configs in pictrl util function.
> So configs need to be freed.
>
> Signed-off-by: Hongzhou Yang <hongzhou.yang@mediatek.com>
> ---
>  Fix a memleak issue.
>
>  drivers/pinctrl/mediatek/pinctrl-mtk-common.c |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> index bbf0230..0000b5a 100644
> --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> @@ -568,9 +568,10 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>                 }
>         }
>
> -       return 0;
> +       err = 0;
>
>  fail:

This isn't just 'fail' case anymore, so change label name to something
like "exit".

> +       kfree(configs);

Do we also need to kfree in the "if (!num_pins || !maps_per_pin)" error case?

>         return err;
>  }
>
> --
> 1.7.9.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

^ permalink raw reply	[flat|nested] 27+ messages in thread
* Re: [PATCH] pinctrl: mediatek: fix a memleak when do dt maps.
  2015-11-17 22:33 ` Hongzhou Yang
  (?)
@ 2015-11-29 21:35   ` Linus Walleij
  -1 siblings, 0 replies; 27+ messages in thread
From: Linus Walleij @ 2015-11-29 21:35 UTC (permalink / raw)
  To: Hongzhou Yang
  Cc: Matthias Brugger, Yingjoe Chen, Axel Lin, Maoguang Meng,
	Colin Ian King, linux-gpio, linux-arm-kernel, linux-mediatek,
	linux-kernel, srv_heupstream, Sascha Hauer, biao.huang

On Tue, Nov 17, 2015 at 11:33 PM, Hongzhou Yang
<hongzhou.yang@mediatek.com> wrote:

> configs will kmemdup to dup_configs in pictrl util function.
> So configs need to be freed.
>
> Signed-off-by: Hongzhou Yang <hongzhou.yang@mediatek.com>
> Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
> Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
> ---
>  Fix a memleak issue.
>  According to Yingjoe's comment, add return checek for pinconf_generic_parse_dt_config.

Patch applied with Yingjoe's review tag.

Yours,
Linus Walleij

^ permalink raw reply	[flat|nested] 27+ messages in thread
* Re: [PATCH] pinctrl: mediatek: fix a memleak when do dt maps.
@ 2015-11-29 21:35   ` Linus Walleij
  0 siblings, 0 replies; 27+ messages in thread
From: Linus Walleij @ 2015-11-29 21:35 UTC (permalink / raw)
  To: Hongzhou Yang
  Cc: Matthias Brugger, Yingjoe Chen, Axel Lin, Maoguang Meng,
	Colin Ian King, linux-gpio, linux-arm-kernel, linux-mediatek,
	linux-kernel, srv_heupstream, Sascha Hauer, biao.huang

On Tue, Nov 17, 2015 at 11:33 PM, Hongzhou Yang
<hongzhou.yang@mediatek.com> wrote:

> configs will kmemdup to dup_configs in pictrl util function.
> So configs need to be freed.
>
> Signed-off-by: Hongzhou Yang <hongzhou.yang@mediatek.com>
> Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
> Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
> ---
>  Fix a memleak issue.
>  According to Yingjoe's comment, add return checek for pinconf_generic_parse_dt_config.

Patch applied with Yingjoe's review tag.

Yours,
Linus Walleij

^ permalink raw reply	[flat|nested] 27+ messages in thread
* [PATCH] pinctrl: mediatek: fix a memleak when do dt maps.
@ 2015-11-29 21:35   ` Linus Walleij
  0 siblings, 0 replies; 27+ messages in thread
From: Linus Walleij @ 2015-11-29 21:35 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Nov 17, 2015 at 11:33 PM, Hongzhou Yang
<hongzhou.yang@mediatek.com> wrote:

> configs will kmemdup to dup_configs in pictrl util function.
> So configs need to be freed.
>
> Signed-off-by: Hongzhou Yang <hongzhou.yang@mediatek.com>
> Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
> Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
> ---
>  Fix a memleak issue.
>  According to Yingjoe's comment, add return checek for pinconf_generic_parse_dt_config.

Patch applied with Yingjoe's review tag.

Yours,
Linus Walleij

^ permalink raw reply	[flat|nested] 27+ messages in thread
* Re: [PATCH] pinctrl: mediatek: fix a memleak when do dt maps.
  2015-11-17 22:33 ` Hongzhou Yang
  (?)
@ 2015-11-18  3:22   ` Yingjoe Chen
  -1 siblings, 0 replies; 27+ messages in thread
From: Yingjoe Chen @ 2015-11-18  3:22 UTC (permalink / raw)
  To: Hongzhou Yang
  Cc: Linus Walleij, Matthias Brugger, Axel Lin, Maoguang Meng,
	Colin Ian King, linux-gpio, linux-arm-kernel, linux-mediatek,
	linux-kernel, srv_heupstream, Sascha Hauer, biao.huang

On Tue, 2015-11-17 at 14:33 -0800, Hongzhou Yang wrote:
> configs will kmemdup to dup_configs in pictrl util function.
> So configs need to be freed.
> 
> Signed-off-by: Hongzhou Yang <hongzhou.yang@mediatek.com>
> Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
> Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
> ---
>  Fix a memleak issue.
>  According to Yingjoe's comment, add return checek for pinconf_generic_parse_dt_config.

Reviewed-by: Yingjoe Chen <yingjoe.chen@mediatek.com>

Joe.C

>  drivers/pinctrl/mediatek/pinctrl-mtk-common.c |   27 ++++++++++++++++---------
>  1 file changed, 17 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> index 5c71727..8db7cdf 100644
> --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> @@ -509,6 +509,9 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>  
>  	err = pinconf_generic_parse_dt_config(node, pctldev, &configs,
>  		&num_configs);
> +	if (err)
> +		return err;
> +
>  	if (num_configs)
>  		has_config = 1;
>  
> @@ -520,21 +523,23 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>  	if (has_config && num_pins >= 1)
>  		maps_per_pin++;
>  
> -	if (!num_pins || !maps_per_pin)
> -		return -EINVAL;
> +	if (!num_pins || !maps_per_pin) {
> +		err = -EINVAL;
> +		goto exit;
> +	}
>  
>  	reserve = num_pins * maps_per_pin;
>  
>  	err = pinctrl_utils_reserve_map(pctldev, map,
>  			reserved_maps, num_maps, reserve);
>  	if (err < 0)
> -		goto fail;
> +		goto exit;
>  
>  	for (i = 0; i < num_pins; i++) {
>  		err = of_property_read_u32_index(node, "pinmux",
>  				i, &pinfunc);
>  		if (err)
> -			goto fail;
> +			goto exit;
>  
>  		pin = MTK_GET_PIN_NO(pinfunc);
>  		func = MTK_GET_PIN_FUNC(pinfunc);
> @@ -543,20 +548,21 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>  				func >= ARRAY_SIZE(mtk_gpio_functions)) {
>  			dev_err(pctl->dev, "invalid pins value.\n");
>  			err = -EINVAL;
> -			goto fail;
> +			goto exit;
>  		}
>  
>  		grp = mtk_pctrl_find_group_by_pin(pctl, pin);
>  		if (!grp) {
>  			dev_err(pctl->dev, "unable to match pin %d to group\n",
>  					pin);
> -			return -EINVAL;
> +			err = -EINVAL;
> +			goto exit;
>  		}
>  
>  		err = mtk_pctrl_dt_node_to_map_func(pctl, pin, func, grp, map,
>  				reserved_maps, num_maps);
>  		if (err < 0)
> -			goto fail;
> +			goto exit;
>  
>  		if (has_config) {
>  			err = pinctrl_utils_add_map_configs(pctldev, map,
> @@ -564,13 +570,14 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>  					configs, num_configs,
>  					PIN_MAP_TYPE_CONFIGS_GROUP);
>  			if (err < 0)
> -				goto fail;
> +				goto exit;
>  		}
>  	}
>  
> -	return 0;
> +	err = 0;
>  
> -fail:
> +exit:
> +	kfree(configs);
>  	return err;
>  }
>  

^ permalink raw reply	[flat|nested] 27+ messages in thread
* Re: [PATCH] pinctrl: mediatek: fix a memleak when do dt maps.
@ 2015-11-18  3:22   ` Yingjoe Chen
  0 siblings, 0 replies; 27+ messages in thread
From: Yingjoe Chen @ 2015-11-18  3:22 UTC (permalink / raw)
  To: Hongzhou Yang
  Cc: Linus Walleij, Matthias Brugger, Axel Lin, Maoguang Meng,
	Colin Ian King, linux-gpio, linux-arm-kernel, linux-mediatek,
	linux-kernel, srv_heupstream, Sascha Hauer, biao.huang

On Tue, 2015-11-17 at 14:33 -0800, Hongzhou Yang wrote:
> configs will kmemdup to dup_configs in pictrl util function.
> So configs need to be freed.
> 
> Signed-off-by: Hongzhou Yang <hongzhou.yang@mediatek.com>
> Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
> Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
> ---
>  Fix a memleak issue.
>  According to Yingjoe's comment, add return checek for pinconf_generic_parse_dt_config.

Reviewed-by: Yingjoe Chen <yingjoe.chen@mediatek.com>

Joe.C

>  drivers/pinctrl/mediatek/pinctrl-mtk-common.c |   27 ++++++++++++++++---------
>  1 file changed, 17 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> index 5c71727..8db7cdf 100644
> --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> @@ -509,6 +509,9 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>  
>  	err = pinconf_generic_parse_dt_config(node, pctldev, &configs,
>  		&num_configs);
> +	if (err)
> +		return err;
> +
>  	if (num_configs)
>  		has_config = 1;
>  
> @@ -520,21 +523,23 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>  	if (has_config && num_pins >= 1)
>  		maps_per_pin++;
>  
> -	if (!num_pins || !maps_per_pin)
> -		return -EINVAL;
> +	if (!num_pins || !maps_per_pin) {
> +		err = -EINVAL;
> +		goto exit;
> +	}
>  
>  	reserve = num_pins * maps_per_pin;
>  
>  	err = pinctrl_utils_reserve_map(pctldev, map,
>  			reserved_maps, num_maps, reserve);
>  	if (err < 0)
> -		goto fail;
> +		goto exit;
>  
>  	for (i = 0; i < num_pins; i++) {
>  		err = of_property_read_u32_index(node, "pinmux",
>  				i, &pinfunc);
>  		if (err)
> -			goto fail;
> +			goto exit;
>  
>  		pin = MTK_GET_PIN_NO(pinfunc);
>  		func = MTK_GET_PIN_FUNC(pinfunc);
> @@ -543,20 +548,21 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>  				func >= ARRAY_SIZE(mtk_gpio_functions)) {
>  			dev_err(pctl->dev, "invalid pins value.\n");
>  			err = -EINVAL;
> -			goto fail;
> +			goto exit;
>  		}
>  
>  		grp = mtk_pctrl_find_group_by_pin(pctl, pin);
>  		if (!grp) {
>  			dev_err(pctl->dev, "unable to match pin %d to group\n",
>  					pin);
> -			return -EINVAL;
> +			err = -EINVAL;
> +			goto exit;
>  		}
>  
>  		err = mtk_pctrl_dt_node_to_map_func(pctl, pin, func, grp, map,
>  				reserved_maps, num_maps);
>  		if (err < 0)
> -			goto fail;
> +			goto exit;
>  
>  		if (has_config) {
>  			err = pinctrl_utils_add_map_configs(pctldev, map,
> @@ -564,13 +570,14 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>  					configs, num_configs,
>  					PIN_MAP_TYPE_CONFIGS_GROUP);
>  			if (err < 0)
> -				goto fail;
> +				goto exit;
>  		}
>  	}
>  
> -	return 0;
> +	err = 0;
>  
> -fail:
> +exit:
> +	kfree(configs);
>  	return err;
>  }
>  



^ permalink raw reply	[flat|nested] 27+ messages in thread
* [PATCH] pinctrl: mediatek: fix a memleak when do dt maps.
@ 2015-11-18  3:22   ` Yingjoe Chen
  0 siblings, 0 replies; 27+ messages in thread
From: Yingjoe Chen @ 2015-11-18  3:22 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, 2015-11-17 at 14:33 -0800, Hongzhou Yang wrote:
> configs will kmemdup to dup_configs in pictrl util function.
> So configs need to be freed.
> 
> Signed-off-by: Hongzhou Yang <hongzhou.yang@mediatek.com>
> Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
> Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
> ---
>  Fix a memleak issue.
>  According to Yingjoe's comment, add return checek for pinconf_generic_parse_dt_config.

Reviewed-by: Yingjoe Chen <yingjoe.chen@mediatek.com>

Joe.C

>  drivers/pinctrl/mediatek/pinctrl-mtk-common.c |   27 ++++++++++++++++---------
>  1 file changed, 17 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> index 5c71727..8db7cdf 100644
> --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> @@ -509,6 +509,9 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>  
>  	err = pinconf_generic_parse_dt_config(node, pctldev, &configs,
>  		&num_configs);
> +	if (err)
> +		return err;
> +
>  	if (num_configs)
>  		has_config = 1;
>  
> @@ -520,21 +523,23 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>  	if (has_config && num_pins >= 1)
>  		maps_per_pin++;
>  
> -	if (!num_pins || !maps_per_pin)
> -		return -EINVAL;
> +	if (!num_pins || !maps_per_pin) {
> +		err = -EINVAL;
> +		goto exit;
> +	}
>  
>  	reserve = num_pins * maps_per_pin;
>  
>  	err = pinctrl_utils_reserve_map(pctldev, map,
>  			reserved_maps, num_maps, reserve);
>  	if (err < 0)
> -		goto fail;
> +		goto exit;
>  
>  	for (i = 0; i < num_pins; i++) {
>  		err = of_property_read_u32_index(node, "pinmux",
>  				i, &pinfunc);
>  		if (err)
> -			goto fail;
> +			goto exit;
>  
>  		pin = MTK_GET_PIN_NO(pinfunc);
>  		func = MTK_GET_PIN_FUNC(pinfunc);
> @@ -543,20 +548,21 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>  				func >= ARRAY_SIZE(mtk_gpio_functions)) {
>  			dev_err(pctl->dev, "invalid pins value.\n");
>  			err = -EINVAL;
> -			goto fail;
> +			goto exit;
>  		}
>  
>  		grp = mtk_pctrl_find_group_by_pin(pctl, pin);
>  		if (!grp) {
>  			dev_err(pctl->dev, "unable to match pin %d to group\n",
>  					pin);
> -			return -EINVAL;
> +			err = -EINVAL;
> +			goto exit;
>  		}
>  
>  		err = mtk_pctrl_dt_node_to_map_func(pctl, pin, func, grp, map,
>  				reserved_maps, num_maps);
>  		if (err < 0)
> -			goto fail;
> +			goto exit;
>  
>  		if (has_config) {
>  			err = pinctrl_utils_add_map_configs(pctldev, map,
> @@ -564,13 +570,14 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>  					configs, num_configs,
>  					PIN_MAP_TYPE_CONFIGS_GROUP);
>  			if (err < 0)
> -				goto fail;
> +				goto exit;
>  		}
>  	}
>  
> -	return 0;
> +	err = 0;
>  
> -fail:
> +exit:
> +	kfree(configs);
>  	return err;
>  }
>  

^ permalink raw reply	[flat|nested] 27+ messages in thread
* [PATCH] pinctrl: mediatek: fix a memleak when do dt maps.
@ 2015-11-17 22:33 ` Hongzhou Yang
  0 siblings, 0 replies; 27+ messages in thread
From: Hongzhou Yang @ 2015-11-17 22:33 UTC (permalink / raw)
  To: Linus Walleij, Matthias Brugger
  Cc: Hongzhou Yang, Yingjoe Chen, Axel Lin, Maoguang Meng,
	Colin Ian King, linux-gpio, linux-arm-kernel, linux-mediatek,
	linux-kernel, srv_heupstream, Sascha Hauer, biao.huang

configs will kmemdup to dup_configs in pictrl util function.
So configs need to be freed.

Signed-off-by: Hongzhou Yang <hongzhou.yang@mediatek.com>
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
---
 Fix a memleak issue.
 According to Yingjoe's comment, add return checek for pinconf_generic_parse_dt_config.

 drivers/pinctrl/mediatek/pinctrl-mtk-common.c |   27 ++++++++++++++++---------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
index 5c71727..8db7cdf 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
@@ -509,6 +509,9 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
 
 	err = pinconf_generic_parse_dt_config(node, pctldev, &configs,
 		&num_configs);
+	if (err)
+		return err;
+
 	if (num_configs)
 		has_config = 1;
 
@@ -520,21 +523,23 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
 	if (has_config && num_pins >= 1)
 		maps_per_pin++;
 
-	if (!num_pins || !maps_per_pin)
-		return -EINVAL;
+	if (!num_pins || !maps_per_pin) {
+		err = -EINVAL;
+		goto exit;
+	}
 
 	reserve = num_pins * maps_per_pin;
 
 	err = pinctrl_utils_reserve_map(pctldev, map,
 			reserved_maps, num_maps, reserve);
 	if (err < 0)
-		goto fail;
+		goto exit;
 
 	for (i = 0; i < num_pins; i++) {
 		err = of_property_read_u32_index(node, "pinmux",
 				i, &pinfunc);
 		if (err)
-			goto fail;
+			goto exit;
 
 		pin = MTK_GET_PIN_NO(pinfunc);
 		func = MTK_GET_PIN_FUNC(pinfunc);
@@ -543,20 +548,21 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
 				func >= ARRAY_SIZE(mtk_gpio_functions)) {
 			dev_err(pctl->dev, "invalid pins value.\n");
 			err = -EINVAL;
-			goto fail;
+			goto exit;
 		}
 
 		grp = mtk_pctrl_find_group_by_pin(pctl, pin);
 		if (!grp) {
 			dev_err(pctl->dev, "unable to match pin %d to group\n",
 					pin);
-			return -EINVAL;
+			err = -EINVAL;
+			goto exit;
 		}
 
 		err = mtk_pctrl_dt_node_to_map_func(pctl, pin, func, grp, map,
 				reserved_maps, num_maps);
 		if (err < 0)
-			goto fail;
+			goto exit;
 
 		if (has_config) {
 			err = pinctrl_utils_add_map_configs(pctldev, map,
@@ -564,13 +570,14 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
 					configs, num_configs,
 					PIN_MAP_TYPE_CONFIGS_GROUP);
 			if (err < 0)
-				goto fail;
+				goto exit;
 		}
 	}
 
-	return 0;
+	err = 0;
 
-fail:
+exit:
+	kfree(configs);
 	return err;
 }
 
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 27+ messages in thread
* [PATCH] pinctrl: mediatek: fix a memleak when do dt maps.
@ 2015-11-17 22:33 ` Hongzhou Yang
  0 siblings, 0 replies; 27+ messages in thread
From: Hongzhou Yang @ 2015-11-17 22:33 UTC (permalink / raw)
  To: Linus Walleij, Matthias Brugger
  Cc: Hongzhou Yang, Yingjoe Chen, Axel Lin, Maoguang Meng,
	Colin Ian King, linux-gpio, linux-arm-kernel, linux-mediatek,
	linux-kernel, srv_heupstream, Sascha Hauer, biao.huang

configs will kmemdup to dup_configs in pictrl util function.
So configs need to be freed.

Signed-off-by: Hongzhou Yang <hongzhou.yang@mediatek.com>
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
---
 Fix a memleak issue.
 According to Yingjoe's comment, add return checek for pinconf_generic_parse_dt_config.

 drivers/pinctrl/mediatek/pinctrl-mtk-common.c |   27 ++++++++++++++++---------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
index 5c71727..8db7cdf 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
@@ -509,6 +509,9 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
 
 	err = pinconf_generic_parse_dt_config(node, pctldev, &configs,
 		&num_configs);
+	if (err)
+		return err;
+
 	if (num_configs)
 		has_config = 1;
 
@@ -520,21 +523,23 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
 	if (has_config && num_pins >= 1)
 		maps_per_pin++;
 
-	if (!num_pins || !maps_per_pin)
-		return -EINVAL;
+	if (!num_pins || !maps_per_pin) {
+		err = -EINVAL;
+		goto exit;
+	}
 
 	reserve = num_pins * maps_per_pin;
 
 	err = pinctrl_utils_reserve_map(pctldev, map,
 			reserved_maps, num_maps, reserve);
 	if (err < 0)
-		goto fail;
+		goto exit;
 
 	for (i = 0; i < num_pins; i++) {
 		err = of_property_read_u32_index(node, "pinmux",
 				i, &pinfunc);
 		if (err)
-			goto fail;
+			goto exit;
 
 		pin = MTK_GET_PIN_NO(pinfunc);
 		func = MTK_GET_PIN_FUNC(pinfunc);
@@ -543,20 +548,21 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
 				func >= ARRAY_SIZE(mtk_gpio_functions)) {
 			dev_err(pctl->dev, "invalid pins value.\n");
 			err = -EINVAL;
-			goto fail;
+			goto exit;
 		}
 
 		grp = mtk_pctrl_find_group_by_pin(pctl, pin);
 		if (!grp) {
 			dev_err(pctl->dev, "unable to match pin %d to group\n",
 					pin);
-			return -EINVAL;
+			err = -EINVAL;
+			goto exit;
 		}
 
 		err = mtk_pctrl_dt_node_to_map_func(pctl, pin, func, grp, map,
 				reserved_maps, num_maps);
 		if (err < 0)
-			goto fail;
+			goto exit;
 
 		if (has_config) {
 			err = pinctrl_utils_add_map_configs(pctldev, map,
@@ -564,13 +570,14 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
 					configs, num_configs,
 					PIN_MAP_TYPE_CONFIGS_GROUP);
 			if (err < 0)
-				goto fail;
+				goto exit;
 		}
 	}
 
-	return 0;
+	err = 0;
 
-fail:
+exit:
+	kfree(configs);
 	return err;
 }
 
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 27+ messages in thread
* [PATCH] pinctrl: mediatek: fix a memleak when do dt maps.
@ 2015-11-17 22:33 ` Hongzhou Yang
  0 siblings, 0 replies; 27+ messages in thread
From: Hongzhou Yang @ 2015-11-17 22:33 UTC (permalink / raw)
  To: linux-arm-kernel

configs will kmemdup to dup_configs in pictrl util function.
So configs need to be freed.

Signed-off-by: Hongzhou Yang <hongzhou.yang@mediatek.com>
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
---
 Fix a memleak issue.
 According to Yingjoe's comment, add return checek for pinconf_generic_parse_dt_config.

 drivers/pinctrl/mediatek/pinctrl-mtk-common.c |   27 ++++++++++++++++---------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
index 5c71727..8db7cdf 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
@@ -509,6 +509,9 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
 
 	err = pinconf_generic_parse_dt_config(node, pctldev, &configs,
 		&num_configs);
+	if (err)
+		return err;
+
 	if (num_configs)
 		has_config = 1;
 
@@ -520,21 +523,23 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
 	if (has_config && num_pins >= 1)
 		maps_per_pin++;
 
-	if (!num_pins || !maps_per_pin)
-		return -EINVAL;
+	if (!num_pins || !maps_per_pin) {
+		err = -EINVAL;
+		goto exit;
+	}
 
 	reserve = num_pins * maps_per_pin;
 
 	err = pinctrl_utils_reserve_map(pctldev, map,
 			reserved_maps, num_maps, reserve);
 	if (err < 0)
-		goto fail;
+		goto exit;
 
 	for (i = 0; i < num_pins; i++) {
 		err = of_property_read_u32_index(node, "pinmux",
 				i, &pinfunc);
 		if (err)
-			goto fail;
+			goto exit;
 
 		pin = MTK_GET_PIN_NO(pinfunc);
 		func = MTK_GET_PIN_FUNC(pinfunc);
@@ -543,20 +548,21 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
 				func >= ARRAY_SIZE(mtk_gpio_functions)) {
 			dev_err(pctl->dev, "invalid pins value.\n");
 			err = -EINVAL;
-			goto fail;
+			goto exit;
 		}
 
 		grp = mtk_pctrl_find_group_by_pin(pctl, pin);
 		if (!grp) {
 			dev_err(pctl->dev, "unable to match pin %d to group\n",
 					pin);
-			return -EINVAL;
+			err = -EINVAL;
+			goto exit;
 		}
 
 		err = mtk_pctrl_dt_node_to_map_func(pctl, pin, func, grp, map,
 				reserved_maps, num_maps);
 		if (err < 0)
-			goto fail;
+			goto exit;
 
 		if (has_config) {
 			err = pinctrl_utils_add_map_configs(pctldev, map,
@@ -564,13 +570,14 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
 					configs, num_configs,
 					PIN_MAP_TYPE_CONFIGS_GROUP);
 			if (err < 0)
-				goto fail;
+				goto exit;
 		}
 	}
 
-	return 0;
+	err = 0;
 
-fail:
+exit:
+	kfree(configs);
 	return err;
 }
 
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 27+ messages in thread
* Re: [PATCH] pinctrl: mediatek: fix a memleak when do dt maps.
  2015-11-17  4:22 ` Hongzhou Yang
  (?)
@ 2015-11-17 14:18   ` Yingjoe Chen
  -1 siblings, 0 replies; 27+ messages in thread
From: Yingjoe Chen @ 2015-11-17 14:18 UTC (permalink / raw)
  To: Hongzhou Yang
  Cc: Linus Walleij, Matthias Brugger, Axel Lin, Maoguang Meng,
	Colin Ian King, linux-gpio, linux-arm-kernel, linux-mediatek,
	linux-kernel, srv_heupstream, Sascha Hauer, biao.huang

On Mon, 2015-11-16 at 20:22 -0800, Hongzhou Yang wrote:
> configs will kmemdup to dup_configs in pictrl util function.
> So configs need to be freed.
> 
> Signed-off-by: Hongzhou Yang <hongzhou.yang@mediatek.com>
> ---
>  Fix a memleak issue.
> 
>  drivers/pinctrl/mediatek/pinctrl-mtk-common.c |   24 ++++++++++++++----------
>  1 file changed, 14 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> index bbf0230..0f9e416 100644
> --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> @@ -520,21 +520,23 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>  	if (has_config && num_pins >= 1)
>  		maps_per_pin++;
>  
> -	if (!num_pins || !maps_per_pin)
> -		return -EINVAL;
> +	if (!num_pins || !maps_per_pin) {
> +		err = -EINVAL;
> +		goto exit;
> +	}


In line 510:

        err = pinconf_generic_parse_dt_config(node, pctldev, &configs,
                &num_configs);
        if (num_configs)
                has_config = 1;

if the function return err<0, configs and num_configs might not be
initialized and you'll crash the kernel when doing kfree(configs);

Joe.C

>  
>  	reserve = num_pins * maps_per_pin;
>  
>  	err = pinctrl_utils_reserve_map(pctldev, map,
>  			reserved_maps, num_maps, reserve);
>  	if (err < 0)
> -		goto fail;
> +		goto exit;
>  
>  	for (i = 0; i < num_pins; i++) {
>  		err = of_property_read_u32_index(node, "pinmux",
>  				i, &pinfunc);
>  		if (err)
> -			goto fail;
> +			goto exit;
>  
>  		pin = MTK_GET_PIN_NO(pinfunc);
>  		func = MTK_GET_PIN_FUNC(pinfunc);
> @@ -543,20 +545,21 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>  				func >= ARRAY_SIZE(mtk_gpio_functions)) {
>  			dev_err(pctl->dev, "invalid pins value.\n");
>  			err = -EINVAL;
> -			goto fail;
> +			goto exit;
>  		}
>  
>  		grp = mtk_pctrl_find_group_by_pin(pctl, pin);
>  		if (!grp) {
>  			dev_err(pctl->dev, "unable to match pin %d to group\n",
>  					pin);
> -			return -EINVAL;
> +			err = -EINVAL;
> +			goto exit;
>  		}
>  
>  		err = mtk_pctrl_dt_node_to_map_func(pctl, pin, func, grp, map,
>  				reserved_maps, num_maps);
>  		if (err < 0)
> -			goto fail;
> +			goto exit;
>  
>  		if (has_config) {
>  			err = pinctrl_utils_add_map_configs(pctldev, map,
> @@ -564,13 +567,14 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>  					configs, num_configs,
>  					PIN_MAP_TYPE_CONFIGS_GROUP);
>  			if (err < 0)
> -				goto fail;
> +				goto exit;
>  		}
>  	}
>  
> -	return 0;
> +	err = 0;
>  
> -fail:
> +exit:
> +	kfree(configs);
>  	return err;
>  }
>  



^ permalink raw reply	[flat|nested] 27+ messages in thread
* Re: [PATCH] pinctrl: mediatek: fix a memleak when do dt maps.
@ 2015-11-17 14:18   ` Yingjoe Chen
  0 siblings, 0 replies; 27+ messages in thread
From: Yingjoe Chen @ 2015-11-17 14:18 UTC (permalink / raw)
  To: Hongzhou Yang
  Cc: Linus Walleij, Matthias Brugger, Axel Lin, Maoguang Meng,
	Colin Ian King, linux-gpio, linux-arm-kernel, linux-mediatek,
	linux-kernel, srv_heupstream, Sascha Hauer, biao.huang

On Mon, 2015-11-16 at 20:22 -0800, Hongzhou Yang wrote:
> configs will kmemdup to dup_configs in pictrl util function.
> So configs need to be freed.
> 
> Signed-off-by: Hongzhou Yang <hongzhou.yang@mediatek.com>
> ---
>  Fix a memleak issue.
> 
>  drivers/pinctrl/mediatek/pinctrl-mtk-common.c |   24 ++++++++++++++----------
>  1 file changed, 14 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> index bbf0230..0f9e416 100644
> --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> @@ -520,21 +520,23 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>  	if (has_config && num_pins >= 1)
>  		maps_per_pin++;
>  
> -	if (!num_pins || !maps_per_pin)
> -		return -EINVAL;
> +	if (!num_pins || !maps_per_pin) {
> +		err = -EINVAL;
> +		goto exit;
> +	}


In line 510:

        err = pinconf_generic_parse_dt_config(node, pctldev, &configs,
                &num_configs);
        if (num_configs)
                has_config = 1;

if the function return err<0, configs and num_configs might not be
initialized and you'll crash the kernel when doing kfree(configs);

Joe.C

>  
>  	reserve = num_pins * maps_per_pin;
>  
>  	err = pinctrl_utils_reserve_map(pctldev, map,
>  			reserved_maps, num_maps, reserve);
>  	if (err < 0)
> -		goto fail;
> +		goto exit;
>  
>  	for (i = 0; i < num_pins; i++) {
>  		err = of_property_read_u32_index(node, "pinmux",
>  				i, &pinfunc);
>  		if (err)
> -			goto fail;
> +			goto exit;
>  
>  		pin = MTK_GET_PIN_NO(pinfunc);
>  		func = MTK_GET_PIN_FUNC(pinfunc);
> @@ -543,20 +545,21 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>  				func >= ARRAY_SIZE(mtk_gpio_functions)) {
>  			dev_err(pctl->dev, "invalid pins value.\n");
>  			err = -EINVAL;
> -			goto fail;
> +			goto exit;
>  		}
>  
>  		grp = mtk_pctrl_find_group_by_pin(pctl, pin);
>  		if (!grp) {
>  			dev_err(pctl->dev, "unable to match pin %d to group\n",
>  					pin);
> -			return -EINVAL;
> +			err = -EINVAL;
> +			goto exit;
>  		}
>  
>  		err = mtk_pctrl_dt_node_to_map_func(pctl, pin, func, grp, map,
>  				reserved_maps, num_maps);
>  		if (err < 0)
> -			goto fail;
> +			goto exit;
>  
>  		if (has_config) {
>  			err = pinctrl_utils_add_map_configs(pctldev, map,
> @@ -564,13 +567,14 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>  					configs, num_configs,
>  					PIN_MAP_TYPE_CONFIGS_GROUP);
>  			if (err < 0)
> -				goto fail;
> +				goto exit;
>  		}
>  	}
>  
> -	return 0;
> +	err = 0;
>  
> -fail:
> +exit:
> +	kfree(configs);
>  	return err;
>  }
>  



^ permalink raw reply	[flat|nested] 27+ messages in thread
* [PATCH] pinctrl: mediatek: fix a memleak when do dt maps.
@ 2015-11-17 14:18   ` Yingjoe Chen
  0 siblings, 0 replies; 27+ messages in thread
From: Yingjoe Chen @ 2015-11-17 14:18 UTC (permalink / raw)
  To: linux-arm-kernel

On Mon, 2015-11-16 at 20:22 -0800, Hongzhou Yang wrote:
> configs will kmemdup to dup_configs in pictrl util function.
> So configs need to be freed.
> 
> Signed-off-by: Hongzhou Yang <hongzhou.yang@mediatek.com>
> ---
>  Fix a memleak issue.
> 
>  drivers/pinctrl/mediatek/pinctrl-mtk-common.c |   24 ++++++++++++++----------
>  1 file changed, 14 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> index bbf0230..0f9e416 100644
> --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> @@ -520,21 +520,23 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>  	if (has_config && num_pins >= 1)
>  		maps_per_pin++;
>  
> -	if (!num_pins || !maps_per_pin)
> -		return -EINVAL;
> +	if (!num_pins || !maps_per_pin) {
> +		err = -EINVAL;
> +		goto exit;
> +	}


In line 510:

        err = pinconf_generic_parse_dt_config(node, pctldev, &configs,
                &num_configs);
        if (num_configs)
                has_config = 1;

if the function return err<0, configs and num_configs might not be
initialized and you'll crash the kernel when doing kfree(configs);

Joe.C

>  
>  	reserve = num_pins * maps_per_pin;
>  
>  	err = pinctrl_utils_reserve_map(pctldev, map,
>  			reserved_maps, num_maps, reserve);
>  	if (err < 0)
> -		goto fail;
> +		goto exit;
>  
>  	for (i = 0; i < num_pins; i++) {
>  		err = of_property_read_u32_index(node, "pinmux",
>  				i, &pinfunc);
>  		if (err)
> -			goto fail;
> +			goto exit;
>  
>  		pin = MTK_GET_PIN_NO(pinfunc);
>  		func = MTK_GET_PIN_FUNC(pinfunc);
> @@ -543,20 +545,21 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>  				func >= ARRAY_SIZE(mtk_gpio_functions)) {
>  			dev_err(pctl->dev, "invalid pins value.\n");
>  			err = -EINVAL;
> -			goto fail;
> +			goto exit;
>  		}
>  
>  		grp = mtk_pctrl_find_group_by_pin(pctl, pin);
>  		if (!grp) {
>  			dev_err(pctl->dev, "unable to match pin %d to group\n",
>  					pin);
> -			return -EINVAL;
> +			err = -EINVAL;
> +			goto exit;
>  		}
>  
>  		err = mtk_pctrl_dt_node_to_map_func(pctl, pin, func, grp, map,
>  				reserved_maps, num_maps);
>  		if (err < 0)
> -			goto fail;
> +			goto exit;
>  
>  		if (has_config) {
>  			err = pinctrl_utils_add_map_configs(pctldev, map,
> @@ -564,13 +567,14 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>  					configs, num_configs,
>  					PIN_MAP_TYPE_CONFIGS_GROUP);
>  			if (err < 0)
> -				goto fail;
> +				goto exit;
>  		}
>  	}
>  
> -	return 0;
> +	err = 0;
>  
> -fail:
> +exit:
> +	kfree(configs);
>  	return err;
>  }
>  

^ permalink raw reply	[flat|nested] 27+ messages in thread
* Re: [PATCH] pinctrl: mediatek: fix a memleak when do dt maps.
  2015-11-17  8:25   ` Daniel Kurtz
  (?)
@ 2015-11-17 10:50     ` Matthias Brugger
  -1 siblings, 0 replies; 27+ messages in thread
From: Matthias Brugger @ 2015-11-17 10:50 UTC (permalink / raw)
  To: Daniel Kurtz, Hongzhou Yang
  Cc: Linus Walleij, Yingjoe Chen, Axel Lin, Maoguang Meng,
	Colin Ian King, linux-gpio, linux-arm-kernel, linux-mediatek,
	linux-kernel, srv_heupstream, Sascha Hauer, biao.huang



On 17/11/15 09:25, Daniel Kurtz wrote:
> On Tue, Nov 17, 2015 at 12:22 PM, Hongzhou Yang
> <hongzhou.yang@mediatek.com> wrote:
>> configs will kmemdup to dup_configs in pictrl util function.
>> So configs need to be freed.
>>
>> Signed-off-by: Hongzhou Yang <hongzhou.yang@mediatek.com>
>
> Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>

Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
>
>> ---
>>   Fix a memleak issue.
>>
>>   drivers/pinctrl/mediatek/pinctrl-mtk-common.c |   24 ++++++++++++++----------
>>   1 file changed, 14 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
>> index bbf0230..0f9e416 100644
>> --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
>> +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
>> @@ -520,21 +520,23 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>>          if (has_config && num_pins >= 1)
>>                  maps_per_pin++;
>>
>> -       if (!num_pins || !maps_per_pin)
>> -               return -EINVAL;
>> +       if (!num_pins || !maps_per_pin) {
>> +               err = -EINVAL;
>> +               goto exit;
>> +       }
>>
>>          reserve = num_pins * maps_per_pin;
>>
>>          err = pinctrl_utils_reserve_map(pctldev, map,
>>                          reserved_maps, num_maps, reserve);
>>          if (err < 0)
>> -               goto fail;
>> +               goto exit;
>>
>>          for (i = 0; i < num_pins; i++) {
>>                  err = of_property_read_u32_index(node, "pinmux",
>>                                  i, &pinfunc);
>>                  if (err)
>> -                       goto fail;
>> +                       goto exit;
>>
>>                  pin = MTK_GET_PIN_NO(pinfunc);
>>                  func = MTK_GET_PIN_FUNC(pinfunc);
>> @@ -543,20 +545,21 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>>                                  func >= ARRAY_SIZE(mtk_gpio_functions)) {
>>                          dev_err(pctl->dev, "invalid pins value.\n");
>>                          err = -EINVAL;
>> -                       goto fail;
>> +                       goto exit;
>>                  }
>>
>>                  grp = mtk_pctrl_find_group_by_pin(pctl, pin);
>>                  if (!grp) {
>>                          dev_err(pctl->dev, "unable to match pin %d to group\n",
>>                                          pin);
>> -                       return -EINVAL;
>> +                       err = -EINVAL;
>> +                       goto exit;
>>                  }
>>
>>                  err = mtk_pctrl_dt_node_to_map_func(pctl, pin, func, grp, map,
>>                                  reserved_maps, num_maps);
>>                  if (err < 0)
>> -                       goto fail;
>> +                       goto exit;
>>
>>                  if (has_config) {
>>                          err = pinctrl_utils_add_map_configs(pctldev, map,
>> @@ -564,13 +567,14 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>>                                          configs, num_configs,
>>                                          PIN_MAP_TYPE_CONFIGS_GROUP);
>>                          if (err < 0)
>> -                               goto fail;
>> +                               goto exit;
>>                  }
>>          }
>>
>> -       return 0;
>> +       err = 0;
>>
>> -fail:
>> +exit:
>> +       kfree(configs);
>>          return err;
>>   }
>>
>> --
>> 1.7.9.5
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>> Please read the FAQ at  http://www.tux.org/lkml/

^ permalink raw reply	[flat|nested] 27+ messages in thread
* Re: [PATCH] pinctrl: mediatek: fix a memleak when do dt maps.
@ 2015-11-17 10:50     ` Matthias Brugger
  0 siblings, 0 replies; 27+ messages in thread
From: Matthias Brugger @ 2015-11-17 10:50 UTC (permalink / raw)
  To: Daniel Kurtz, Hongzhou Yang
  Cc: Linus Walleij, Yingjoe Chen, Axel Lin, Maoguang Meng,
	Colin Ian King, linux-gpio, linux-arm-kernel, linux-mediatek,
	linux-kernel, srv_heupstream, Sascha Hauer, biao.huang



On 17/11/15 09:25, Daniel Kurtz wrote:
> On Tue, Nov 17, 2015 at 12:22 PM, Hongzhou Yang
> <hongzhou.yang@mediatek.com> wrote:
>> configs will kmemdup to dup_configs in pictrl util function.
>> So configs need to be freed.
>>
>> Signed-off-by: Hongzhou Yang <hongzhou.yang@mediatek.com>
>
> Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>

Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
>
>> ---
>>   Fix a memleak issue.
>>
>>   drivers/pinctrl/mediatek/pinctrl-mtk-common.c |   24 ++++++++++++++----------
>>   1 file changed, 14 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
>> index bbf0230..0f9e416 100644
>> --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
>> +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
>> @@ -520,21 +520,23 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>>          if (has_config && num_pins >= 1)
>>                  maps_per_pin++;
>>
>> -       if (!num_pins || !maps_per_pin)
>> -               return -EINVAL;
>> +       if (!num_pins || !maps_per_pin) {
>> +               err = -EINVAL;
>> +               goto exit;
>> +       }
>>
>>          reserve = num_pins * maps_per_pin;
>>
>>          err = pinctrl_utils_reserve_map(pctldev, map,
>>                          reserved_maps, num_maps, reserve);
>>          if (err < 0)
>> -               goto fail;
>> +               goto exit;
>>
>>          for (i = 0; i < num_pins; i++) {
>>                  err = of_property_read_u32_index(node, "pinmux",
>>                                  i, &pinfunc);
>>                  if (err)
>> -                       goto fail;
>> +                       goto exit;
>>
>>                  pin = MTK_GET_PIN_NO(pinfunc);
>>                  func = MTK_GET_PIN_FUNC(pinfunc);
>> @@ -543,20 +545,21 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>>                                  func >= ARRAY_SIZE(mtk_gpio_functions)) {
>>                          dev_err(pctl->dev, "invalid pins value.\n");
>>                          err = -EINVAL;
>> -                       goto fail;
>> +                       goto exit;
>>                  }
>>
>>                  grp = mtk_pctrl_find_group_by_pin(pctl, pin);
>>                  if (!grp) {
>>                          dev_err(pctl->dev, "unable to match pin %d to group\n",
>>                                          pin);
>> -                       return -EINVAL;
>> +                       err = -EINVAL;
>> +                       goto exit;
>>                  }
>>
>>                  err = mtk_pctrl_dt_node_to_map_func(pctl, pin, func, grp, map,
>>                                  reserved_maps, num_maps);
>>                  if (err < 0)
>> -                       goto fail;
>> +                       goto exit;
>>
>>                  if (has_config) {
>>                          err = pinctrl_utils_add_map_configs(pctldev, map,
>> @@ -564,13 +567,14 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>>                                          configs, num_configs,
>>                                          PIN_MAP_TYPE_CONFIGS_GROUP);
>>                          if (err < 0)
>> -                               goto fail;
>> +                               goto exit;
>>                  }
>>          }
>>
>> -       return 0;
>> +       err = 0;
>>
>> -fail:
>> +exit:
>> +       kfree(configs);
>>          return err;
>>   }
>>
>> --
>> 1.7.9.5
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>> Please read the FAQ at  http://www.tux.org/lkml/

^ permalink raw reply	[flat|nested] 27+ messages in thread
* [PATCH] pinctrl: mediatek: fix a memleak when do dt maps.
@ 2015-11-17 10:50     ` Matthias Brugger
  0 siblings, 0 replies; 27+ messages in thread
From: Matthias Brugger @ 2015-11-17 10:50 UTC (permalink / raw)
  To: linux-arm-kernel



On 17/11/15 09:25, Daniel Kurtz wrote:
> On Tue, Nov 17, 2015 at 12:22 PM, Hongzhou Yang
> <hongzhou.yang@mediatek.com> wrote:
>> configs will kmemdup to dup_configs in pictrl util function.
>> So configs need to be freed.
>>
>> Signed-off-by: Hongzhou Yang <hongzhou.yang@mediatek.com>
>
> Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>

Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
>
>> ---
>>   Fix a memleak issue.
>>
>>   drivers/pinctrl/mediatek/pinctrl-mtk-common.c |   24 ++++++++++++++----------
>>   1 file changed, 14 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
>> index bbf0230..0f9e416 100644
>> --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
>> +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
>> @@ -520,21 +520,23 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>>          if (has_config && num_pins >= 1)
>>                  maps_per_pin++;
>>
>> -       if (!num_pins || !maps_per_pin)
>> -               return -EINVAL;
>> +       if (!num_pins || !maps_per_pin) {
>> +               err = -EINVAL;
>> +               goto exit;
>> +       }
>>
>>          reserve = num_pins * maps_per_pin;
>>
>>          err = pinctrl_utils_reserve_map(pctldev, map,
>>                          reserved_maps, num_maps, reserve);
>>          if (err < 0)
>> -               goto fail;
>> +               goto exit;
>>
>>          for (i = 0; i < num_pins; i++) {
>>                  err = of_property_read_u32_index(node, "pinmux",
>>                                  i, &pinfunc);
>>                  if (err)
>> -                       goto fail;
>> +                       goto exit;
>>
>>                  pin = MTK_GET_PIN_NO(pinfunc);
>>                  func = MTK_GET_PIN_FUNC(pinfunc);
>> @@ -543,20 +545,21 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>>                                  func >= ARRAY_SIZE(mtk_gpio_functions)) {
>>                          dev_err(pctl->dev, "invalid pins value.\n");
>>                          err = -EINVAL;
>> -                       goto fail;
>> +                       goto exit;
>>                  }
>>
>>                  grp = mtk_pctrl_find_group_by_pin(pctl, pin);
>>                  if (!grp) {
>>                          dev_err(pctl->dev, "unable to match pin %d to group\n",
>>                                          pin);
>> -                       return -EINVAL;
>> +                       err = -EINVAL;
>> +                       goto exit;
>>                  }
>>
>>                  err = mtk_pctrl_dt_node_to_map_func(pctl, pin, func, grp, map,
>>                                  reserved_maps, num_maps);
>>                  if (err < 0)
>> -                       goto fail;
>> +                       goto exit;
>>
>>                  if (has_config) {
>>                          err = pinctrl_utils_add_map_configs(pctldev, map,
>> @@ -564,13 +567,14 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>>                                          configs, num_configs,
>>                                          PIN_MAP_TYPE_CONFIGS_GROUP);
>>                          if (err < 0)
>> -                               goto fail;
>> +                               goto exit;
>>                  }
>>          }
>>
>> -       return 0;
>> +       err = 0;
>>
>> -fail:
>> +exit:
>> +       kfree(configs);
>>          return err;
>>   }
>>
>> --
>> 1.7.9.5
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>> the body of a message to majordomo at vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>> Please read the FAQ at  http://www.tux.org/lkml/

^ permalink raw reply	[flat|nested] 27+ messages in thread
* Re: [PATCH] pinctrl: mediatek: fix a memleak when do dt maps.
  2015-11-17  4:22 ` Hongzhou Yang
  (?)
@ 2015-11-17  8:25   ` Daniel Kurtz
  -1 siblings, 0 replies; 27+ messages in thread
From: Daniel Kurtz @ 2015-11-17  8:25 UTC (permalink / raw)
  To: Hongzhou Yang
  Cc: Linus Walleij, Matthias Brugger, Yingjoe Chen, Axel Lin,
	Maoguang Meng, Colin Ian King, linux-gpio, linux-arm-kernel,
	linux-mediatek, linux-kernel, srv_heupstream, Sascha Hauer,
	biao.huang

On Tue, Nov 17, 2015 at 12:22 PM, Hongzhou Yang
<hongzhou.yang@mediatek.com> wrote:
> configs will kmemdup to dup_configs in pictrl util function.
> So configs need to be freed.
>
> Signed-off-by: Hongzhou Yang <hongzhou.yang@mediatek.com>

Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>

> ---
>  Fix a memleak issue.
>
>  drivers/pinctrl/mediatek/pinctrl-mtk-common.c |   24 ++++++++++++++----------
>  1 file changed, 14 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> index bbf0230..0f9e416 100644
> --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> @@ -520,21 +520,23 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>         if (has_config && num_pins >= 1)
>                 maps_per_pin++;
>
> -       if (!num_pins || !maps_per_pin)
> -               return -EINVAL;
> +       if (!num_pins || !maps_per_pin) {
> +               err = -EINVAL;
> +               goto exit;
> +       }
>
>         reserve = num_pins * maps_per_pin;
>
>         err = pinctrl_utils_reserve_map(pctldev, map,
>                         reserved_maps, num_maps, reserve);
>         if (err < 0)
> -               goto fail;
> +               goto exit;
>
>         for (i = 0; i < num_pins; i++) {
>                 err = of_property_read_u32_index(node, "pinmux",
>                                 i, &pinfunc);
>                 if (err)
> -                       goto fail;
> +                       goto exit;
>
>                 pin = MTK_GET_PIN_NO(pinfunc);
>                 func = MTK_GET_PIN_FUNC(pinfunc);
> @@ -543,20 +545,21 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>                                 func >= ARRAY_SIZE(mtk_gpio_functions)) {
>                         dev_err(pctl->dev, "invalid pins value.\n");
>                         err = -EINVAL;
> -                       goto fail;
> +                       goto exit;
>                 }
>
>                 grp = mtk_pctrl_find_group_by_pin(pctl, pin);
>                 if (!grp) {
>                         dev_err(pctl->dev, "unable to match pin %d to group\n",
>                                         pin);
> -                       return -EINVAL;
> +                       err = -EINVAL;
> +                       goto exit;
>                 }
>
>                 err = mtk_pctrl_dt_node_to_map_func(pctl, pin, func, grp, map,
>                                 reserved_maps, num_maps);
>                 if (err < 0)
> -                       goto fail;
> +                       goto exit;
>
>                 if (has_config) {
>                         err = pinctrl_utils_add_map_configs(pctldev, map,
> @@ -564,13 +567,14 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>                                         configs, num_configs,
>                                         PIN_MAP_TYPE_CONFIGS_GROUP);
>                         if (err < 0)
> -                               goto fail;
> +                               goto exit;
>                 }
>         }
>
> -       return 0;
> +       err = 0;
>
> -fail:
> +exit:
> +       kfree(configs);
>         return err;
>  }
>
> --
> 1.7.9.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

^ permalink raw reply	[flat|nested] 27+ messages in thread
* Re: [PATCH] pinctrl: mediatek: fix a memleak when do dt maps.
@ 2015-11-17  8:25   ` Daniel Kurtz
  0 siblings, 0 replies; 27+ messages in thread
From: Daniel Kurtz @ 2015-11-17  8:25 UTC (permalink / raw)
  To: Hongzhou Yang
  Cc: Linus Walleij, Matthias Brugger, Yingjoe Chen, Axel Lin,
	Maoguang Meng, Colin Ian King, linux-gpio, linux-arm-kernel,
	linux-mediatek, linux-kernel, srv_heupstream, Sascha Hauer,
	biao.huang

On Tue, Nov 17, 2015 at 12:22 PM, Hongzhou Yang
<hongzhou.yang@mediatek.com> wrote:
> configs will kmemdup to dup_configs in pictrl util function.
> So configs need to be freed.
>
> Signed-off-by: Hongzhou Yang <hongzhou.yang@mediatek.com>

Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>

> ---
>  Fix a memleak issue.
>
>  drivers/pinctrl/mediatek/pinctrl-mtk-common.c |   24 ++++++++++++++----------
>  1 file changed, 14 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> index bbf0230..0f9e416 100644
> --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> @@ -520,21 +520,23 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>         if (has_config && num_pins >= 1)
>                 maps_per_pin++;
>
> -       if (!num_pins || !maps_per_pin)
> -               return -EINVAL;
> +       if (!num_pins || !maps_per_pin) {
> +               err = -EINVAL;
> +               goto exit;
> +       }
>
>         reserve = num_pins * maps_per_pin;
>
>         err = pinctrl_utils_reserve_map(pctldev, map,
>                         reserved_maps, num_maps, reserve);
>         if (err < 0)
> -               goto fail;
> +               goto exit;
>
>         for (i = 0; i < num_pins; i++) {
>                 err = of_property_read_u32_index(node, "pinmux",
>                                 i, &pinfunc);
>                 if (err)
> -                       goto fail;
> +                       goto exit;
>
>                 pin = MTK_GET_PIN_NO(pinfunc);
>                 func = MTK_GET_PIN_FUNC(pinfunc);
> @@ -543,20 +545,21 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>                                 func >= ARRAY_SIZE(mtk_gpio_functions)) {
>                         dev_err(pctl->dev, "invalid pins value.\n");
>                         err = -EINVAL;
> -                       goto fail;
> +                       goto exit;
>                 }
>
>                 grp = mtk_pctrl_find_group_by_pin(pctl, pin);
>                 if (!grp) {
>                         dev_err(pctl->dev, "unable to match pin %d to group\n",
>                                         pin);
> -                       return -EINVAL;
> +                       err = -EINVAL;
> +                       goto exit;
>                 }
>
>                 err = mtk_pctrl_dt_node_to_map_func(pctl, pin, func, grp, map,
>                                 reserved_maps, num_maps);
>                 if (err < 0)
> -                       goto fail;
> +                       goto exit;
>
>                 if (has_config) {
>                         err = pinctrl_utils_add_map_configs(pctldev, map,
> @@ -564,13 +567,14 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>                                         configs, num_configs,
>                                         PIN_MAP_TYPE_CONFIGS_GROUP);
>                         if (err < 0)
> -                               goto fail;
> +                               goto exit;
>                 }
>         }
>
> -       return 0;
> +       err = 0;
>
> -fail:
> +exit:
> +       kfree(configs);
>         return err;
>  }
>
> --
> 1.7.9.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

^ permalink raw reply	[flat|nested] 27+ messages in thread
* [PATCH] pinctrl: mediatek: fix a memleak when do dt maps.
@ 2015-11-17  8:25   ` Daniel Kurtz
  0 siblings, 0 replies; 27+ messages in thread
From: Daniel Kurtz @ 2015-11-17  8:25 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Nov 17, 2015 at 12:22 PM, Hongzhou Yang
<hongzhou.yang@mediatek.com> wrote:
> configs will kmemdup to dup_configs in pictrl util function.
> So configs need to be freed.
>
> Signed-off-by: Hongzhou Yang <hongzhou.yang@mediatek.com>

Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>

> ---
>  Fix a memleak issue.
>
>  drivers/pinctrl/mediatek/pinctrl-mtk-common.c |   24 ++++++++++++++----------
>  1 file changed, 14 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> index bbf0230..0f9e416 100644
> --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> @@ -520,21 +520,23 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>         if (has_config && num_pins >= 1)
>                 maps_per_pin++;
>
> -       if (!num_pins || !maps_per_pin)
> -               return -EINVAL;
> +       if (!num_pins || !maps_per_pin) {
> +               err = -EINVAL;
> +               goto exit;
> +       }
>
>         reserve = num_pins * maps_per_pin;
>
>         err = pinctrl_utils_reserve_map(pctldev, map,
>                         reserved_maps, num_maps, reserve);
>         if (err < 0)
> -               goto fail;
> +               goto exit;
>
>         for (i = 0; i < num_pins; i++) {
>                 err = of_property_read_u32_index(node, "pinmux",
>                                 i, &pinfunc);
>                 if (err)
> -                       goto fail;
> +                       goto exit;
>
>                 pin = MTK_GET_PIN_NO(pinfunc);
>                 func = MTK_GET_PIN_FUNC(pinfunc);
> @@ -543,20 +545,21 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>                                 func >= ARRAY_SIZE(mtk_gpio_functions)) {
>                         dev_err(pctl->dev, "invalid pins value.\n");
>                         err = -EINVAL;
> -                       goto fail;
> +                       goto exit;
>                 }
>
>                 grp = mtk_pctrl_find_group_by_pin(pctl, pin);
>                 if (!grp) {
>                         dev_err(pctl->dev, "unable to match pin %d to group\n",
>                                         pin);
> -                       return -EINVAL;
> +                       err = -EINVAL;
> +                       goto exit;
>                 }
>
>                 err = mtk_pctrl_dt_node_to_map_func(pctl, pin, func, grp, map,
>                                 reserved_maps, num_maps);
>                 if (err < 0)
> -                       goto fail;
> +                       goto exit;
>
>                 if (has_config) {
>                         err = pinctrl_utils_add_map_configs(pctldev, map,
> @@ -564,13 +567,14 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
>                                         configs, num_configs,
>                                         PIN_MAP_TYPE_CONFIGS_GROUP);
>                         if (err < 0)
> -                               goto fail;
> +                               goto exit;
>                 }
>         }
>
> -       return 0;
> +       err = 0;
>
> -fail:
> +exit:
> +       kfree(configs);
>         return err;
>  }
>
> --
> 1.7.9.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

^ permalink raw reply	[flat|nested] 27+ messages in thread
* [PATCH] pinctrl: mediatek: fix a memleak when do dt maps.
@ 2015-11-17  4:22 ` Hongzhou Yang
  0 siblings, 0 replies; 27+ messages in thread
From: Hongzhou Yang @ 2015-11-17  4:22 UTC (permalink / raw)
  To: Linus Walleij, Matthias Brugger
  Cc: Hongzhou Yang, Yingjoe Chen, Axel Lin, Maoguang Meng,
	Colin Ian King, linux-gpio, linux-arm-kernel, linux-mediatek,
	linux-kernel, srv_heupstream, Sascha Hauer, biao.huang

configs will kmemdup to dup_configs in pictrl util function.
So configs need to be freed.

Signed-off-by: Hongzhou Yang <hongzhou.yang@mediatek.com>
---
 Fix a memleak issue.

 drivers/pinctrl/mediatek/pinctrl-mtk-common.c |   24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
index bbf0230..0f9e416 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
@@ -520,21 +520,23 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
 	if (has_config && num_pins >= 1)
 		maps_per_pin++;
 
-	if (!num_pins || !maps_per_pin)
-		return -EINVAL;
+	if (!num_pins || !maps_per_pin) {
+		err = -EINVAL;
+		goto exit;
+	}
 
 	reserve = num_pins * maps_per_pin;
 
 	err = pinctrl_utils_reserve_map(pctldev, map,
 			reserved_maps, num_maps, reserve);
 	if (err < 0)
-		goto fail;
+		goto exit;
 
 	for (i = 0; i < num_pins; i++) {
 		err = of_property_read_u32_index(node, "pinmux",
 				i, &pinfunc);
 		if (err)
-			goto fail;
+			goto exit;
 
 		pin = MTK_GET_PIN_NO(pinfunc);
 		func = MTK_GET_PIN_FUNC(pinfunc);
@@ -543,20 +545,21 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
 				func >= ARRAY_SIZE(mtk_gpio_functions)) {
 			dev_err(pctl->dev, "invalid pins value.\n");
 			err = -EINVAL;
-			goto fail;
+			goto exit;
 		}
 
 		grp = mtk_pctrl_find_group_by_pin(pctl, pin);
 		if (!grp) {
 			dev_err(pctl->dev, "unable to match pin %d to group\n",
 					pin);
-			return -EINVAL;
+			err = -EINVAL;
+			goto exit;
 		}
 
 		err = mtk_pctrl_dt_node_to_map_func(pctl, pin, func, grp, map,
 				reserved_maps, num_maps);
 		if (err < 0)
-			goto fail;
+			goto exit;
 
 		if (has_config) {
 			err = pinctrl_utils_add_map_configs(pctldev, map,
@@ -564,13 +567,14 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
 					configs, num_configs,
 					PIN_MAP_TYPE_CONFIGS_GROUP);
 			if (err < 0)
-				goto fail;
+				goto exit;
 		}
 	}
 
-	return 0;
+	err = 0;
 
-fail:
+exit:
+	kfree(configs);
 	return err;
 }
 
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 27+ messages in thread
* [PATCH] pinctrl: mediatek: fix a memleak when do dt maps.
@ 2015-11-17  4:22 ` Hongzhou Yang
  0 siblings, 0 replies; 27+ messages in thread
From: Hongzhou Yang @ 2015-11-17  4:22 UTC (permalink / raw)
  To: Linus Walleij, Matthias Brugger
  Cc: Hongzhou Yang, Yingjoe Chen, Axel Lin, Maoguang Meng,
	Colin Ian King, linux-gpio, linux-arm-kernel, linux-mediatek,
	linux-kernel, srv_heupstream, Sascha Hauer, biao.huang

configs will kmemdup to dup_configs in pictrl util function.
So configs need to be freed.

Signed-off-by: Hongzhou Yang <hongzhou.yang@mediatek.com>
---
 Fix a memleak issue.

 drivers/pinctrl/mediatek/pinctrl-mtk-common.c |   24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
index bbf0230..0f9e416 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
@@ -520,21 +520,23 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
 	if (has_config && num_pins >= 1)
 		maps_per_pin++;
 
-	if (!num_pins || !maps_per_pin)
-		return -EINVAL;
+	if (!num_pins || !maps_per_pin) {
+		err = -EINVAL;
+		goto exit;
+	}
 
 	reserve = num_pins * maps_per_pin;
 
 	err = pinctrl_utils_reserve_map(pctldev, map,
 			reserved_maps, num_maps, reserve);
 	if (err < 0)
-		goto fail;
+		goto exit;
 
 	for (i = 0; i < num_pins; i++) {
 		err = of_property_read_u32_index(node, "pinmux",
 				i, &pinfunc);
 		if (err)
-			goto fail;
+			goto exit;
 
 		pin = MTK_GET_PIN_NO(pinfunc);
 		func = MTK_GET_PIN_FUNC(pinfunc);
@@ -543,20 +545,21 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
 				func >= ARRAY_SIZE(mtk_gpio_functions)) {
 			dev_err(pctl->dev, "invalid pins value.\n");
 			err = -EINVAL;
-			goto fail;
+			goto exit;
 		}
 
 		grp = mtk_pctrl_find_group_by_pin(pctl, pin);
 		if (!grp) {
 			dev_err(pctl->dev, "unable to match pin %d to group\n",
 					pin);
-			return -EINVAL;
+			err = -EINVAL;
+			goto exit;
 		}
 
 		err = mtk_pctrl_dt_node_to_map_func(pctl, pin, func, grp, map,
 				reserved_maps, num_maps);
 		if (err < 0)
-			goto fail;
+			goto exit;
 
 		if (has_config) {
 			err = pinctrl_utils_add_map_configs(pctldev, map,
@@ -564,13 +567,14 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
 					configs, num_configs,
 					PIN_MAP_TYPE_CONFIGS_GROUP);
 			if (err < 0)
-				goto fail;
+				goto exit;
 		}
 	}
 
-	return 0;
+	err = 0;
 
-fail:
+exit:
+	kfree(configs);
 	return err;
 }
 
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 27+ messages in thread
* [PATCH] pinctrl: mediatek: fix a memleak when do dt maps.
@ 2015-11-17  4:22 ` Hongzhou Yang
  0 siblings, 0 replies; 27+ messages in thread
From: Hongzhou Yang @ 2015-11-17  4:22 UTC (permalink / raw)
  To: linux-arm-kernel

configs will kmemdup to dup_configs in pictrl util function.
So configs need to be freed.

Signed-off-by: Hongzhou Yang <hongzhou.yang@mediatek.com>
---
 Fix a memleak issue.

 drivers/pinctrl/mediatek/pinctrl-mtk-common.c |   24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
index bbf0230..0f9e416 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
@@ -520,21 +520,23 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
 	if (has_config && num_pins >= 1)
 		maps_per_pin++;
 
-	if (!num_pins || !maps_per_pin)
-		return -EINVAL;
+	if (!num_pins || !maps_per_pin) {
+		err = -EINVAL;
+		goto exit;
+	}
 
 	reserve = num_pins * maps_per_pin;
 
 	err = pinctrl_utils_reserve_map(pctldev, map,
 			reserved_maps, num_maps, reserve);
 	if (err < 0)
-		goto fail;
+		goto exit;
 
 	for (i = 0; i < num_pins; i++) {
 		err = of_property_read_u32_index(node, "pinmux",
 				i, &pinfunc);
 		if (err)
-			goto fail;
+			goto exit;
 
 		pin = MTK_GET_PIN_NO(pinfunc);
 		func = MTK_GET_PIN_FUNC(pinfunc);
@@ -543,20 +545,21 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
 				func >= ARRAY_SIZE(mtk_gpio_functions)) {
 			dev_err(pctl->dev, "invalid pins value.\n");
 			err = -EINVAL;
-			goto fail;
+			goto exit;
 		}
 
 		grp = mtk_pctrl_find_group_by_pin(pctl, pin);
 		if (!grp) {
 			dev_err(pctl->dev, "unable to match pin %d to group\n",
 					pin);
-			return -EINVAL;
+			err = -EINVAL;
+			goto exit;
 		}
 
 		err = mtk_pctrl_dt_node_to_map_func(pctl, pin, func, grp, map,
 				reserved_maps, num_maps);
 		if (err < 0)
-			goto fail;
+			goto exit;
 
 		if (has_config) {
 			err = pinctrl_utils_add_map_configs(pctldev, map,
@@ -564,13 +567,14 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
 					configs, num_configs,
 					PIN_MAP_TYPE_CONFIGS_GROUP);
 			if (err < 0)
-				goto fail;
+				goto exit;
 		}
 	}
 
-	return 0;
+	err = 0;
 
-fail:
+exit:
+	kfree(configs);
 	return err;
 }
 
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 27+ messages in thread
end of thread, other threads:[~2015-11-29 21:35 UTC | newest]

Thread overview: 27+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-17  2:34 [PATCH] pinctrl: mediatek: fix a memleak when do dt maps Hongzhou Yang
2015-11-17  2:34 ` Hongzhou Yang
2015-11-17  2:34 ` Hongzhou Yang
2015-11-17  2:50 ` Daniel Kurtz
2015-11-17  2:50   ` Daniel Kurtz
2015-11-17  2:50   ` Daniel Kurtz
2015-11-17  4:22 Hongzhou Yang
2015-11-17  4:22 ` Hongzhou Yang
2015-11-17  4:22 ` Hongzhou Yang
2015-11-17  8:25 ` Daniel Kurtz
2015-11-17  8:25   ` Daniel Kurtz
2015-11-17  8:25   ` Daniel Kurtz
2015-11-17 10:50   ` Matthias Brugger
2015-11-17 10:50     ` Matthias Brugger
2015-11-17 10:50     ` Matthias Brugger
2015-11-17 14:18 ` Yingjoe Chen
2015-11-17 14:18   ` Yingjoe Chen
2015-11-17 14:18   ` Yingjoe Chen
2015-11-17 22:33 Hongzhou Yang
2015-11-17 22:33 ` Hongzhou Yang
2015-11-17 22:33 ` Hongzhou Yang
2015-11-18  3:22 ` Yingjoe Chen
2015-11-18  3:22   ` Yingjoe Chen
2015-11-18  3:22   ` Yingjoe Chen
2015-11-29 21:35 ` Linus Walleij
2015-11-29 21:35   ` Linus Walleij
2015-11-29 21:35   ` Linus Walleij

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.