| Message ID | 20190829200001.17092-2-mathieu.poirier@linaro.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | Candidate from TI 4.19 product kernel | expand |
On Thu, Aug 29, 2019 at 01:59:59PM -0600, Mathieu Poirier wrote: >From: Tomi Valkeinen <tomi.valkeinen@ti.com> > >commit c08f99c39083ab55a9c93b3e93cef48711294dad upstream > >We don't free the edid blob allocated by the call to drm_get_edid(), >causing a memleak. Fix this by calling kfree(edid) at the end of the >get_modes(). > >Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> >Signed-off-by: Andrzej Hajda <a.hajda@samsung.com> >Link: https://patchwork.freedesktop.org/patch/msgid/20190610135739.6077-1-tomi.valkeinen@ti.com >Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> I've queued this one for 4.14-5.2, thanks! -- Thanks, Sasha
diff --git a/drivers/gpu/drm/bridge/ti-tfp410.c b/drivers/gpu/drm/bridge/ti-tfp410.c index c3e32138c6bb..9dc109df0808 100644 --- a/drivers/gpu/drm/bridge/ti-tfp410.c +++ b/drivers/gpu/drm/bridge/ti-tfp410.c @@ -64,7 +64,12 @@ static int tfp410_get_modes(struct drm_connector *connector) drm_connector_update_edid_property(connector, edid); - return drm_add_edid_modes(connector, edid); + ret = drm_add_edid_modes(connector, edid); + + kfree(edid); + + return ret; + fallback: /* No EDID, fallback on the XGA standard modes */ ret = drm_add_modes_noedid(connector, 1920, 1200);