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: <823a21b40a6ba6ccd022594c6bf1efaeb7a5a65d.camel@posteo.de>
Subject: Re: [PATCH] media: i2c: hi846: Fix memory leak in hi846_parse_dt()
From:   Martin Kepplinger <martink@posteo.de>
To:     Rafael Mendonca <rafaelmendsr@gmail.com>,
        Mauro Carvalho Chehab <mchehab@kernel.org>,
        Sakari Ailus <sakari.ailus@linux.intel.com>,
        Pavel Machek <pavel@ucw.cz>
Cc:     Mauro Carvalho Chehab <mchehab+huawei@kernel.org>,
        linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
Date:   Tue, 20 Sep 2022 09:28:28 +0000
In-Reply-To: <20220919021252.730729-1-rafaelmendsr@gmail.com>
References: <20220919021252.730729-1-rafaelmendsr@gmail.com>
Content-Type: text/plain; charset="UTF-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Am Sonntag, dem 18.09.2022 um 23:12 -0300 schrieb Rafael Mendonca:
> If any of the checks related to the supported link frequencies fail,
> then
> the V4L2 fwnode resources don't get released before returning, which
> leads
> to a memleak. Fix this by properly freeing the V4L2 fwnode data in a
> designated label.
> 
> Fixes: e8c0882685f9 ("media: i2c: add driver for the SK Hynix Hi-846
> 8M pixel camera")
> Signed-off-by: Rafael Mendonca <rafaelmendsr@gmail.com>
> ---
>  drivers/media/i2c/hi846.c | 14 ++++++++++----
>  1 file changed, 10 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/media/i2c/hi846.c b/drivers/media/i2c/hi846.c
> index ad35c3ff3611..254031503c72 100644
> --- a/drivers/media/i2c/hi846.c
> +++ b/drivers/media/i2c/hi846.c
> @@ -2008,22 +2008,24 @@ static int hi846_parse_dt(struct hi846
> *hi846, struct device *dev)
>             bus_cfg.bus.mipi_csi2.num_data_lanes != 4) {
>                 dev_err(dev, "number of CSI2 data lanes %d is not
> supported",
>                         bus_cfg.bus.mipi_csi2.num_data_lanes);
> -               v4l2_fwnode_endpoint_free(&bus_cfg);
> -               return -EINVAL;
> +               ret = -EINVAL;
> +               goto check_hwcfg_error;
>         }
>  
>         hi846->nr_lanes = bus_cfg.bus.mipi_csi2.num_data_lanes;
>  
>         if (!bus_cfg.nr_of_link_frequencies) {
>                 dev_err(dev, "link-frequency property not found in
> DT\n");
> -               return -EINVAL;
> +               ret = -EINVAL;
> +               goto check_hwcfg_error;
>         }
>  
>         /* Check that link frequences for all the modes are in device
> tree */
>         fq = hi846_check_link_freqs(hi846, &bus_cfg);
>         if (fq) {
>                 dev_err(dev, "Link frequency of %lld is not
> supported\n", fq);
> -               return -EINVAL;
> +               ret = -EINVAL;
> +               goto check_hwcfg_error;
>         }
>  
>         v4l2_fwnode_endpoint_free(&bus_cfg);
> @@ -2044,6 +2046,10 @@ static int hi846_parse_dt(struct hi846 *hi846,
> struct device *dev)
>         }
>  
>         return 0;
> +
> +check_hwcfg_error:
> +       v4l2_fwnode_endpoint_free(&bus_cfg);
> +       return ret;
>  }
>  
>  static int hi846_probe(struct i2c_client *client)

thank you very much for the patch. lgtm,

Reviewed-by: Martin Kepplinger <martink@posteo.de>

                  martin