diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2016-05-04 09:27:37 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-21 14:08:49 +0100 |
commit | 05f119e61cb4961e963d63d611c8a6238acc5106 (patch) | |
tree | 2546a9ba3b7858ef58d6c752d9802acb8eaf20c9 /sound | |
parent | 03f848117ec27ea6fcfdbb1323609dd8ad5988d2 (diff) | |
download | linux-stable-05f119e61cb4961e963d63d611c8a6238acc5106.tar.gz linux-stable-05f119e61cb4961e963d63d611c8a6238acc5106.tar.bz2 linux-stable-05f119e61cb4961e963d63d611c8a6238acc5106.zip |
ALSA: isa/wavefront: prevent some out of bound writes
[ Upstream commit 84d7a4470dbac0dd9389050100b54a1625d04264 ]
"header->number" can be up to USHRT_MAX and it comes from the ioctl so
it needs to be capped.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/isa/wavefront/wavefront_synth.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sound/isa/wavefront/wavefront_synth.c b/sound/isa/wavefront/wavefront_synth.c index e5db001363ee..b5fde9fd1ae9 100644 --- a/sound/isa/wavefront/wavefront_synth.c +++ b/sound/isa/wavefront/wavefront_synth.c @@ -785,6 +785,9 @@ wavefront_send_patch (snd_wavefront_t *dev, wavefront_patch_info *header) DPRINT (WF_DEBUG_LOAD_PATCH, "downloading patch %d\n", header->number); + if (header->number >= ARRAY_SIZE(dev->patch_status)) + return -EINVAL; + dev->patch_status[header->number] |= WF_SLOT_FILLED; bptr = buf; @@ -809,6 +812,9 @@ wavefront_send_program (snd_wavefront_t *dev, wavefront_patch_info *header) DPRINT (WF_DEBUG_LOAD_PATCH, "downloading program %d\n", header->number); + if (header->number >= ARRAY_SIZE(dev->prog_status)) + return -EINVAL; + dev->prog_status[header->number] = WF_SLOT_USED; /* XXX need to zero existing SLOT_USED bit for program_status[i] @@ -898,6 +904,9 @@ wavefront_send_sample (snd_wavefront_t *dev, header->number = x; } + if (header->number >= WF_MAX_SAMPLE) + return -EINVAL; + if (header->size) { /* XXX it's a debatable point whether or not RDONLY semantics |