]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
ASoC: max98090: Reject invalid values in custom control put()
authorMark Brown <broonie@kernel.org>
Wed, 20 Apr 2022 19:34:53 +0000 (20:34 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 18 May 2022 08:23:45 +0000 (10:23 +0200)
[ 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 <broonie@kernel.org>
Link: https://lore.kernel.org/r/20220420193454.2647908-1-broonie@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/codecs/max98090.c

index 945a79e4f3eb461d5b5d0246cb3ca71d939d8714..779845e3a9e38d43cef19034b0dbd5886c479638 100644 (file)
@@ -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 */