ALSA: pcm: Check for integer overflow during multiplication
PATCH 1/1 ALSA: pcm: Check for integer overflow during multiplication
From: Phani Kumar Uppalapati <[email protected]>
Channel info data structure is parsed from userspace and if the number of channels is not set correctly, it could lead to integer overflow when the number of channels is multiplied with pcm bit width. Add a condition to check for integer overflow during the multiplication operationi, and return error if overflow detected.
--- sound/core/pcm_lib.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
sound/core/pcm_lib.c +11 -0
@@ -1718,6 +1718,11 @@ static int snd_pcm_lib_ioctl_channel_info(struct snd_pcm_substream *substream,switch (runtime->access) {case SNDRV_PCM_ACCESS_MMAP_INTERLEAVED :case SNDRV_PCM_ACCESS_RW_INTERLEAVED : +if ((UINT_MAX /width) < info->channel) { +snd_printd ("%s: integer overflow in multiplication\n" , + __func__); +return -EINVAL ; + } info->first = info->channel * width; info->step = runtime->channels * width;break ;
@@ -1725,6 +1730,12 @@ static int snd_pcm_lib_ioctl_channel_info(struct snd_pcm_substream *substream,case SNDRV_PCM_ACCESS_RW_NONINTERLEAVED : {size_t size = runtime->dma_bytes / runtime->channels; + +if ((size >0 ) && ((UINT_MAX /(size *8 )) < info->channel)) { +snd_printd ("%s: integer overflow in multiplication\n" , + __func__); +return -EINVAL ; + } info->first = info->channel * size *8 ; info->step = width;break ;
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Quoted 10 lines · On Tue, 28 May 2019 07:27:03 +0200, <[email protected]> wrote:
From: Phani Kumar Uppalapati <[email protected]>
Channel info data structure is parsed from userspace and if the number of channels is not set correctly, it could lead to integer overflow when the number of channels is multiplied with pcm bit width. Add a condition to check for integer overflow during the multiplication operationi, and return error if overflow detected.
Quoted 2 lines
Signed-off-by Phani Kumar Uppalapati <[email protected]>Signed-off-by Banajit Goswami <[email protected]>
Did you really hit this?
The info->channel value is already checked in snd_pcm_channel_info() before calling the ioctl ops, to the upper bound runtime->channels. So it shouldn't overflow at the point you suggested.
thanks,
Takashi
Thanks Takashi for the review!
Quoted 11 lines · Takashi Iwai
Quoted 9 lines · On Tue, 28 May 2019 07:27:03 +0200, <[email protected]> wrote:
From: Phani Kumar Uppalapati <[email protected]>
Channel info data structure is parsed from userspace and if the number of channels is not set correctly, it could lead to integer overflow when the number of channels is multiplied with pcm bit width. Add a condition to check for integer overflow during the multiplication operationi, and return error if overflow detected.
Quoted 3 lines
Quoted 2 lines
Signed-off-by Phani Kumar Uppalapati <[email protected]>Signed-off-by Banajit Goswami <[email protected]>Did you really hit this?
This was reported by static analysis tool.
I will take your feedback, and re-look at the issue, to see if this issue can happen.
Quoted 8 lines
The
info->channelvalue is already checked insnd_pcm_channel_info()before calling the ioctl ops, to the upper boundruntime->channels. So it shouldn't overflow at the point you suggested.thanks,
Takashi
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project