[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20170219103412.10092-1-christophe.jaillet@wanadoo.fr>
Date: Sun, 19 Feb 2017 11:34:12 +0100
From: Christophe JAILLET <christophe.jaillet@...adoo.fr>
To: mchehab@...nel.org, gregkh@...uxfoundation.org,
f.fainelli@...il.com, rjui@...adcom.com, sbranden@...adcom.com,
bcm-kernel-feedback-list@...adcom.com, swarren@...dotorg.org,
lee@...nel.org, eric@...olt.net, arnd@...db.de
Cc: linux-media@...r.kernel.org, devel@...verdev.osuosl.org,
linux-rpi-kernel@...ts.infradead.org,
linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
kernel-janitors@...r.kernel.org,
Christophe JAILLET <christophe.jaillet@...adoo.fr>
Subject: [PATCH] staging: bcm2835: Fix a memory leak in error handling path
If 'kzalloc()' fails, we should release resources allocated so far, just as
done in all other cases in this function.
Signed-off-by: Christophe JAILLET <christophe.jaillet@...adoo.fr>
---
Not sure that the error handling path is correct.
Is 'gdev[0]' freed? Should it be?
---
drivers/staging/media/platform/bcm2835/bcm2835-camera.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/media/platform/bcm2835/bcm2835-camera.c b/drivers/staging/media/platform/bcm2835/bcm2835-camera.c
index ca15a698e018..9651b9bc3439 100644
--- a/drivers/staging/media/platform/bcm2835/bcm2835-camera.c
+++ b/drivers/staging/media/platform/bcm2835/bcm2835-camera.c
@@ -1914,8 +1914,10 @@ static int __init bm2835_mmal_init(void)
for (camera = 0; camera < num_cameras; camera++) {
dev = kzalloc(sizeof(struct bm2835_mmal_dev), GFP_KERNEL);
- if (!dev)
- return -ENOMEM;
+ if (!dev) {
+ ret = -ENOMEM;
+ goto free_dev;
+ }
dev->camera_num = camera;
dev->max_width = resolutions[camera][0];
--
2.9.3
Powered by blists - more mailing lists