lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 18 Nov 2015 11:22:09 +0800 From: Yingjoe Chen <yingjoe.chen@...iatek.com> To: Hongzhou Yang <hongzhou.yang@...iatek.com> CC: Linus Walleij <linus.walleij@...aro.org>, Matthias Brugger <matthias.bgg@...il.com>, Axel Lin <axel.lin@...ics.com>, Maoguang Meng <maoguang.meng@...iatek.com>, Colin Ian King <colin.king@...onical.com>, <linux-gpio@...r.kernel.org>, <linux-arm-kernel@...ts.infradead.org>, <linux-mediatek@...ts.infradead.org>, <linux-kernel@...r.kernel.org>, <srv_heupstream@...iatek.com>, Sascha Hauer <kernel@...gutronix.de>, <biao.huang@...iatek.com> Subject: Re: [PATCH] pinctrl: mediatek: fix a memleak when do dt maps. 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@...iatek.com> > Reviewed-by: Daniel Kurtz <djkurtz@...omium.org> > Reviewed-by: Matthias Brugger <matthias.bgg@...il.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@...iatek.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; > } > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists