From nobody Tue Dec 2 03:02:23 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 24A472C237C; Mon, 17 Nov 2025 16:13:25 +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=1763396005; cv=none; b=mRWXyCBND+gqkTs5FuPaCy0y37ro3c8ZaH+sZxq+K4liXsIYTwhkPPyzGBNBCAnyoeWoz1Zbk6HMC/oQjxnrT6tWY4oJwXeLDR23hyYbExTWBfVpZfmkDBDJE1w4MLtnRAGE3OP25o9MLUG0C/rqC2Um9/9BUimqXuEJOH05rZw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763396005; c=relaxed/simple; bh=+gtV5rGLMOFmbBmErF+iAc9MrKb8OqQyobykzk6xYrA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WzFsBjGkWBjDI7QTmELi/3giME20jjyJZRRILCtwt6y5F2tqDUEnRlOp3VTz8wy3FulDfbkY0OwylEuyq/DMCmyLBCQfbVQJQwgBdnAAkPiwAfeqkui/FePHounlv6MKp7ryfR91uZ5C4HMpyO+smjads9dzKLHN6E2wC53XHrg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RtWPys9u; 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="RtWPys9u" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F052CC2BCB6; Mon, 17 Nov 2025 16:13:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763396005; bh=+gtV5rGLMOFmbBmErF+iAc9MrKb8OqQyobykzk6xYrA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RtWPys9u5/RHjAa0zDWNmAErSem3vWH2P2aGvlP1X3AaddCUPcbWVS1lGZr3qfj9X Trrj0Vd5Cj0YOieXIBj5SJTkLObFlOflcF16wp9Yixszgydx86RfAYfhEQf0zUfB7R hSxxI3Gzbvusoucfw/VeFE7x/qSuw+AuAsWAyW96kOlq/UzCDbYG9Yv7+qwvSURBFV bX6PKhyiEjCNadMqH4Om8Lz61ME0XIQAX+hOuYqtVi1riP2HJmPB+NYbEZlMnfWcK3 OOIhFJL+80MhuM6+3+oXAYhpxm66oWen6g2YEtZya9377PJl9ZFLnzHggbruCqS9In 6A+JzeVw5Vofg== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1vL1r1-000000002o0-08t5; Mon, 17 Nov 2025 17:13:23 +0100 From: Johan Hovold To: Vinod Koul Cc: Ludovic Desroches , Viresh Kumar , Andy Shevchenko , Vinicius Costa Gomes , Dave Jiang , Vladimir Zapolskiy , Piotr Wojtaszczyk , =?UTF-8?q?Am=C3=A9lie=20Delaunay?= , Maxime Coquelin , Alexandre Torgue , Peter Ujfalusi , dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org, Fabrizio Castro Subject: [PATCH 08/15] dmaengine: sh: rz-dmac: fix device leak on probe failure Date: Mon, 17 Nov 2025 17:12:51 +0100 Message-ID: <20251117161258.10679-10-johan@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251117161258.10679-1-johan@kernel.org> References: <20251117161258.10679-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 when looking up the ICU device during probe also on probe failures (e.g. probe deferral). Fixes: 7de873201c44 ("dmaengine: sh: rz-dmac: Add RZ/V2H(P) support") Cc: stable@vger.kernel.org # 6.16 Cc: Fabrizio Castro Signed-off-by: Johan Hovold --- drivers/dma/sh/rz-dmac.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/dma/sh/rz-dmac.c b/drivers/dma/sh/rz-dmac.c index 1f687b08d6b8..38137e8d80b9 100644 --- a/drivers/dma/sh/rz-dmac.c +++ b/drivers/dma/sh/rz-dmac.c @@ -854,6 +854,13 @@ static int rz_dmac_chan_probe(struct rz_dmac *dmac, return 0; } =20 +static void rz_dmac_put_device(void *_dev) +{ + struct device *dev =3D _dev; + + put_device(dev); +} + static int rz_dmac_parse_of_icu(struct device *dev, struct rz_dmac *dmac) { struct device_node *np =3D dev->of_node; @@ -876,6 +883,10 @@ static int rz_dmac_parse_of_icu(struct device *dev, st= ruct rz_dmac *dmac) return -ENODEV; } =20 + ret =3D devm_add_action_or_reset(dev, rz_dmac_put_device, &dmac->icu.pdev= ->dev); + if (ret) + return ret; + dmac_index =3D args.args[0]; if (dmac_index > RZV2H_MAX_DMAC_INDEX) { dev_err(dev, "DMAC index %u invalid.\n", dmac_index); @@ -1055,8 +1066,6 @@ static void rz_dmac_remove(struct platform_device *pd= ev) reset_control_assert(dmac->rstc); pm_runtime_put(&pdev->dev); pm_runtime_disable(&pdev->dev); - - platform_device_put(dmac->icu.pdev); } =20 static const struct of_device_id of_rz_dmac_match[] =3D { --=20 2.51.0