lkml.org 
[lkml]   [2016]   [Sep]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 2/3] pinctrl: berlin: Don't leak memory if krealloc() fails
Date
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(-)

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++) {
--
1.8.5.6
\
 
 \ /
  Last update: 2016-09-30 14:14    [W:0.027 / U:0.016 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site