Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1659811

[PATCH] Staging: media: davinci_vpfe Fix resource leaks in error paths.

Show all headers | View raw

Free memory, if ipipe_s_config and ipipe_g_config are not successful.

Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
---
 drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/media/davinci_vpfe/dm365_ipipe.c b/drivers/staging/media/davinci_vpfe/dm365_ipipe.c
index 6a3434c..b6994ee 100644
--- a/drivers/staging/media/davinci_vpfe/dm365_ipipe.c
+++ b/drivers/staging/media/davinci_vpfe/dm365_ipipe.c
@@ -1286,15 +1286,20 @@ 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;
+					kfree(params);
 					break;
 				}
 				rval = module_if->set(ipipe, to);
-				if (rval)
+				if (rval) {
+					kfree(params);
 					goto error;
+				}
 			} else if (to && !from && size) {
 				rval = module_if->set(ipipe, NULL);
-				if (rval)
+				if (rval) {
+					kfree(params);
 					goto error;
+				}
 			}
 			kfree(params);
 		}
@@ -1328,10 +1333,13 @@ 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)
+				if (rval) {
+					kfree(params);
 					goto error;
+				}
 				if (copy_to_user(to, from, size)) {
 					rval = -EFAULT;
+					kfree(params);
 					break;
 				}
 			}
-- 
1.9.1

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH] Staging: media: davinci_vpfe Fix resource leaks in error paths. Arvind Yadav <arvind.yadav.cs@gmail.com> - 2017-06-07 15:50 +0200

csiph-web