diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2020-10-07 10:49:28 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2020-10-07 17:33:52 +0200 |
commit | b41c15f4e1c1f1657da15c482fa837c1b7384452 (patch) | |
tree | b5c864aa8b2320df7356e4f91559171feac3abfd | |
parent | ca184355db8e60290fa34bf61c13308e6f4f50d3 (diff) | |
download | linux-b41c15f4e1c1f1657da15c482fa837c1b7384452.tar.bz2 |
ALSA: bebob: potential info leak in hwdep_read()
The "count" variable needs to be capped on every path so that we don't
copy too much information to the user.
Fixes: 618eabeae711 ("ALSA: bebob: Add hwdep interface")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20201007074928.GA2529578@mwanda
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/firewire/bebob/bebob_hwdep.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/firewire/bebob/bebob_hwdep.c b/sound/firewire/bebob/bebob_hwdep.c index 45b740f44c45..c362eb38ab90 100644 --- a/sound/firewire/bebob/bebob_hwdep.c +++ b/sound/firewire/bebob/bebob_hwdep.c @@ -36,12 +36,11 @@ hwdep_read(struct snd_hwdep *hwdep, char __user *buf, long count, } memset(&event, 0, sizeof(event)); + count = min_t(long, count, sizeof(event.lock_status)); if (bebob->dev_lock_changed) { event.lock_status.type = SNDRV_FIREWIRE_EVENT_LOCK_STATUS; event.lock_status.status = (bebob->dev_lock_count > 0); bebob->dev_lock_changed = false; - - count = min_t(long, count, sizeof(event.lock_status)); } spin_unlock_irq(&bebob->lock); |