Commit eacf9840 authored by Weigang He's avatar Weigang He Committed by Helge Deller
Browse files

fbdev: of: display_timing: fix refcount leak in of_get_display_timings() 



of_parse_phandle() returns a device_node with refcount incremented,
which is stored in 'entry' and then copied to 'native_mode'. When the
error paths at lines 184 or 192 jump to 'entryfail', native_mode's
refcount is not decremented, causing a refcount leak.

Fix this by changing the goto target from 'entryfail' to 'timingfail',
which properly calls of_node_put(native_mode) before cleanup.

Fixes: cc3f414c ("video: add of helper for display timings/videomode")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarWeigang He <geoffreyhe2@gmail.com>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent 88b3b992

drivers/video/of_display_timing.c

+2 −2
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ struct display_timings *of_get_display_timings(const struct device_node *np) 
	if (disp->num_timings == 0) {

		/* should never happen, as entry was already found above */

		pr_err("%pOF: no timings specified\n", np);

		goto entryfail;

		goto timingfail;

	}



	disp->timings = kcalloc(disp->num_timings,
@@ -189,7 +189,7 @@ struct display_timings *of_get_display_timings(const struct device_node *np) 
				GFP_KERNEL);

	if (!disp->timings) {

		pr_err("%pOF: could not allocate timings array\n", np);

		goto entryfail;

		goto timingfail;

	}



	disp->num_timings = 0;