]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - ti-linux-kernel/ti-linux-kernel.git/commitdiff
ALSA: echoaudio: Fix memory allocation
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Mon, 27 Jun 2016 19:06:51 +0000 (21:06 +0200)
committerSasha Levin <alexander.levin@verizon.com>
Tue, 19 Jul 2016 17:34:34 +0000 (13:34 -0400)
[ Upstream commit 9c6795a9b3cbb56a9fbfaf43909c5c22999ba317 ]

'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>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
sound/pci/echoaudio/echoaudio.c

index 862db9a0b04112f5237597a42cbf7d579f18f7e4..f3e5cfa4f25d62f5952fe187a231d00aabe7c264 100644 (file)
@@ -2200,11 +2200,11 @@ static int snd_echo_resume(struct device *dev)
        u32 pipe_alloc_mask;
        int err;
 
-       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) {