diff options
| author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2016-06-27 21:06:51 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-07-27 08:42:22 -0700 |
| commit | b4095aacd5b02a6a2b9bf5bb913f9aede4833161 (patch) | |
| tree | 5e5d30c5f1143a313b6cd32a7f0020cb6745b8c2 /sound/pci/echoaudio | |
| parent | 7d4e6bea615ad52878775104f1103d7c63697c2d (diff) | |
| download | linux-stable-b4095aacd5b02a6a2b9bf5bb913f9aede4833161.tar.gz linux-stable-b4095aacd5b02a6a2b9bf5bb913f9aede4833161.tar.bz2 linux-stable-b4095aacd5b02a6a2b9bf5bb913f9aede4833161.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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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) { |