diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-03-08 08:26:48 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-05-30 07:49:13 +0200 |
| commit | 6eff7dc944faa9abd810fa9fcd5955e4b7fc7a28 (patch) | |
| tree | 1a16e48b3686684aba91c2d1574b1ecc600918c2 /sound/core | |
| parent | cd425208a5c80fdedd640137afeb5c452e1ec9a9 (diff) | |
| download | linux-stable-6eff7dc944faa9abd810fa9fcd5955e4b7fc7a28.tar.gz linux-stable-6eff7dc944faa9abd810fa9fcd5955e4b7fc7a28.tar.bz2 linux-stable-6eff7dc944faa9abd810fa9fcd5955e4b7fc7a28.zip | |
ALSA: vmaster: Propagate slave error
[ Upstream commit 2e2c177ca84aff092c3c96714b0f6a12900f3946 ]
In slave_update() of vmaster code ignores the error from the slave
get() callback and copies the values. It's not only about the missing
error code but also that this may potentially lead to a leak of
uninitialized variables when the slave get() don't clear them.
This patch fixes slave_update() not to copy the potentially
uninitialized values when an error is returned from the slave get()
callback, and to propagate the error value properly.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/vmaster.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/core/vmaster.c b/sound/core/vmaster.c index 6c58e6f73a01..7c6ef879c520 100644 --- a/sound/core/vmaster.c +++ b/sound/core/vmaster.c @@ -68,10 +68,13 @@ static int slave_update(struct link_slave *slave) return -ENOMEM; uctl->id = slave->slave.id; err = slave->slave.get(&slave->slave, uctl); + if (err < 0) + goto error; for (ch = 0; ch < slave->info.count; ch++) slave->vals[ch] = uctl->value.integer.value[ch]; + error: kfree(uctl); - return 0; + return err < 0 ? err : 0; } /* get the slave ctl info and save the initial values */ |