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 74C61331A45; Mon, 29 Dec 2025 16:33:19 +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=1767025999; cv=none; b=KZPaSGzIpeMJnKaPvAn5+80Jb47GejlLLInrpgj61iL8GOAlC1dprav7q3n//eSxM79nOW5kHGKlouMJElICkdxUYgXxcrTGVyqN+O5p3ah4vCJdaYNldp4lKVVBgYcarQJoMstwBcpf6mhUDo3E19emN4n4NihrIw7hkvqH3I8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767025999; c=relaxed/simple; bh=Ous84k1eBLqhz9kGth7eri3g/35DMNaHRDBpY7dwxqc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=A6PEU3lPyipuEDZMt41NWJDMihuZGquavMfPbUpAB5BPOcwfYTDQe5vynJeOErVqwRhwIqi0T69JEfaQl45nWZ0oBF6UPsm1r+17stgnqKiOSZPRxzU06W+6DncGRhTXmHFGK2FFNf/2Q32aV5jZh+LF52eXlEEa3sJ+oi0eTNc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=R2ah3vte; 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="R2ah3vte" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A95CCC4CEF7; Mon, 29 Dec 2025 16:33:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1767025999; bh=Ous84k1eBLqhz9kGth7eri3g/35DMNaHRDBpY7dwxqc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R2ah3vtepq2hSXcBPvBhdiDCCo+J3miMwrbsSXtESZJDUUj0BzwN9/m6Sw6u1kzcm hBu+4rVkrbO0jG3KtHxsPZjqtcJT7uyNxKfyElfQ/MnAVbcYU71/kNhFThDpKJKNHj ND4eC06JuhUu9di8gkuFMsM/k5mq4UNHv4lN0gXE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yu Kuai , Johan Hovold , Martin Blumenstingl , Neil Armstrong Subject: [PATCH 6.18 410/430] soc: amlogic: canvas: fix device leak on lookup Date: Mon, 29 Dec 2025 17:13:32 +0100 Message-ID: <20251229160739.402707064@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251229160724.139406961@linuxfoundation.org> References: <20251229160724.139406961@linuxfoundation.org> User-Agent: quilt/0.69 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 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Johan Hovold commit 32200f4828de9d7e6db379909898e718747f4e18 upstream. 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 Reviewed-by: Martin Blumenstingl Link: https://patch.msgid.link/20250926142454.5929-2-johan@kernel.org Signed-off-by: Neil Armstrong Signed-off-by: Greg Kroah-Hartman --- drivers/soc/amlogic/meson-canvas.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) --- a/drivers/soc/amlogic/meson-canvas.c +++ b/drivers/soc/amlogic/meson-canvas.c @@ -73,10 +73,9 @@ struct meson_canvas *meson_canvas_get(st * current state, this driver probe cannot return -EPROBE_DEFER */ canvas = dev_get_drvdata(&canvas_pdev->dev); - if (!canvas) { - put_device(&canvas_pdev->dev); + put_device(&canvas_pdev->dev); + if (!canvas) return ERR_PTR(-EINVAL); - } return canvas; }