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 7669F2820C6; Thu, 15 Jan 2026 17:08:58 +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=1768496938; cv=none; b=tCYWMEXet5F4l8LcFNhYjCjEAeX7FAdmTHdyFIAXdSeYwh6m0Q1sc4/fk4LnNqW/Vbg9SLrKVnWAXUb2l/c3mhIDbKbXycMmOopaZ6SToDt1Rr6dipWHLf07bIuQzSgmMincAsb6kNYAbeQKOUtEk8WzcUgywdRie3Mq2VVmbqs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768496938; c=relaxed/simple; bh=wtkH650UyjzEzY/+IG0IXhyBGzrbgKB1GTg6GlzFxxs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rq3+2Za23q4YSjD/PkHaHEZbCo/zYJS62MD1s7YKKfVFMVy/lIhn+GqOaQYA4ocRlVhwucFrA2FKipsztYgL/pYzzHCNph8U6yO2PmIgaFTAYXzQr81IcsiNc7Esz6HKvR7ce6d02yCu8dmBVbJFtl+mlZuBWfCBWQoRrUa2LEs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=H5DAf0Bi; 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="H5DAf0Bi" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B0E41C116D0; Thu, 15 Jan 2026 17:08:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1768496938; bh=wtkH650UyjzEzY/+IG0IXhyBGzrbgKB1GTg6GlzFxxs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H5DAf0Bi7cZncKStunIKSB2ixgIz2Yq69s8AjcjP4tF/4jRDuDKvYhAtvFafvxLjL eWrYdUMlsTh6ZtTlLGGz9A11TDT92iKOdzlMCtjYigZj5qlEplonRi3msmAyX9T1jZ diJ/EvbIK/bIVrU+TUMxYzgJYrqPN9ja05jUqIxE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Haoxiang Li , Takashi Iwai , Sasha Levin Subject: [PATCH 6.6 67/88] ALSA: ac97: fix a double free in snd_ac97_controller_register() Date: Thu, 15 Jan 2026 17:48:50 +0100 Message-ID: <20260115164148.736099734@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260115164146.312481509@linuxfoundation.org> References: <20260115164146.312481509@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Haoxiang Li [ Upstream commit 830988b6cf197e6dcffdfe2008c5738e6c6c3c0f ] If ac97_add_adapter() fails, put_device() is the correct way to drop the device reference. kfree() is not required. Add kfree() if idr_alloc() fails and in ac97_adapter_release() to do the cleanup. Found by code review. Fixes: 74426fbff66e ("ALSA: ac97: add an ac97 bus") Cc: stable@vger.kernel.org Signed-off-by: Haoxiang Li Link: https://patch.msgid.link/20251219162845.657525-1-lihaoxiang@isrc.iscas.ac.cn Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- sound/ac97/bus.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) --- a/sound/ac97/bus.c +++ b/sound/ac97/bus.c @@ -299,6 +299,7 @@ static void ac97_adapter_release(struct idr_remove(&ac97_adapter_idr, ac97_ctrl->nr); dev_dbg(&ac97_ctrl->adap, "adapter unregistered by %s\n", dev_name(ac97_ctrl->parent)); + kfree(ac97_ctrl); } static const struct device_type ac97_adapter_type = { @@ -320,7 +321,9 @@ static int ac97_add_adapter(struct ac97_ ret = device_register(&ac97_ctrl->adap); if (ret) put_device(&ac97_ctrl->adap); - } + } else + kfree(ac97_ctrl); + if (!ret) { list_add(&ac97_ctrl->controllers, &ac97_controllers); dev_dbg(&ac97_ctrl->adap, "adapter registered by %s\n", @@ -361,14 +364,11 @@ struct ac97_controller *snd_ac97_control ret = ac97_add_adapter(ac97_ctrl); if (ret) - goto err; + return ERR_PTR(ret); ac97_bus_reset(ac97_ctrl); ac97_bus_scan(ac97_ctrl); return ac97_ctrl; -err: - kfree(ac97_ctrl); - return ERR_PTR(ret); } EXPORT_SYMBOL_GPL(snd_ac97_controller_register);