Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e443e547 authored by Biju Das's avatar Biju Das Committed by Greg Kroah-Hartman
Browse files

drm: rcar-du: Fix memory leak in rcar_du_vsps_init() 



[ Upstream commit 91e3bf09a90bb4340c0c3c51396e7531555efda4 ]

The rcar_du_vsps_init() doesn't free the np allocated by
of_parse_phandle_with_fixed_args() for the non-error case.

Fix memory leak for the non-error case.

While at it, replace the label 'error'->'done' as it applies to non-error
case as well and update the error check condition for rcar_du_vsp_init()
to avoid breakage in future, if it returns positive value.

Fixes: 3e81374e ("drm: rcar-du: Support multiple sources from the same VSP")
Signed-off-by: default avatarBiju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Link: https://lore.kernel.org/r/20231116122424.80136-1-biju.das.jz@bp.renesas.com


Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 593f0060

drivers/gpu/drm/rcar-du/rcar_du_kms.c

+4 −6
Original line number Diff line number Diff line
@@ -567,7 +567,7 @@ static int rcar_du_vsps_init(struct rcar_du_device *rcdu) 
		ret = of_parse_phandle_with_fixed_args(np, "vsps", cells, i,

						       &args);

		if (ret < 0)

			goto error;

			goto done;



		/*

		 * Add the VSP to the list or update the corresponding existing
@@ -601,13 +601,11 @@ static int rcar_du_vsps_init(struct rcar_du_device *rcdu) 
		vsp->dev = rcdu;



		ret = rcar_du_vsp_init(vsp, vsps[i].np, vsps[i].crtcs_mask);

		if (ret < 0)

			goto error;

		if (ret)

			goto done;

	}



	return 0;



error:

done:

	for (i = 0; i < ARRAY_SIZE(vsps); ++i)

		of_node_put(vsps[i].np);