From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 BB64B430CE3; Tue, 21 Jul 2026 22:58:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784674696; cv=none; b=r1C06vKESWFnirhT3obSojcFtKMcw2MSQcDe/A1uRDQ9prTuLdCJEjb8a7sA/xFylxkFAgjy0dpdkmjERfTFEya2oEyNNxI5SEk7Boslp4Hf8NoN68ywZqAzEiwj874qN/kM3pqWenBb2P3CHl64TzxROhUORNVwX53l1N7HSgk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784674696; c=relaxed/simple; bh=Mp2nntqGKheRM/KAf3H6W1mRZD+ts+of5fmJMrikhEo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aeBpMr+cqlc0Fynf+mUZ4RkoD/RcYugRHNAWRTJ+/8KyVSScQ8WumeQV3dQ6MNn+FQPMWdTuxjWYfKbLQpPFHoTNyKX0v/TIRYsnt0i8OnOpeiVtcAsWVtmC9Gf2ESIvlZh144JP8yVgxjn5X0q2p7OLPe3NqGOSXHR+PHptH9A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=gtbgOsi/; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="gtbgOsi/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A84491F000E9; Tue, 21 Jul 2026 22:58:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784674690; bh=NthhqASC1yP9iOtJOEuZeXVUa6eawyAJqUmVIFCAI2c=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=gtbgOsi/W2RzxLpz2gzHelnZEYGkZaw0YrcQxc6bnCG8+1IjShszccl9XYGce7O3U 0F6wRtHE+ZhG474WslhENc6oI9yfiPLMv8SgcTNPlTBsX9uSTgg7uenzZ8pi4xVFU5 406Kdi6xFNMjhuMXpPNjgq4XjB9hQrOwZTHdjxqA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Zhao Dongdong , Takashi Iwai , Sasha Levin Subject: [PATCH 5.10 594/699] ALSA: aoa: check snd_ctl_new1() return value Date: Tue, 21 Jul 2026 17:25:53 +0200 Message-ID: <20260721152409.130988621@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152355.667394603@linuxfoundation.org> References: <20260721152355.667394603@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 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zhao Dongdong [ Upstream commit 8df560fefe6fed6a20b7e06720eeaeccec349ac0 ] snd_ctl_new1() can return NULL when memory allocation fails. In layout.c, the function does not check the return value before dereferencing ctl->id.name or passing to aoa_snd_ctl_add(), which can lead to a NULL pointer dereference. Add NULL checks after snd_ctl_new1() calls and return early if any fails. Assisted-by: Opencode:DeepSeek-V4-Flash Cc: stable@vger.kernel.org Fixes: f3d9478b2ce4 ("[ALSA] snd-aoa: add snd-aoa") Signed-off-by: Zhao Dongdong Link: https://patch.msgid.link/tencent_35F3A25FEEBF190A2E15ED787754C57E3708@qq.com Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- sound/aoa/fabrics/layout.c | 6 ++++++ 1 file changed, 6 insertions(+) --- a/sound/aoa/fabrics/layout.c +++ b/sound/aoa/fabrics/layout.c @@ -947,6 +947,8 @@ static void layout_attached_codec(struct if (lineout == 1) ldev->gpio.methods->set_lineout(codec->gpio, 1); ctl = snd_ctl_new1(&lineout_ctl, codec->gpio); + if (!ctl) + return; if (cc->connected & CC_LINEOUT_LABELLED_HEADPHONE) strlcpy(ctl->id.name, "Headphone Switch", sizeof(ctl->id.name)); @@ -961,6 +963,8 @@ static void layout_attached_codec(struct if (ldev->have_lineout_detect) { ctl = snd_ctl_new1(&lineout_detect_choice, ldev); + if (!ctl) + return; if (cc->connected & CC_LINEOUT_LABELLED_HEADPHONE) strlcpy(ctl->id.name, "Headphone Detect Autoswitch", @@ -968,6 +972,8 @@ static void layout_attached_codec(struct aoa_snd_ctl_add(ctl); ctl = snd_ctl_new1(&lineout_detected, ldev); + if (!ctl) + return; if (cc->connected & CC_LINEOUT_LABELLED_HEADPHONE) strlcpy(ctl->id.name, "Headphone Detected",