From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794064632; b=xwCLLnXFP4q8L5uJNz/YdwkixDkdNwZ7XYukd4+cgFZ+kyu4jdpkULJaArmP6coNJKGW Cx/uF23q7c1CRjGDwW/TgYy5X35Mw1gxcDLod2e2RI5TYrN9DFNS3qfRWBueqWJXr0pmt ACWSbP/2Ywni426C3439hNxBtYKusQKiOUwmGAIsla52TG8bgPZ+q1cE92EGYpvzwHC7Y qCObbMXmlMWrx1WnCaH4e4lafcVMo6vktECLVAlYeKDOauBa1jzcE36+yOiiQnXLaarDC +TJfJm2RfRC3/LRQg8DnJ+6KmlI7U/FxB/+9vnXoYT4u5E1GM69ymsQvVvs3N/5fohA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794064632; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=JXMPJjDZIc2wtIu0s6ubikG5qks4dgfP59IBR0vwknY=; b=GI8Ij0EalZBs3Z1azyshwiWpkFp8IxJBODX8GI4VpOHhpg/kzdOKAU7SKTEK8at1odzj zJuHWI7dCBAfAj0/qH1TE3jTFZc4rWPYnUre/QRCFWQZiIKJs2c+Iw9EUt7O/B08vooKm RwvgSpejLEfJApBYx6+cv6kYW1lfBwvsywExqPQP8Re9Y9aVCxVoPTNIUKVs26QR5H2+b b5IS7jRreS14p4l3I9xSncOcmGCs0ZYBqtr+oqhHuZAXRbuI9hRDS6crFqNqTR/n67LIw Mz3o+PgX7W/uTP0CiTkcCB5ZxXhHkMCtYHQCcaeV9OTxBatYMJanm/JL0NL0Yfylvtg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=RkkhpgWR; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9480A606A9DF; Sat, 7 Nov 2026 15:17:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=RkkhpgWR Received: by smtp.kernel.org (Postfix) with ESMTPSA id 43ACF1F0089F; Sat, 7 Nov 2026 15:17:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794064632; bh=JXMPJjDZIc2wtIu0s6ubikG5qks4dgfP59IBR0vwknY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=RkkhpgWR0Z0nnZPYTM9InWmBDVf/y98FPjzfnPJkMssrTJl6VIFYSITuVUgXArvrv 5U9nMFhKtvwXndYcEKaMVlcGNk3EYGjiLG7Zgr4xdL07M6xk54SWgYnxuZDj/cWmTC 9SPade7H5J2n9sxJF7rsw6q6QYbz6Csn/pvKWQtA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ma Ke , Takashi Iwai , Sasha Levin Subject: [PATCH 7.3 0640/1257] ALSA: hda: cs35l41: Fix ACPI device reference leak on probe failure Date: Sat, 7 Nov 2026 08:48:56 -0500 Message-ID: <20261107134956.954177000@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261107134939.434104957@linuxfoundation.org> References: <20261107134939.434104957@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 7.3-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ma Ke [ Upstream commit 8d70e364e866bdfca81eee24d0688fac9472cfb9 ] cs35l41_hda_probe() takes an acpi_device through cs35l41_hda_read_acpi() and stores it in cs35l41->dacpi. Only the failures that happen later reach the err: label, which is where that reference and cs35l41->acpi_subsystem_id are released, so the early return taken when cs35l41_hda_read_acpi() fails leaves both behind. Keep the ownership in the caller instead of dropping the reference inside cs35l41_hda_read_acpi(). That removes the need to work out whether a given failure path has already released it, and with it the double put that cs35l41_hda_parse_acpi() would otherwise cause when it fails after having released the device itself. cs35l41_hda_parse_acpi() and the !physdev path no longer put the reference, and the early failure enters the existing err: cleanup tail through a new err_acpi label. The label sits between the reset of the codec and the gpio cleanup, so an early failure also releases the reset and chip-select descriptors that cs35l41_hda_parse_acpi() may already have taken, while still skipping cs35l41_safe_reset() on a codec that was never brought up. cs35l41->dacpi comes from devm_kzalloc() and is only assigned once the ACPI device has been found, so the put is a no-op when the lookup itself failed. Found by code review. Fixes: 447106e92a0c ("ALSA: hda: cs35l41: Support mute notifications for CS35L41 HDA") Cc: stable@vger.kernel.org Signed-off-by: Ma Ke Link: https://patch.msgid.link/20261012084152.3740340-1-make_ruc2021@163.com Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/hda/codecs/side-codecs/cs35l41_hda.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/hda/codecs/side-codecs/cs35l41_hda.c b/sound/hda/codecs/side-codecs/cs35l41_hda.c index 62296be45c55e..d50c3d8f5303c 100644 --- a/sound/hda/codecs/side-codecs/cs35l41_hda.c +++ b/sound/hda/codecs/side-codecs/cs35l41_hda.c @@ -1907,7 +1907,6 @@ int cs35l41_hda_parse_acpi(struct cs35l41_hda *cs35l41, struct device *physdev, hw_cfg->valid = false; hw_cfg->gpio1.valid = false; hw_cfg->gpio2.valid = false; - acpi_dev_put(cs35l41->dacpi); return ret; } @@ -1928,10 +1927,8 @@ static int cs35l41_hda_read_acpi(struct cs35l41_hda *cs35l41, const char *hid, i cs35l41->dacpi = adev; struct device *physdev __free(put_device) = get_device(acpi_get_first_physical_node(adev)); - if (!physdev) { - acpi_dev_put(adev); + if (!physdev) return -ENODEV; - } sub = acpi_get_subsystem_id(ACPI_HANDLE(physdev)); if (IS_ERR(sub)) @@ -1986,8 +1983,10 @@ int cs35l41_hda_probe(struct device *dev, const char *device_name, int id, int i dev_set_drvdata(dev, cs35l41); ret = cs35l41_hda_read_acpi(cs35l41, device_name, id); - if (ret) - return dev_err_probe(cs35l41->dev, ret, "Platform not supported\n"); + if (ret) { + dev_err_probe(cs35l41->dev, ret, "Platform not supported\n"); + goto err_acpi; + } if (IS_ERR(cs35l41->reset_gpio)) { ret = PTR_ERR(cs35l41->reset_gpio); @@ -2074,6 +2073,7 @@ int cs35l41_hda_probe(struct device *dev, const char *device_name, int id, int i err: if (cs35l41_safe_reset(cs35l41->regmap, cs35l41->hw_cfg.bst_type)) gpiod_set_value_cansleep(cs35l41->reset_gpio, 0); +err_acpi: gpiod_put(cs35l41->reset_gpio); gpiod_put(cs35l41->cs_gpio); acpi_dev_put(cs35l41->dacpi); -- 2.53.0