raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

media: staging: davinci: fix memory leaks and check for allocation failure

Browse Source 
There are three error return paths that don't kfree params causing a
memory leak.  Fix this by adding an error return path that kfree's
params before returning.  Also add a check to see params failed to
be allocated.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Colin Ian King
2019-06-08 07:27:25 -04:00
committed by Mauro Carvalho Chehab
parent 94b5bf3ac9
commit a84e355ecd
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/staging/media/davinci_vpfe/dm365_ipipe.c
View File

@@ -1251,10 +1251,10 @@ static int ipipe_s_config(struct v4l2_subdev *sd, struct vpfe_ipipe_config *cfg)
struct vpfe_ipipe_device *ipipe = v4l2_get_subdevdata(sd); struct vpfe_ipipe_device *ipipe = v4l2_get_subdevdata(sd);
unsigned int i; unsigned int i;
int rval = 0; int rval = 0;
struct ipipe_module_params *params;
for (i = 0; i < ARRAY_SIZE(ipipe_modules); i++) { for (i = 0; i < ARRAY_SIZE(ipipe_modules); i++) {
const struct ipipe_module_if *module_if; const struct ipipe_module_if *module_if;
struct ipipe_module_params *params;
void *from, *to; void *from, *to;
size_t size; size_t size;
@@ -1265,25 +1265,30 @@ static int ipipe_s_config(struct v4l2_subdev *sd, struct vpfe_ipipe_config *cfg)
from = *(void **)((void *)cfg + module_if->config_offset); from = *(void **)((void *)cfg + module_if->config_offset);
params = kmalloc(sizeof(*params), GFP_KERNEL); params = kmalloc(sizeof(*params), GFP_KERNEL);
if (!params)
return -ENOMEM;
to = (void *)params + module_if->param_offset; to = (void *)params + module_if->param_offset;
size = module_if->param_size; size = module_if->param_size;
if (to && from && size) { if (to && from && size) {
if (copy_from_user(to, (void __user *)from, size)) { if (copy_from_user(to, (void __user *)from, size)) {
rval = -EFAULT; rval = -EFAULT;
break; goto error_free;
} }
rval = module_if->set(ipipe, to); rval = module_if->set(ipipe, to);
if (rval) if (rval)
goto error; goto error_free;
} else if (to && !from && size) { } else if (to && !from && size) {
rval = module_if->set(ipipe, NULL); rval = module_if->set(ipipe, NULL);
if (rval) if (rval)
goto error; goto error_free;
} }
kfree(params); kfree(params);
} }
error: return rval;
error_free:
kfree(params);
return rval; return rval;
} }