Skip to content

Commit 1e3a04c

Browse files
tombagregkh
authored andcommitted
drm/tilcdc: fix leak & null ref in panel_connector_get_modes
[ Upstream commit 3f9c1c8 ] If videomode_from_timings() returns true, the mode allocated with drm_mode_create will be leaked. Also, the return value of drm_mode_create() is never checked, and thus could cause NULL deref. Fix these two issues. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200429104234.18910-1-tomi.valkeinen@ti.com Reviewed-by: Jyri Sarha <jsarha@ti.com> Acked-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent c4579cd commit 1e3a04c

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

drivers/gpu/drm/tilcdc/tilcdc_panel.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,12 +150,16 @@ static int panel_connector_get_modes(struct drm_connector *connector)
150150
int i;
151151

152152
for (i = 0; i < timings->num_timings; i++) {
153-
struct drm_display_mode *mode = drm_mode_create(dev);
153+
struct drm_display_mode *mode;
154154
struct videomode vm;
155155

156156
if (videomode_from_timings(timings, &vm, i))
157157
break;
158158

159+
mode = drm_mode_create(dev);
160+
if (!mode)
161+
break;
162+
159163
drm_display_mode_from_videomode(&vm, mode);
160164

161165
mode->type = DRM_MODE_TYPE_DRIVER;

0 commit comments

Comments
 (0)