media: i2c: hi846: Fix memory leak in hi846_parse_dt()
authorRafael Mendonca <rafaelmendsr@gmail.com>
Mon, 19 Sep 2022 02:12:51 +0000 (23:12 -0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 31 Dec 2022 12:32:04 +0000 (13:32 +0100)
[ Upstream commit 80113026d415e27483669db7a88b548d1ec3d3d1 ]

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>
Reviewed-by: Tommaso Merciai <tommaso.merciai@amarulasolutions.com>
Reviewed-by: Martin Kepplinger <martink@posteo.de>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/media/i2c/hi846.c

index c5b6982..7c61873 100644 (file)
@@ -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)