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


Groups > linux.kernel > #1587562

Re: [PATCH] staging: bcm2835: Fix a memory leak in error handling path

From Stefan Wahren <stefan.wahren@i2se.com>
Newsgroups linux.kernel
Subject Re: [PATCH] staging: bcm2835: Fix a memory leak in error handling path
Date 2017-02-24 13:40 +0100
Message-ID <tenkd-7b-1@gated-at.bofh.it> (permalink)
References <tcx4m-6fm-5@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


Hi Christophe,

Am 19.02.2017 um 11:34 schrieb Christophe JAILLET:
> 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@wanadoo.fr>
> ---
> Not sure that the error handling path is correct.
> Is 'gdev[0]' freed? Should it be?

sorry, didn't checked your patch yet. Currently there are 3 bcm2835 
drivers in staging (vchiq, camera, audio). So please resend with a more 
distinct subject.

Thanks
Stefan

> ---
>   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];

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


Thread

[PATCH] staging: bcm2835: Fix a memory leak in error handling path Christophe JAILLET <christophe.jaillet@wanadoo.fr> - 2017-02-19 11:40 +0100
  Re: [PATCH] staging: bcm2835: Fix a memory leak in error handling  path Stefan Wahren <stefan.wahren@i2se.com> - 2017-02-24 13:40 +0100
    Re: [PATCH] staging: bcm2835: Fix a memory leak in error handling  path Dan Carpenter <dan.carpenter@oracle.com> - 2017-02-24 21:00 +0100
      Re: [PATCH] staging: bcm2835: Fix a memory leak in error handling  path Stefan Wahren <stefan.wahren@i2se.com> - 2017-02-24 22:50 +0100
        Re: [PATCH] staging: bcm2835: Fix a memory leak in error handling  path Dan Carpenter <dan.carpenter@oracle.com> - 2017-02-25 05:20 +0100

csiph-web