diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-06-16 10:34:42 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-06-18 13:00:18 +0300 |
| commit | 10457f5042b4890a667e2f15a2e783490dda44d2 (patch) | |
| tree | b6df7f229e6f110c2c87852a65d3faf3f1975aaf /sound/core | |
| parent | eb882afcfa83991c0b72913e8a18f941a9986b8f (diff) | |
| download | linux-10457f5042b4890a667e2f15a2e783490dda44d2.tar.xz | |
ALSA: vmaster: Return error for invalid input values
So far the vmaster code has been tolerant about the input values and
accepts any values by correcting internally. But now our own selftest
starts complaining about this behavior, so let's be picky and change
the behavior to return -EINVAL for invalid input values instead.
Reported-by: Paul Menzel <pmenzel@molgen.mpg.de>
Closes: https://lore.kernel.org/r/1d44be36-9bb9-4d82-8953-5ae2a4f09405@molgen.mpg.de
Reviewed-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/20240616073454.16512-2-tiwai@suse.de
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/vmaster.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/core/vmaster.c b/sound/core/vmaster.c index 04a57f7be6ea..c657659b236c 100644 --- a/sound/core/vmaster.c +++ b/sound/core/vmaster.c @@ -199,6 +199,12 @@ static int follower_put(struct snd_kcontrol *kcontrol, if (err < 0) return err; for (ch = 0; ch < follower->info.count; ch++) { + if (ucontrol->value.integer.value[ch] < follower->info.min_val || + ucontrol->value.integer.value[ch] > follower->info.max_val) + return -EINVAL; + } + + for (ch = 0; ch < follower->info.count; ch++) { if (follower->vals[ch] != ucontrol->value.integer.value[ch]) { changed = 1; follower->vals[ch] = ucontrol->value.integer.value[ch]; @@ -365,6 +371,8 @@ static int master_put(struct snd_kcontrol *kcontrol, new_val = ucontrol->value.integer.value[0]; if (new_val == old_val) return 0; + if (new_val < master->info.min_val || new_val > master->info.max_val) + return -EINVAL; err = sync_followers(master, old_val, new_val); if (err < 0) |