Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1432250 > unrolled thread
| Started by | Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
|---|---|
| First post | 2016-06-27 21:30 +0200 |
| Last post | 2016-06-28 09:20 +0200 |
| Articles | 3 — 3 participants |
Back to article view | Back to linux.kernel
[PATCH] ALSA: echoaudio: Fix memory allocation Christophe JAILLET <christophe.jaillet@wanadoo.fr> - 2016-06-27 21:30 +0200
Re: [PATCH] ALSA: echoaudio: Fix memory allocation Takashi Iwai <tiwai@suse.de> - 2016-06-27 22:30 +0200
Re: [PATCH] ALSA: echoaudio: Fix memory allocation walter harms <wharms@bfs.de> - 2016-06-28 09:20 +0200
| From | Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
|---|---|
| Date | 2016-06-27 21:30 +0200 |
| Subject | [PATCH] ALSA: echoaudio: Fix memory allocation |
| Message-ID | <rOKoi-4ws-61@gated-at.bofh.it> |
'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
[toc] | [next] | [standalone]
| From | Takashi Iwai <tiwai@suse.de> |
|---|---|
| Date | 2016-06-27 22:30 +0200 |
| Message-ID | <rOLkl-59s-9@gated-at.bofh.it> |
| In reply to | #1432250 |
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
[toc] | [prev] | [next] | [standalone]
| From | walter harms <wharms@bfs.de> |
|---|---|
| Date | 2016-06-28 09:20 +0200 |
| Message-ID | <rOVto-3I0-9@gated-at.bofh.it> |
| In reply to | #1432250 |
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
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web