Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <b18c05d52b11c883371ad4a7f18ddc26bad244b8.camel@posteo.de>
Subject: Re: [PATCH v2] media: hi846: Fix memleak in hi846_init_controls()
From:   Martin Kepplinger <martink@posteo.de>
To:     Wei Chen <harperchen1110@gmail.com>
Cc:     mchehab@kernel.org, linux-media@vger.kernel.org,
        linux-kernel@vger.kernel.org
Date:   Sun, 26 Mar 2023 10:22:34 +0000
In-Reply-To: <20230326092712.139791-1-harperchen1110@gmail.com>
References: <20230326092712.139791-1-harperchen1110@gmail.com>
Content-Type: text/plain; charset="UTF-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Am Sonntag, dem 26.03.2023 um 09:27 +0000 schrieb Wei Chen:
> hi846_init_controls doesn't clean the allocated ctrl_hdlr
> in case there is a failure, which causes memleak. Add
> v4l2_ctrl_handler_free to free the resource properly.
> 
> Signed-off-by: Wei Chen <harperchen1110@gmail.com>


Reviewed-by: Martin Kepplinger <martin.kepplinger@puri.sm>

thanks,

                        martin

> ---
> Changes in v2:
>  - move v4l2_ctrl_handler_free to error tag
>  - handle memleak in other failure positions
> 
>  drivers/media/i2c/hi846.c | 11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/media/i2c/hi846.c b/drivers/media/i2c/hi846.c
> index 7c61873b7198..f86997a261f5 100644
> --- a/drivers/media/i2c/hi846.c
> +++ b/drivers/media/i2c/hi846.c
> @@ -1472,21 +1472,26 @@ static int hi846_init_controls(struct hi846
> *hi846)
>         if (ctrl_hdlr->error) {
>                 dev_err(&client->dev, "v4l ctrl handler error: %d\n",
>                         ctrl_hdlr->error);
> -               return ctrl_hdlr->error;
> +               ret = ctrl_hdlr->error;
> +               goto error;
>         }
>  
>         ret = v4l2_fwnode_device_parse(&client->dev, &props);
>         if (ret)
> -               return ret;
> +               goto error;
>  
>         ret = v4l2_ctrl_new_fwnode_properties(ctrl_hdlr,
> &hi846_ctrl_ops,
>                                               &props);
>         if (ret)
> -               return ret;
> +               goto error;
>  
>         hi846->sd.ctrl_handler = ctrl_hdlr;
> 
>         return 0;
> +
> +error:
> +       v4l2_ctrl_handler_free(ctrl_hdlr);
> +       return ret;
>  }
>  
>  static int hi846_set_video_mode(struct hi846 *hi846, int fps)