diff options
| author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2016-06-27 21:06:51 +0200 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2016-07-19 18:20:01 -0400 |
| commit | 9d17157617df7e7d3888e4b9b98eb58410987fb2 (patch) | |
| tree | c616ce53cfdde1f4e9cff55d95d3e45254faab50 /sound | |
| parent | 0ac0a856d986c1ab240753479f5e50fdfab82b14 (diff) | |
| download | lwn-9d17157617df7e7d3888e4b9b98eb58410987fb2.tar.gz lwn-9d17157617df7e7d3888e4b9b98eb58410987fb2.zip | |
ALSA: echoaudio: Fix memory allocation
[ 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>
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 631aaa4046ad..3a1fe2c79b4a 100644 --- a/sound/pci/echoaudio/echoaudio.c +++ b/sound/pci/echoaudio/echoaudio.c @@ -2247,11 +2247,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) { |