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 BE8104071DA; Sun, 7 Jun 2026 10:19:03 +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=1780827544; cv=none; b=EYl3V6sCN7extdsi43eOmC4WSk6s2W80cGzB0anPtv/3sSE9mOBBFC85XiGst9847p+rjLqE4G4qMTfFyz0EWUWT2ZT51zZg/FsjfWzKCwMml3oJnm3fjaACSkkmaRMBQhQ8RQnUS2c7WeCthjwQAE0YioYAGwiS+CiNbZ8N0Cg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780827544; c=relaxed/simple; bh=LLH2YNDum+KJvUY7NppnfPACVWEvmqVQmPFhDD+zBgQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=i2ivfSLWEAAxQDF7luj6waz0/bW+Fx/qViKOZ/2XLekI7nKVB8kQGvNWZZjBYaCa5TxBHhGORSEy0H2vN0skKhMMiCSf7qPGm4BsQrEIGwuGi5eRMAGUI28VVYyFO3gUw26COyBI4BYIrkyLxCBobkeU9eYUHBsVuj5nrIVPipE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=qMfZ2FCT; 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="qMfZ2FCT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0D0A01F00893; Sun, 7 Jun 2026 10:19:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780827543; bh=wdiL1nJhOmT9OyiJrrhXJmHMgZVjf7ksN4PWLc+vpIk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=qMfZ2FCTkt20/c1uxeIOlUsnckvAaMKZhHmBwal3dPMsmXEW8KdcPXoIKy0fAaFby ohn1AV3grnxpJIIyVzlafi9xrNq6UjwK1L/hGpQNYVC3t8fK9ENiJj8N7o1rDMPkPd VF92rpNtg5PquGejH7ystdHqtJjnmsyGxpFfzyqY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?C=C3=A1ssio=20Gabriel?= , Mark Brown , Sasha Levin Subject: [PATCH 6.18 058/315] ASoC: codecs: simple-mux: Fix enum control bounds check Date: Sun, 7 Jun 2026 11:57:25 +0200 Message-ID: <20260607095729.737496285@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260607095727.528828913@linuxfoundation.org> References: <20260607095727.528828913@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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Cássio Gabriel [ Upstream commit f63ad68e18d774a5d15cd7e405ead63f6b322679 ] simple_mux_control_put() rejects values greater than e->items, but enum control values are zero based. For the two-entry mux used by this driver, valid values are 0 and 1, so value 2 must be rejected as well. Accepting e->items can store an invalid mux state, pass it to the GPIO setter, and pass it on to the DAPM mux update path where it is used as an index into the enum text array. Use the same >= e->items check used by the ASoC enum helpers. Fixes: 342fbb7578d1 ("ASoC: add simple-mux") Signed-off-by: Cássio Gabriel Link: https://patch.msgid.link/20260527-asoc-simple-mux-enum-bounds-v1-1-3f805b9fc671@gmail.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/simple-mux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/simple-mux.c b/sound/soc/codecs/simple-mux.c index 3906964401557d..cedd181ffdaf46 100644 --- a/sound/soc/codecs/simple-mux.c +++ b/sound/soc/codecs/simple-mux.c @@ -51,7 +51,7 @@ static int simple_mux_control_put(struct snd_kcontrol *kcontrol, struct snd_soc_component *c = snd_soc_dapm_to_component(dapm); struct simple_mux *priv = snd_soc_component_get_drvdata(c); - if (ucontrol->value.enumerated.item[0] > e->items) + if (ucontrol->value.enumerated.item[0] >= e->items) return -EINVAL; if (priv->mux == ucontrol->value.enumerated.item[0]) -- 2.53.0