leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/tegra: dc: Properly cleanup overlay planes

Browse Source 
The first overlay plane can leak if initialization of the second overlay
plane fails. Fix this by properly destroying the first overlay plane on
error.

Suggested-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
This commit is contained in:
Thierry Reding 2018-01-08 16:16:06 +01:00
parent 89f6501825
commit 8f62142e49
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/gpu/drm/tegra/dc.c
View File

@ -937,20 +937,24 @@ static struct drm_plane *tegra_dc_add_shared_planes(struct drm_device *drm,
static struct drm_plane *tegra_dc_add_planes(struct drm_device *drm, static struct drm_plane *tegra_dc_add_planes(struct drm_device *drm,
struct tegra_dc *dc) struct tegra_dc *dc)
{ {
struct drm_plane *plane, *primary; struct drm_plane *planes[2], *primary;
unsigned int i; unsigned int i;
int err;
primary = tegra_primary_plane_create(drm, dc); primary = tegra_primary_plane_create(drm, dc);
if (IS_ERR(primary)) if (IS_ERR(primary))
return primary; return primary;
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
plane = tegra_dc_overlay_plane_create(drm, dc, 1 + i); planes[i] = tegra_dc_overlay_plane_create(drm, dc, 1 + i);
if (IS_ERR(plane)) { if (IS_ERR(planes[i])) {
/* XXX tegra_plane_destroy() */ err = PTR_ERR(planes[i]);
drm_plane_cleanup(primary);
kfree(primary); while (i--)
return plane; tegra_plane_funcs.destroy(planes[i]);
tegra_plane_funcs.destroy(primary);
return ERR_PTR(err);
} }
} }