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 CC30247AF4D; Tue, 16 Jun 2026 17:21:09 +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=1781630471; cv=none; b=ZWUKcnQgdQ9K257TWWjXlX+rb4syoAfphtlN1ZjCSfx/4vXXP2qtOmwobsvwDYG2qoIi742a04H2X1Y2iDN7DnbRZlF4yxEA5orV+HLa9I6HfkBlRF+dywfHmHMh5NDQ0hM+na2Z+/e8WI1HrJTTypTZwCD2r6tB/z3xk3Xzgs0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781630471; c=relaxed/simple; bh=W8LzRzJW7owpJ36z8S15dvhdxcrGpUo2pVIA6bNL16Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ZEZDravmHPqb4jQjfPY5ftHQk37Y4Ik66AZm6PKdO/muJRK+SUY7FmTh1d/dBdIA1CKikVCuI66BBtJUbyqq95rQV2KWhslytdhHWbOArwX/szSlBHtlfhvoe+xUjkQ5VyK2HJNvPtu1J8ectHVAzwCXdWsX/wEryIkFZ9BscV8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=RnoBSN6F; 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="RnoBSN6F" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DCA881F000E9; Tue, 16 Jun 2026 17:21:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781630469; bh=jgl5CSmqIEz/XAewyexz11GuKl6ACMhPHKyfiLOyDV4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=RnoBSN6FENGzOkw/AF96dBDr/J1bUtBBcOcTP5ptUM5/uohdWNX8dmIQ+UUFdXs9Y UPv1mUyKIn6tcsJ3QRNmnR2CPDJRoC2f2yNP2TzpyOXdmR1mnjJJkYImtczEFJwYLN y0qUp69MvodIh99b+/XxSdQeGBOQRuNn87ice9jE= 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.1 028/522] ASoC: codecs: simple-mux: Fix enum control bounds check Date: Tue, 16 Jun 2026 20:22:55 +0530 Message-ID: <20260616145126.959552665@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616145125.307082728@linuxfoundation.org> References: <20260616145125.307082728@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.1-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 d30c0d24d90a65..c5aa58c6e7bae6 100644 --- a/sound/soc/codecs/simple-mux.c +++ b/sound/soc/codecs/simple-mux.c @@ -40,7 +40,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