Commit 92d6a07d authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Ben Hutchings

ALSA: echoaudio: Fix memory allocation

commit 9c6795a9 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: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 18d11b1d
...@@ -2251,11 +2251,11 @@ static int snd_echo_resume(struct pci_dev *pci) ...@@ -2251,11 +2251,11 @@ static int snd_echo_resume(struct pci_dev *pci)
DE_INIT(("resume start\n")); DE_INIT(("resume start\n"));
pci_restore_state(pci); pci_restore_state(pci);
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) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment