diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2019-06-10 16:57:38 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-09-06 10:22:02 +0200 |
| commit | edd40f54736d716ad4e40aa6f18b0a1b79051f70 (patch) | |
| tree | 24e6d8f7a7154f8de1b30f4730c52ba701c0114a /drivers | |
| parent | 2fa7c944e11fc1b1f5cc454f2ea16941b3bacd51 (diff) | |
| download | linux-stable-edd40f54736d716ad4e40aa6f18b0a1b79051f70.tar.gz linux-stable-edd40f54736d716ad4e40aa6f18b0a1b79051f70.tar.bz2 linux-stable-edd40f54736d716ad4e40aa6f18b0a1b79051f70.zip | |
drm/bridge: tfp410: fix memleak in get_modes()
[ Upstream commit c08f99c39083ab55a9c93b3e93cef48711294dad ]
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: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/bridge/ti-tfp410.c | 7 |
1 files changed, 6 insertions, 1 deletions
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); |