From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2B62E219E0; Mon, 23 Jun 2025 13:24:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750685075; cv=none; b=FFulWrwE4WOsvhipwHLR+POCoLwdOK2SJPc5yfiHbIAO0qg6RWe+kwIQpm3i7Sna5vQQi4M4KF4ZZ21gPGkHdAljW2G/6BZT1o6hU65A6wG9DVc9zLf4JDS9InQlAqUet2hbOSmkMIJB4onVX6AFoxt7jhhN+Q4u7yXy4Nkf180= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750685075; c=relaxed/simple; bh=bgZk599NM8mOHFNcsjhxxq3iv4z1ukPoqxUKM4QX6XU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aOCWdsSkX9AGmzzfHfLfJNxGjBlzi01u50s4M0wVa3NCGlo2ZPMuueCuCZN4TSF1aVN4RotDIJQZUWUl0o1eTwG5UvifJPyAWZB01ARJjpyNt2otmnzmgdbrC3QaZXxVzswi8jDNTo9Cedvv/4/OfaeLffYco9k7hjNN2XlMQhw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=aCAOhGCn; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="aCAOhGCn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B2600C4CEF0; Mon, 23 Jun 2025 13:24:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750685075; bh=bgZk599NM8mOHFNcsjhxxq3iv4z1ukPoqxUKM4QX6XU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aCAOhGCnbr1rKtie/s8vikwXBYRiY/TiO5edJvTBJGpD21OB8IjNVqDPVPHxNwxO6 Ontve/E1bGRiCgj+7N4yGJjdgd6da8IhSG20A19WrhTq6pNIwfaQeiKJ7MjfImE/CS 9tpV6J9qm/266rdEytA5ovBCS42fIuWbNo03MAxE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Biju Das , Laurent Pinchart , Tomi Valkeinen , Sasha Levin Subject: [PATCH 5.15 033/411] drm: rcar-du: Fix memory leak in rcar_du_vsps_init() Date: Mon, 23 Jun 2025 15:02:57 +0200 Message-ID: <20250623130633.999991847@linuxfoundation.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250623130632.993849527@linuxfoundation.org> References: <20250623130632.993849527@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Biju Das [ 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: 3e81374e2014 ("drm: rcar-du: Support multiple sources from the same VSP") Signed-off-by: Biju Das Reviewed-by: Laurent Pinchart Link: https://lore.kernel.org/r/20231116122424.80136-1-biju.das.jz@bp.renesas.com Signed-off-by: Tomi Valkeinen Signed-off-by: Sasha Levin --- drivers/gpu/drm/rcar-du/rcar_du_kms.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c index fdb8a0d127ad3..11dc0f44d2bd8 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c @@ -627,7 +627,7 @@ static int rcar_du_vsps_init(struct rcar_du_device *rcdu) ret = of_parse_phandle_with_fixed_args(np, vsps_prop_name, cells, i, &args); if (ret < 0) - goto error; + goto done; /* * Add the VSP to the list or update the corresponding existing @@ -665,13 +665,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); -- 2.39.5