diff options
| author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2016-06-27 21:06:51 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-06-27 22:27:47 +0200 |
| commit | 9c6795a9b3cbb56a9fbfaf43909c5c22999ba317 (patch) | |
| tree | 73f2ed280bd43618cb48595ad763f7069fd28ed4 /sound/pci/echoaudio | |
| parent | 81e43960dce1c8e58e682fb3ec26c1d8f83a9afc (diff) | |
| download | lwn-9c6795a9b3cbb56a9fbfaf43909c5c22999ba317.tar.gz lwn-9c6795a9b3cbb56a9fbfaf43909c5c22999ba317.zip | |
ALSA: echoaudio: Fix memory allocation
'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>
Diffstat (limited to 'sound/pci/echoaudio')
| -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 1cb85aeb0cea..286f5e3686a3 100644 --- a/sound/pci/echoaudio/echoaudio.c +++ b/sound/pci/echoaudio/echoaudio.c @@ -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) { |