diff options
| author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2016-06-27 21:06:51 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2016-08-22 22:38:22 +0100 |
| commit | db92ce5d03426443f8e1e82279bbd306bd1b2327 (patch) | |
| tree | cc240043aad584d44f7072450024a525fbae32a8 /sound | |
| parent | 37fd3970306b7ce35cb114cdba1d727922a651ca (diff) | |
| download | linux-stable-db92ce5d03426443f8e1e82279bbd306bd1b2327.tar.gz linux-stable-db92ce5d03426443f8e1e82279bbd306bd1b2327.tar.bz2 linux-stable-db92ce5d03426443f8e1e82279bbd306bd1b2327.zip | |
ALSA: echoaudio: Fix memory allocation
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>
[bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/echoaudio/echoaudio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c index 9f10c9e0df5e..2838de08be9b 100644 --- a/sound/pci/echoaudio/echoaudio.c +++ b/sound/pci/echoaudio/echoaudio.c @@ -2253,11 +2253,11 @@ static int snd_echo_resume(struct device *dev) DE_INIT(("resume start\n")); pci_restore_state(pci); - commpage_bak = kmalloc(sizeof(struct echoaudio), GFP_KERNEL); + commpage_bak = kmalloc(sizeof(*commpage), GFP_KERNEL); if (commpage_bak == NULL) return -ENOMEM; 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); if (err < 0) { |