From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 10E07C433EF for ; Tue, 10 May 2022 15:48:11 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 3C887191D; Tue, 10 May 2022 17:47:19 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 3C887191D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1652197689; bh=atRy27yf9Vy/665sbn+jOCfM4MC2nSQBCmGmLlIUE8A=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=F7t2zs+NmSf4Fn8nTTYc5tVNtrFgr7wNYw5xVxmEz/llS1ZPwHnzr9ArkaQr2wfxw YUWd9EZ+R0B245Sh8VcIbAHhEidfuXQJ9DqXo5WvzNRF7nukSVAaEdlgGRz6Bn2m6i cYO8xApLRAmSmHkErPjLY6+11FsAjfr02yj/57No= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 5F58FF80516; Tue, 10 May 2022 17:45:54 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id CCD8DF80516; Tue, 10 May 2022 17:45:52 +0200 (CEST) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 129B9F80517 for ; Tue, 10 May 2022 17:45:46 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 129B9F80517 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Q6UYgNaR" Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 3C294615B2; Tue, 10 May 2022 15:45:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0DF15C385CB; Tue, 10 May 2022 15:45:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1652197545; bh=atRy27yf9Vy/665sbn+jOCfM4MC2nSQBCmGmLlIUE8A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q6UYgNaR3OUTg3BlgiCleyXt7Sh1FEI1uhKF9rd8BMD9p9ABqoCyjI4q1st12OZLa dV7SOCPntvcuCcJkubIMtzvqdt8Eo+e13gEmqpolnZ4Rk5R0eqi7B+nUc7QybLtkB3 woo8qqQLdyKhjdFbLtAJV5KxKoN8iuEx8yfTw7Qcr86t0KSgVjSt+xqVP6wwTkvC+E BKHyLQiovlyBwjbBL2dgQ8w4PFY9WC49m9jcnUShP08Vw0rLbfgIOGnbm1Q3Rw0ty/ 7SPbv+K6xqalUSdO+3N7iqAAq4epX80RZO9t4zBG5OPMoK3wifsuZBu+YeUNRIN6rc C8Rvy+ehMQpoA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 2/8] ASoC: max98090: Reject invalid values in custom control put() Date: Tue, 10 May 2022 11:45:30 -0400 Message-Id: <20220510154536.154070-2-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220510154536.154070-1-sashal@kernel.org> References: <20220510154536.154070-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Cc: Sasha Levin , alsa-devel@alsa-project.org, lgirdwood@gmail.com, pierre-louis.bossart@linux.intel.com, tiwai@suse.com, Mark Brown X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Mark Brown [ Upstream commit 2fbe467bcbfc760a08f08475eea6bbd4c2874319 ] The max98090 driver has a custom put function for some controls which can only be updated in certain circumstances which makes no effort to validate that input is suitable for the control, allowing out of spec values to be written to the hardware and presented to userspace. Fix this by returning an error when invalid values are written. Signed-off-by: Mark Brown Link: https://lore.kernel.org/r/20220420193454.2647908-1-broonie@kernel.org Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/max98090.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c index 6b9d326e11b0..207cdcfb6ebb 100644 --- a/sound/soc/codecs/max98090.c +++ b/sound/soc/codecs/max98090.c @@ -413,6 +413,9 @@ static int max98090_put_enab_tlv(struct snd_kcontrol *kcontrol, val = (val >> mc->shift) & mask; + if (sel < 0 || sel > mc->max) + return -EINVAL; + *select = sel; /* Setting a volume is only valid if it is already On */ -- 2.35.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A3FAC433FE for ; Tue, 10 May 2022 15:50:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346509AbiEJPyA (ORCPT ); Tue, 10 May 2022 11:54:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32960 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346726AbiEJPvV (ORCPT ); Tue, 10 May 2022 11:51:21 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 99204286D7; Tue, 10 May 2022 08:45:47 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 47CBBB81DFB; Tue, 10 May 2022 15:45:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0DF15C385CB; Tue, 10 May 2022 15:45:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1652197545; bh=atRy27yf9Vy/665sbn+jOCfM4MC2nSQBCmGmLlIUE8A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q6UYgNaR3OUTg3BlgiCleyXt7Sh1FEI1uhKF9rd8BMD9p9ABqoCyjI4q1st12OZLa dV7SOCPntvcuCcJkubIMtzvqdt8Eo+e13gEmqpolnZ4Rk5R0eqi7B+nUc7QybLtkB3 woo8qqQLdyKhjdFbLtAJV5KxKoN8iuEx8yfTw7Qcr86t0KSgVjSt+xqVP6wwTkvC+E BKHyLQiovlyBwjbBL2dgQ8w4PFY9WC49m9jcnUShP08Vw0rLbfgIOGnbm1Q3Rw0ty/ 7SPbv+K6xqalUSdO+3N7iqAAq4epX80RZO9t4zBG5OPMoK3wifsuZBu+YeUNRIN6rc C8Rvy+ehMQpoA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mark Brown , Sasha Levin , lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, pierre-louis.bossart@linux.intel.com, alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 5.4 2/8] ASoC: max98090: Reject invalid values in custom control put() Date: Tue, 10 May 2022 11:45:30 -0400 Message-Id: <20220510154536.154070-2-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220510154536.154070-1-sashal@kernel.org> References: <20220510154536.154070-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mark Brown [ Upstream commit 2fbe467bcbfc760a08f08475eea6bbd4c2874319 ] The max98090 driver has a custom put function for some controls which can only be updated in certain circumstances which makes no effort to validate that input is suitable for the control, allowing out of spec values to be written to the hardware and presented to userspace. Fix this by returning an error when invalid values are written. Signed-off-by: Mark Brown Link: https://lore.kernel.org/r/20220420193454.2647908-1-broonie@kernel.org Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/max98090.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c index 6b9d326e11b0..207cdcfb6ebb 100644 --- a/sound/soc/codecs/max98090.c +++ b/sound/soc/codecs/max98090.c @@ -413,6 +413,9 @@ static int max98090_put_enab_tlv(struct snd_kcontrol *kcontrol, val = (val >> mc->shift) & mask; + if (sel < 0 || sel > mc->max) + return -EINVAL; + *select = sel; /* Setting a volume is only valid if it is already On */ -- 2.35.1