[PATCH 3.16 239/305] ALSA: echoaudio: Fix memory allocation
From: Ben Hutchings <hidden>
Date: 2016-08-14 11:54:39
Also in:
lkml
3.16.37-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Christophe JAILLET <redacted> 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 <redacted> Signed-off-by: Takashi Iwai <redacted> [bwh: Backported to 3.16: adjust context] Signed-off-by: Ben Hutchings <redacted> --- sound/pci/echoaudio/echoaudio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
--- a/sound/pci/echoaudio/echoaudio.c
+++ b/sound/pci/echoaudio/echoaudio.c@@ -2253,11 +2253,11 @@ static int snd_echo_resume(struct device 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) {