Skip to content

Commit 5ce74ff

Browse files
tiwaigregkh
authored andcommitted
ALSA: oss: Fix PCM OSS buffer allocation overflow
commit efb6402 upstream. We've got syzbot reports hitting INT_MAX overflow at vmalloc() allocation that is called from snd_pcm_plug_alloc(). Although we apply the restrictions to input parameters, it's based only on the hw_params of the underlying PCM device. Since the PCM OSS layer allocates a temporary buffer for the data conversion, the size may become unexpectedly large when more channels or higher rates is given; in the reported case, it went over INT_MAX, hence it hits WARN_ON(). This patch is an attempt to avoid such an overflow and an allocation for too large buffers. First off, it adds the limit of 1MB as the upper bound for period bytes. This must be large enough for all use cases, and we really don't want to handle a larger temporary buffer than this size. The size check is performed at two places, where the original period bytes is calculated and where the plugin buffer size is calculated. In addition, the driver uses array_size() and array3_size() for multiplications to catch overflows for the converted period size and buffer bytes. Reported-by: syzbot+72732c532ac1454eeee9@syzkaller.appspotmail.com Suggested-by: Linus Torvalds <torvalds@linux-foundation.org> Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/00000000000085b1b305da5a66f3@google.com Link: https://lore.kernel.org/r/20220318082036.29699-1-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent db03abd commit 5ce74ff

2 files changed

Lines changed: 12 additions & 5 deletions

File tree

sound/core/oss/pcm_oss.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -774,6 +774,11 @@ static int snd_pcm_oss_period_size(struct snd_pcm_substream *substream,
774774

775775
if (oss_period_size < 16)
776776
return -EINVAL;
777+
778+
/* don't allocate too large period; 1MB period must be enough */
779+
if (oss_period_size > 1024 * 1024)
780+
return -ENOMEM;
781+
777782
runtime->oss.period_bytes = oss_period_size;
778783
runtime->oss.period_frames = 1;
779784
runtime->oss.periods = oss_periods;
@@ -1042,10 +1047,9 @@ static int snd_pcm_oss_change_params_locked(struct snd_pcm_substream *substream)
10421047
goto failure;
10431048
}
10441049
#endif
1045-
oss_period_size *= oss_frame_size;
1046-
1047-
oss_buffer_size = oss_period_size * runtime->oss.periods;
1048-
if (oss_buffer_size < 0) {
1050+
oss_period_size = array_size(oss_period_size, oss_frame_size);
1051+
oss_buffer_size = array_size(oss_period_size, runtime->oss.periods);
1052+
if (oss_buffer_size <= 0) {
10491053
err = -EINVAL;
10501054
goto failure;
10511055
}

sound/core/oss/pcm_plugin.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,10 @@ static int snd_pcm_plugin_alloc(struct snd_pcm_plugin *plugin, snd_pcm_uframes_t
6161
}
6262
if ((width = snd_pcm_format_physical_width(format->format)) < 0)
6363
return width;
64-
size = frames * format->channels * width;
64+
size = array3_size(frames, format->channels, width);
65+
/* check for too large period size once again */
66+
if (size > 1024 * 1024)
67+
return -ENOMEM;
6568
if (snd_BUG_ON(size % 8))
6669
return -ENXIO;
6770
size /= 8;

0 commit comments

Comments
 (0)