Received: by 2002:ad5:4acb:0:0:0:0:0 with SMTP id n11csp148282imw; Wed, 13 Jul 2022 21:32:22 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vi6jnprCPJsQDliAYt00mcvxt1WrBSXyVI13KhmEvgm8i3pl3eZTgx2KTT0jwgEoUC7yfy X-Received: by 2002:a17:907:2c4a:b0:72b:5b9b:9c50 with SMTP id hf10-20020a1709072c4a00b0072b5b9b9c50mr7046843ejc.636.1657773141891; Wed, 13 Jul 2022 21:32:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657773141; cv=none; d=google.com; s=arc-20160816; b=UxlcjZ9ukqVWAuv9EeHCZ4V5EOf/xxMy1uw4NS52lQpSKGNYg/lVZh0j9y57QmhO+R 0msrN9Ngn/dc6FOD6UXTJaitBjDT49FvmdOZ0WgyMm0VcAoNwsKoelo20K5EH3515j+r X++3unq+mijwh7oa4fkRbc1Wl9RMoyQmUXcCwAY7JrdhSeRIK0r7RZBQyarUMmDbsFOK NWh06X7/IRK9DaFf9ivcd+9vHRC/87yuz0vvXm8YLDJJb0pggtBEiOM1y8v/eHXt4YgQ MQyZZBo5Wc/lAzWBwMG1jJuumzcVwqB5jfqj8WE8gk3jCgfDvkxLGNUYmispPuAdiwzT hD/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=Tmz1PuEQzj41XL8skUFoQ3fzxvziZL7J6D7qK84MM4w=; b=Hei4CoiIfuqY7zFSp9wv3NGfqI+EqFhhQAibMVR7ViaKgZuXbjAnyhe2O7RarYxPjX 2htrhgjZ8vvHUW95oYbXccVfvKgLem1vOoWvAjzsrLrGmp4ijbC0HdlsU+u2+aP5nOyl rQpMfYC04zTS1/KZVzFzeI+8Bf5rkysDuwH2FK6Xs/XxqBZXTlo+WYLua+jFpTXhP90o UqIv82Cfv/xx+/P5kt4nn9xrSwjBJkzMNmS+3Bwk+e6pdxa4lJWzBldQsjJ1mSu3xEZv 3W0LOzz7oozhCGH/mTq6C/lUMhOBdRAQSISnK/+tL1O7iI1WAP3w0b0kAS3svzBXj/h/ 041A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=hFOC3vyF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i12-20020a17090639cc00b00718d1cddac1si637590eje.833.2022.07.13.21.31.52; Wed, 13 Jul 2022 21:32:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=hFOC3vyF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235046AbiGNE3Z (ORCPT + 99 others); Thu, 14 Jul 2022 00:29:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236130AbiGNE2B (ORCPT ); Thu, 14 Jul 2022 00:28:01 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6A68C2E6BB; Wed, 13 Jul 2022 21:24:33 -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 dfw.source.kernel.org (Postfix) with ESMTPS id E767B61E51; Thu, 14 Jul 2022 04:24:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8458CC34114; Thu, 14 Jul 2022 04:24:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1657772672; bh=08m7YkgMf00+tBrPAp/k1bxRwMkOC+fQBhyogyRaGSI=; h=From:To:Cc:Subject:Date:From; b=hFOC3vyFToJfJsLnbtKCjlvxmUTqSK1KLqbr8cm7BfaW1ZQ4vM5/R0TzJwdk7svnu DQknKSqLYADSXCuayqrEOX4hvf0JVIi2AOnJ4eS8e+8rzNEYGwAXP+E4v3tT7fi2t4 yQFi9VkuTz9jNrmAQmHXvrgCqONPRFMHdIM2jz81O3EhOnNjsnQxVm43asQA5jJCgE unqCcXvZNnETjINBzhGqNN7D3oJVVMFPnyjXnJtuAmbu3V9A8zAT9iQE1LlfZIIc2k YEAGkwbm6n6QQ02K01h8rQ0gpieKVURHM0hu5o2icn49Eu5IO9mj0FUQ1Y1x6f+BXR q6e3vJ76Bnnag== 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, alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 5.15 01/28] ASoC: ops: Fix off by one in range control validation Date: Thu, 14 Jul 2022 00:24:02 -0400 Message-Id: <20220714042429.281816-1-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mark Brown [ Upstream commit 5871321fb4558c55bf9567052b618ff0be6b975e ] We currently report that range controls accept a range of 0..(max-min) but accept writes in the range 0..(max-min+1). Remove that extra +1. Signed-off-by: Mark Brown Link: https://lore.kernel.org/r/20220604105246.4055214-1-broonie@kernel.org Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/soc-ops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c index f32ba64c5dda..e73360e9de8f 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -526,7 +526,7 @@ int snd_soc_put_volsw_range(struct snd_kcontrol *kcontrol, return -EINVAL; if (mc->platform_max && tmp > mc->platform_max) return -EINVAL; - if (tmp > mc->max - mc->min + 1) + if (tmp > mc->max - mc->min) return -EINVAL; if (invert) @@ -547,7 +547,7 @@ int snd_soc_put_volsw_range(struct snd_kcontrol *kcontrol, return -EINVAL; if (mc->platform_max && tmp > mc->platform_max) return -EINVAL; - if (tmp > mc->max - mc->min + 1) + if (tmp > mc->max - mc->min) return -EINVAL; if (invert) -- 2.35.1