diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2014-06-11 13:17:41 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-06-17 17:09:40 +0200 |
| commit | fc96e661a57d5e4de01503d460116cce7ced7e70 (patch) | |
| tree | 442029d29223584ade51357a8e18f2ae065ec954 /drivers/misc | |
| parent | 19682f72f5db906c393a5c61b8db2476974f8172 (diff) | |
| download | linux-stable-fc96e661a57d5e4de01503d460116cce7ced7e70.tar.gz linux-stable-fc96e661a57d5e4de01503d460116cce7ced7e70.tar.bz2 linux-stable-fc96e661a57d5e4de01503d460116cce7ced7e70.zip | |
misc: vexpress: fix error handling vexpress_syscfg_regmap_init()
This function should be returning an ERR_PTR() on failure instead of
NULL. Also there is a use after free bug if regmap_init() fails because
we free "func" and then dereference doing the return.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Pawel Moll <pawel.moll@arm.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/vexpress-syscfg.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/misc/vexpress-syscfg.c b/drivers/misc/vexpress-syscfg.c index 73068e50e56d..3250fc1df0aa 100644 --- a/drivers/misc/vexpress-syscfg.c +++ b/drivers/misc/vexpress-syscfg.c @@ -199,7 +199,7 @@ static struct regmap *vexpress_syscfg_regmap_init(struct device *dev, func = kzalloc(sizeof(*func) + sizeof(*func->template) * num, GFP_KERNEL); if (!func) - return NULL; + return ERR_PTR(-ENOMEM); func->syscfg = syscfg; func->num_templates = num; @@ -231,10 +231,14 @@ static struct regmap *vexpress_syscfg_regmap_init(struct device *dev, func->regmap = regmap_init(dev, NULL, func, &vexpress_syscfg_regmap_config); - if (IS_ERR(func->regmap)) + if (IS_ERR(func->regmap)) { + void *err = func->regmap; + kfree(func); - else - list_add(&func->list, &syscfg->funcs); + return err; + } + + list_add(&func->list, &syscfg->funcs); return func->regmap; } |