summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2019-06-10 16:57:38 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-09-06 10:20:47 +0200
commitd262e6a81729dcf6f6100bb6b5ae87b19050d5d4 (patch)
treef83f265e055f98a5af522f674e6aeb375ab1290a /drivers
parent3c48e5715813f851207f496a014ebf7a41673386 (diff)
downloadlinux-stable-d262e6a81729dcf6f6100bb6b5ae87b19050d5d4.tar.gz
linux-stable-d262e6a81729dcf6f6100bb6b5ae87b19050d5d4.tar.bz2
linux-stable-d262e6a81729dcf6f6100bb6b5ae87b19050d5d4.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.c7
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 acb857030951..1bb01905be8e 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_mode_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);