video: Fix possible leak in of_get_videomode()

PATCH Tomi Valkeinen 1 participant 1 message Aug 10, 2015 Framebuffer layer

Share & tools

Tomi Valkeinen

author

2015-08-10 09:53 UTC #0 lore raw

Quoted 20 lines · Christian Engelmayer

In case videomode_from_timings() fails in function of_get_videomode(), the allocated display timing data is not freed in the exit path. Make sure that display_timings_release() is called in any case. Detected by Coverity CID 1309681.
Signed-off-by Christian Engelmayer <[email protected]>
---
Compile tested only. Applies against linux-next.
---
 drivers/video/of_videomode.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/video/of_videomode.c +0 -0
index 111c2d1911d3..3495b48c6805 100644
@@ -44,11 +44,7 @@ int of_get_videomode(struct device_node *np, struct videomode *vm,
 		index = disp->native_mode;
 

drivers/video/of_videomode.c int of_get_videomode(struct device_node *np, struct videomode *vm, · line 50

Quoted 10 lines

drivers/video/of_videomode.c +1 -5

 	ret = videomode_from_timings(disp, vm, index);
-	if (ret)
-		return ret;
-
 	display_timings_release(disp);
-
-	return 0;
+	return ret;
 }
 EXPORT_SYMBOL_GPL(of_get_videomode);

Thanks, queued for 4.2.

Tomi