evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ALSA: echoaudio: Fix memory allocation

Browse source 
commit 9c6795a9b3cbb56a9fbfaf43909c5c22999ba317 upstream.

'commpage_bak' is allocated with 'sizeof(struct echoaudio)' bytes.
We then copy 'sizeof(struct comm_page)' bytes in it.
On my system, smatch complains because one is 2960 and the other is 3072.

This would result in memory corruption or a oops.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Christophe JAILLET 2016-06-27 21:06:51 +02:00 • committed by Greg Kroah-Hartman
parent 0287f6374b
commit 02a49fd9d0
1 changed files with 2 additions and 2 deletions

4
sound/pci/echoaudio/echoaudio.c
View file

@ -2200,11 +2200,11 @@ static int snd_echo_resume(struct device *dev)
u32 pipe_alloc_mask; u32 pipe_alloc_mask;
int err; int err;
commpage_bak = kmalloc(sizeof(struct echoaudio), GFP_KERNEL); commpage_bak = kmalloc(sizeof(*commpage), GFP_KERNEL);
if (commpage_bak == NULL) if (commpage_bak == NULL)
return -ENOMEM; return -ENOMEM;
commpage = chip->comm_page; commpage = chip->comm_page;
memcpy(commpage_bak, commpage, sizeof(struct comm_page)); memcpy(commpage_bak, commpage, sizeof(*commpage));
err = init_hw(chip, chip->pci->device, chip->pci->subsystem_device); err = init_hw(chip, chip->pci->device, chip->pci->subsystem_device);
if (err < 0) { if (err < 0) {