]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/imx: parallel-display: fix edid memory leak
authorMarco Felsch <m.felsch@pengutronix.de>
Thu, 21 Nov 2019 09:46:17 +0000 (10:46 +0100)
committerPhilipp Zabel <p.zabel@pengutronix.de>
Tue, 27 Oct 2020 09:20:36 +0000 (10:20 +0100)
The edid memory is only freed if the component.unbind() is called. This
is okay if the parallel-display was bound but if the bind() fails we
leak the memory.

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
[p.zabel@pengutronix.de: rebased, dropped now empty unbind()]
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
drivers/gpu/drm/imx/parallel-display.c

index 8232f512b9ed8ec84af4760817a1d4d399b0922c..ecf49f2ce268b501271df903b26c8a6f90669190 100644 (file)
@@ -325,7 +325,8 @@ static int imx_pd_bind(struct device *dev, struct device *master, void *data)
 
        edidp = of_get_property(np, "edid", &imxpd->edid_len);
        if (edidp)
-               imxpd->edid = kmemdup(edidp, imxpd->edid_len, GFP_KERNEL);
+               imxpd->edid = devm_kmemdup(dev, edidp, imxpd->edid_len,
+                                          GFP_KERNEL);
 
        ret = of_property_read_string(np, "interface-pix-fmt", &fmt);
        if (!ret) {
@@ -349,17 +350,8 @@ static int imx_pd_bind(struct device *dev, struct device *master, void *data)
        return 0;
 }
 
-static void imx_pd_unbind(struct device *dev, struct device *master,
-       void *data)
-{
-       struct imx_parallel_display *imxpd = dev_get_drvdata(dev);
-
-       kfree(imxpd->edid);
-}
-
 static const struct component_ops imx_pd_ops = {
        .bind   = imx_pd_bind,
-       .unbind = imx_pd_unbind,
 };
 
 static int imx_pd_probe(struct platform_device *pdev)