p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Dan Carpenter 2014-06-11 13:17:41 +03:00 committed by Arnd Bergmann
parent 19682f72f5
commit fc96e661a5
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/misc/vexpress-syscfg.c
View File

@ -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,9 +231,13 @@ 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
return err;
}
list_add(&func->list, &syscfg->funcs);
return func->regmap;