From 5871321fb4558c55bf9567052b618ff0be6b975e Mon Sep 17 00:00:00 2001

From: Mark Brown <broonie@kernel.org>

Date: Sat, 4 Jun 2022 11:52:46 +0100

Subject: [PATCH] ASoC: ops: Fix off by one in range control validation

Git-commit: 5871321fb4558c55bf9567052b618ff0be6b975e

Patch-mainline: v5.19-rc6

References: git-fixes

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 <broonie@kernel.org>

Link: https://lore.kernel.org/r/20220604105246.4055214-1-broonie@kernel.org

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 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 e693070f51fe..d867f449d82d 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.3