2018-03-19 05:34:28

by Ji-Hun Kim

[permalink] [raw]
Subject: [PATCH v2] staging: media: davinci_vpfe: add error handling on kmalloc failure

There is no failure checking on the param value which will be allocated
memory by kmalloc. Add a null pointer checking statement. Then goto error:
and return -ENOMEM error code when kmalloc is failed.

Signed-off-by: Ji-Hun Kim <[email protected]>
---
Changes since v1:
- Return with -ENOMEM directly, instead of goto error: then return.

drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/drivers/staging/media/davinci_vpfe/dm365_ipipe.c b/drivers/staging/media/davinci_vpfe/dm365_ipipe.c
index 6a3434c..ffcd86d 100644
--- a/drivers/staging/media/davinci_vpfe/dm365_ipipe.c
+++ b/drivers/staging/media/davinci_vpfe/dm365_ipipe.c
@@ -1280,6 +1280,9 @@ static int ipipe_s_config(struct v4l2_subdev *sd, struct vpfe_ipipe_config *cfg)

params = kmalloc(sizeof(struct ipipe_module_params),
GFP_KERNEL);
+ if (!params)
+ return -ENOMEM;
+
to = (void *)params + module_if->param_offset;
size = module_if->param_size;

@@ -1323,6 +1326,9 @@ static int ipipe_g_config(struct v4l2_subdev *sd, struct vpfe_ipipe_config *cfg)

params = kmalloc(sizeof(struct ipipe_module_params),
GFP_KERNEL);
+ if (!params)
+ return -ENOMEM;
+
from = (void *)params + module_if->param_offset;
size = module_if->param_size;

--
1.9.1