[PATCH v3 2/2] staging: media: davinci_vpfe: add kfree() on goto err statement

[Ji-Hun Kim]

It needs to free of allocated params value in the goto error statement.

Signed-off-by: Ji-Hun Kim <ji_hun....@samsung.com>
---
Changes since v2:
  - add kfree(params) on the error case of the function
  - rename unclear goto statement name
  - declare the params value at start of the function, so it can be free
    end of the function

 drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/media/davinci_vpfe/dm365_ipipe.c 
b/drivers/staging/media/davinci_vpfe/dm365_ipipe.c
index ffcd86d..735d8b5 100644
--- a/drivers/staging/media/davinci_vpfe/dm365_ipipe.c
+++ b/drivers/staging/media/davinci_vpfe/dm365_ipipe.c
@@ -1263,6 +1263,7 @@ static int ipipe_get_cgs_params(struct vpfe_ipipe_device 
*ipipe, void *param)
 static int ipipe_s_config(struct v4l2_subdev *sd, struct vpfe_ipipe_config 
*cfg)
 {
        struct vpfe_ipipe_device *ipipe = v4l2_get_subdevdata(sd);
+       struct ipipe_module_params *params;
        unsigned int i;
        int rval = 0;
 
@@ -1272,7 +1273,6 @@ static int ipipe_s_config(struct v4l2_subdev *sd, struct 
vpfe_ipipe_config *cfg)
                if (cfg->flag & bit) {
                        const struct ipipe_module_if *module_if =
                                                &ipipe_modules[i];
-                       struct ipipe_module_params *params;
                        void __user *from = *(void * __user *)
                                ((void *)cfg + module_if->config_offset);
                        size_t size;
@@ -1289,26 +1289,30 @@ static int ipipe_s_config(struct v4l2_subdev *sd, 
struct vpfe_ipipe_config *cfg)
                        if (to && from && size) {
                                if (copy_from_user(to, from, size)) {
                                        rval = -EFAULT;
-                                       break;
+                                       goto err_free_params;
                                }
                                rval = module_if->set(ipipe, to);
                                if (rval)
-                                       goto error;
+                                       goto err_free_params;
                        } else if (to && !from && size) {
                                rval = module_if->set(ipipe, NULL);
                                if (rval)
-                                       goto error;
+                                       goto err_free_params;
                        }
                        kfree(params);
                }
        }
-error:
+       return 0;
+
+err_free_params:
+       kfree(params);
        return rval;
 }
 
 static int ipipe_g_config(struct v4l2_subdev *sd, struct vpfe_ipipe_config 
*cfg)
 {
        struct vpfe_ipipe_device *ipipe = v4l2_get_subdevdata(sd);
+       struct ipipe_module_params *params;
        unsigned int i;
        int rval = 0;
 
@@ -1318,7 +1322,6 @@ static int ipipe_g_config(struct v4l2_subdev *sd, struct 
vpfe_ipipe_config *cfg)
                if (cfg->flag & bit) {
                        const struct ipipe_module_if *module_if =
                                                &ipipe_modules[i];
-                       struct ipipe_module_params *params;
                        void __user *to = *(void * __user *)
                                ((void *)cfg + module_if->config_offset);
                        size_t size;
@@ -1335,16 +1338,19 @@ static int ipipe_g_config(struct v4l2_subdev *sd, 
struct vpfe_ipipe_config *cfg)
                        if (to && from && size) {
                                rval = module_if->get(ipipe, from);
                                if (rval)
-                                       goto error;
+                                       goto err_free_params;
                                if (copy_to_user(to, from, size)) {
                                        rval = -EFAULT;
-                                       break;
+                                       goto err_free_params;
                                }
                        }
                        kfree(params);
                }
        }
-error:
+       return 0;
+
+err_free_params:
+       kfree(params);
        return rval;
 }
 
-- 
1.9.1

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel