| Message ID | 1475237636-15109-1-git-send-email-jthumshirn@suse.de |
|---|---|
| State | New |
| Headers | show |
On Fri, Sep 30, 2016 at 2:13 PM, Johannes Thumshirn <jthumshirn@suse.de> wrote: > We're directly assigning krealoc()'s return value to pctrl->functions instead > of using a temporary value to handle error checking. This leaks memory in case > krealloc() failes. While we're at it, implement error handling for failed > allocations at all. > > Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de> Patch applied. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pinctrl/berlin/berlin.c b/drivers/pinctrl/berlin/berlin.c index 8f0dc02..76281c8 100644 --- a/drivers/pinctrl/berlin/berlin.c +++ b/drivers/pinctrl/berlin/berlin.c @@ -208,6 +208,7 @@ static int berlin_pinctrl_build_state(struct platform_device *pdev) struct berlin_pinctrl *pctrl = platform_get_drvdata(pdev); struct berlin_desc_group const *desc_group; struct berlin_desc_function const *desc_function; + struct berlin_pinctrl_function *functions; int i, max_functions = 0; pctrl->nfunctions = 0; @@ -236,9 +237,14 @@ static int berlin_pinctrl_build_state(struct platform_device *pdev) } } - pctrl->functions = krealloc(pctrl->functions, - pctrl->nfunctions * sizeof(*pctrl->functions), - GFP_KERNEL); + functions = krealloc(pctrl->functions, + pctrl->nfunctions * sizeof(*pctrl->functions), + GFP_KERNEL); + if (!functions) { + kfree(pctrl->functions); + return -ENOMEM; + } + pctrl->functions = functions; /* map functions to theirs groups */ for (i = 0; i < pctrl->desc->ngroups; i++) {
We're directly assigning krealoc()'s return value to pctrl->functions instead of using a temporary value to handle error checking. This leaks memory in case krealloc() failes. While we're at it, implement error handling for failed allocations at all. Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de> --- drivers/pinctrl/berlin/berlin.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)