From nobody Wed Oct 1 23:27:51 2025 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 54E511D432D; Fri, 26 Sep 2025 14:25:09 +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=1758896709; cv=none; b=ftPIqoQGTvC27KNssXQ16wkX5AzGuocuSGyIt7viPVoNpyOwfAWcYw46I88op+v+tAMUQXL51xcncasyhVWHWKRnDAvUs82f7Y9ulncK09qpDcRkbIqn6nARhJRc8G/PZXlh+akMdrZ7bmnWynC0jwedGApMfmm9V/zZdrFf24g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758896709; c=relaxed/simple; bh=Jg3dS60+quRoQDa5nDEodavgLyUoChDVPfThy50rlf4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LjoxSlE0FaU3Yvt4nyf1ddhftKvBp/vlXegPXNsCciM5Rr6j3h97drLfY45UicHqYQ4v8FFTngH6J9VniiXuAZWlJE6Dg3aX5PROFV9rXv9nmvFc5NE/rG9gk4LKyM/esDpfsBUA5CQvXArh7ycxyE0gxxLfImoXrNxvUuH0aVU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=g3lvwbrM; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="g3lvwbrM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DDD4BC4CEF4; Fri, 26 Sep 2025 14:25:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1758896708; bh=Jg3dS60+quRoQDa5nDEodavgLyUoChDVPfThy50rlf4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g3lvwbrMJ3oqd+tzV9CIHLFzuRYRPNfZrMGQQZuuyOLTTjkGaaRMUO0/VinFPwDV3 Tkccr/Da7WwKdou9PWDgnLGo/EVQ6RuDFLnyP6Lsisuih6DNVX5WuUmvcHSWoeSNJV eDmdGuFAQ/TPKOjG8tWnTRioovZOEbZrDCqvUvNYhdZPOiqQF9uzo0yzheAoJD5kwz meR8lMAaspw92/4TIixyBtBUhVNuG3NK+ebJtxDwW6iynFHoCm9eFbcRrQFqddvy49 U5e40iwk3eGeuE9Fpq4iPu9PRi5a9DojLVzeCgpC4cXDOYpI3plPbVj+lMthZUBxtg z8fnCl4WEYsUQ== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1v29Ne-000000001Y4-289q; Fri, 26 Sep 2025 16:25:02 +0200 From: Johan Hovold To: Neil Armstrong , Kevin Hilman Cc: Jerome Brunet , Martin Blumenstingl , linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org, Yu Kuai Subject: [PATCH 1/2] soc: amlogic: canvas: fix device leak on lookup Date: Fri, 26 Sep 2025 16:24:53 +0200 Message-ID: <20250926142454.5929-2-johan@kernel.org> X-Mailer: git-send-email 2.49.1 In-Reply-To: <20250926142454.5929-1-johan@kernel.org> References: <20250926142454.5929-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make sure to drop the reference taken to the canvas platform device when looking up its driver data. Note that holding a reference to a device does not prevent its driver data from going away so there is no point in keeping the reference. Also note that commit 28f851e6afa8 ("soc: amlogic: canvas: add missing put_device() call in meson_canvas_get()") fixed the leak in a lookup error path, but the reference is still leaking on success. Fixes: d4983983d987 ("soc: amlogic: add meson-canvas driver") Cc: stable@vger.kernel.org # 4.20: 28f851e6afa8 Cc: Yu Kuai Signed-off-by: Johan Hovold --- drivers/soc/amlogic/meson-canvas.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/soc/amlogic/meson-canvas.c b/drivers/soc/amlogic/meson= -canvas.c index b6e06c4d2117..0711088da5dc 100644 --- a/drivers/soc/amlogic/meson-canvas.c +++ b/drivers/soc/amlogic/meson-canvas.c @@ -73,10 +73,9 @@ struct meson_canvas *meson_canvas_get(struct device *dev) * current state, this driver probe cannot return -EPROBE_DEFER */ canvas =3D dev_get_drvdata(&canvas_pdev->dev); - if (!canvas) { - put_device(&canvas_pdev->dev); + put_device(&canvas_pdev->dev); + if (!canvas) return ERR_PTR(-EINVAL); - } =20 return canvas; } --=20 2.49.1 From nobody Wed Oct 1 23:27:51 2025 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 54EA81D5154 for ; Fri, 26 Sep 2025 14:25:09 +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=1758896709; cv=none; b=hpQHNEBauZG4yWl/mkzUxnmoo6zyNVwYhJmWe2VTAd40ovwW49t0pSxHKOfwik1izLDFJUbA3ZtT2rA08JkZpMGKsNKbwX//1pGApyAaIC0pSVVodAsivM8+Rum1Kzzy/5sd7NUb51A/ZQSbv0ZJCtN80du6DW2eMxllgh0q0SE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758896709; c=relaxed/simple; bh=0Py0gus+4Kw9xvuUld0HHLpuUDZX3KtoevhAxkUictk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=upql1yJXTKAr6n79CieC65jNv3bo8Ar3u/xt3J8/mUpUVQh3CYJfJ0LsQCFInYg4pbCYjFdH8tnbdKdqjF8JG1I35rF9c9zGsN3gHEI5LdmCPR+JpXLuuc3ki/XmQ6o65XkPNO9n8dwcW4RV46dgu90HVIASbdys9TmwgusJFzQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=e1iKz9jq; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="e1iKz9jq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 13485C113D0; Fri, 26 Sep 2025 14:25:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1758896709; bh=0Py0gus+4Kw9xvuUld0HHLpuUDZX3KtoevhAxkUictk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e1iKz9jq18I9U4b5c4xlfsB04frWUGHM31yqSfASTu16U9A4mndpu425DdOvaP709 +p9LCXNftxuQsIJYbMHZoQzVeLzYPiXWObPDp/os9GYAXiSXWRslh9psOvb55G1X5n ryeO+/Cv2J1/fjFXLgOPb1JEXcRWo+K2umVzjzajPHDN1CiOncAY/I/ROTUcmz7bJ8 4Y2fQjwYFDlcRDWg3rd3t77kjc7uoqye2uhGcAyjnHHAgoB9ZXXiFnPAsijSLKOFgi 7p1xol7gyPVX28vkVMnlY080MLC2ZPmJrMw6bfpkZxYetfMBVC59w/RHJLNc96HWzx lwIMhZOTkECdA== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1v29Ne-000000001Y6-2Y1j; Fri, 26 Sep 2025 16:25:02 +0200 From: Johan Hovold To: Neil Armstrong , Kevin Hilman Cc: Jerome Brunet , Martin Blumenstingl , linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH 2/2] soc: amlogic: canvas: simplify lookup error handling Date: Fri, 26 Sep 2025 16:24:54 +0200 Message-ID: <20250926142454.5929-3-johan@kernel.org> X-Mailer: git-send-email 2.49.1 In-Reply-To: <20250926142454.5929-1-johan@kernel.org> References: <20250926142454.5929-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Simplify the canvas lookup error handling by dropping the OF node reference sooner. Signed-off-by: Johan Hovold --- drivers/soc/amlogic/meson-canvas.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/soc/amlogic/meson-canvas.c b/drivers/soc/amlogic/meson= -canvas.c index 0711088da5dc..79681afea8c6 100644 --- a/drivers/soc/amlogic/meson-canvas.c +++ b/drivers/soc/amlogic/meson-canvas.c @@ -60,12 +60,9 @@ struct meson_canvas *meson_canvas_get(struct device *dev) return ERR_PTR(-ENODEV); =20 canvas_pdev =3D of_find_device_by_node(canvas_node); - if (!canvas_pdev) { - of_node_put(canvas_node); - return ERR_PTR(-EPROBE_DEFER); - } - of_node_put(canvas_node); + if (!canvas_pdev) + return ERR_PTR(-EPROBE_DEFER); =20 /* * If priv is NULL, it's probably because the canvas hasn't --=20 2.49.1