summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2021-12-01 08:36:05 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-12-14 10:16:54 +0100
commitbe55f306396cd62c6889286a7194fd8b53363aeb (patch)
tree3a0c53a9f4633c102cb7fe8054cab92083e0f32b /sound
parent8af815ab052eaf74addbbfb556d63ce2137c0e1b (diff)
downloadlinux-stable-be55f306396cd62c6889286a7194fd8b53363aeb.tar.gz
linux-stable-be55f306396cd62c6889286a7194fd8b53363aeb.tar.bz2
linux-stable-be55f306396cd62c6889286a7194fd8b53363aeb.zip
ALSA: pcm: oss: Limit the period size to 16MB
commit 8839c8c0f77ab8fc0463f4ab8b37fca3f70677c2 upstream. Set the practical limit to the period size (the fragment shift in OSS) instead of a full 31bit; a too large value could lead to the exhaust of memory as we allocate temporary buffers of the period size, too. As of this patch, we set to 16MB limit, which should cover all use cases. Reported-by: syzbot+bb348e9f9a954d42746f@syzkaller.appspotmail.com Reported-by: Bixuan Cui <cuibixuan@linux.alibaba.com> Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/1638270978-42412-1-git-send-email-cuibixuan@linux.alibaba.com Link: https://lore.kernel.org/r/20211201073606.11660-3-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/core/oss/pcm_oss.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
index 721adffd657e..64b2dd2e9c72 100644
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
@@ -1967,7 +1967,7 @@ static int snd_pcm_oss_set_fragment1(struct snd_pcm_substream *substream, unsign
if (runtime->oss.subdivision || runtime->oss.fragshift)
return -EINVAL;
fragshift = val & 0xffff;
- if (fragshift >= 31)
+ if (fragshift >= 25) /* should be large enough */
return -EINVAL;
runtime->oss.fragshift = fragshift;
runtime->oss.maxfrags = (val >> 16) & 0xffff;