* [PATCH] ALSA: echoaudio: Fix memory allocation
@ 2016-06-27 19:06 Christophe JAILLET
2016-06-27 20:28 ` Takashi Iwai
2016-06-28 7:13 ` walter harms
0 siblings, 2 replies; 3+ messages in thread
From: Christophe JAILLET @ 2016-06-27 19:06 UTC (permalink / raw)
To: perex, tiwai
Cc: alsa-devel, linux-kernel, kernel-janitors, Christophe JAILLET
'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>
---
sound/pci/echoaudio/echoaudio.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c
index 1cb85ae..286f5e3 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) {
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] ALSA: echoaudio: Fix memory allocation
2016-06-27 19:06 [PATCH] ALSA: echoaudio: Fix memory allocation Christophe JAILLET
@ 2016-06-27 20:28 ` Takashi Iwai
2016-06-28 7:13 ` walter harms
1 sibling, 0 replies; 3+ messages in thread
From: Takashi Iwai @ 2016-06-27 20:28 UTC (permalink / raw)
To: Christophe JAILLET; +Cc: perex, alsa-devel, kernel-janitors, linux-kernel
On Mon, 27 Jun 2016 21:06:51 +0200,
Christophe JAILLET wrote:
>
> '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>
Applied, thanks.
Takashi
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ALSA: echoaudio: Fix memory allocation
2016-06-27 19:06 [PATCH] ALSA: echoaudio: Fix memory allocation Christophe JAILLET
2016-06-27 20:28 ` Takashi Iwai
@ 2016-06-28 7:13 ` walter harms
1 sibling, 0 replies; 3+ messages in thread
From: walter harms @ 2016-06-28 7:13 UTC (permalink / raw)
To: Christophe JAILLET
Cc: perex, tiwai, alsa-devel, linux-kernel, kernel-janitors
Am 27.06.2016 21:06, schrieb Christophe JAILLET:
> '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>
> ---
> sound/pci/echoaudio/echoaudio.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c
> index 1cb85ae..286f5e3 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) {
perhaps you can use here kmemdup() ?
re,
wh
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-06-28 7:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-27 19:06 [PATCH] ALSA: echoaudio: Fix memory allocation Christophe JAILLET
2016-06-27 20:28 ` Takashi Iwai
2016-06-28 7:13 ` walter harms
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).