2010-07-16 16:16:04

by Kulikov Vasiliy

Subject: [PATCH 11/15] pci: echoaudio: check kmalloc() result

If kmalloc() fails exit with -ENOMEM.

Signed-off-by: Kulikov Vasiliy <[email protected]>
---
sound/pci/echoaudio/echoaudio.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c
index 668a5ec..20763dd 100644
--- a/sound/pci/echoaudio/echoaudio.c
+++ b/sound/pci/echoaudio/echoaudio.c
@@ -2250,6 +2250,8 @@ static int snd_echo_resume(struct pci_dev *pci)
DE_INIT(("resume start\n"));
pci_restore_state(pci);
commpage_bak = kmalloc(sizeof(struct echoaudio), GFP_KERNEL);
+ if (commpage_bak == NULL)
+ return -ENOMEM;
commpage = chip->comm_page;
memcpy(commpage_bak, commpage, sizeof(struct comm_page));

--
1.7.0.4

2010-07-16 19:18:06

by Giuliano Pochini

Subject: Re: [PATCH 11/15] pci: echoaudio: check kmalloc() result

On Fri, 16 Jul 2010 20:15:43 +0400
Kulikov Vasiliy <[email protected]> wrote:

> If kmalloc() fails exit with -ENOMEM.
>
> Signed-off-by: Kulikov Vasiliy <[email protected]>
> ---
> sound/pci/echoaudio/echoaudio.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c
> index 668a5ec..20763dd 100644
> --- a/sound/pci/echoaudio/echoaudio.c
> +++ b/sound/pci/echoaudio/echoaudio.c
> @@ -2250,6 +2250,8 @@ static int snd_echo_resume(struct pci_dev *pci)
> DE_INIT(("resume start\n"));
> pci_restore_state(pci);
> commpage_bak = kmalloc(sizeof(struct echoaudio), GFP_KERNEL);
> + if (commpage_bak == NULL)
> + return -ENOMEM;
> commpage = chip->comm_page;
> memcpy(commpage_bak, commpage, sizeof(struct comm_page));
>

Yes, of course. Thank you.


Ack-by: Giuliano Pochini <[email protected]>


--
Giuliano.

2010-07-19 16:00:15

by Takashi Iwai

Subject: Re: [PATCH 11/15] pci: echoaudio: check kmalloc() result

At Fri, 16 Jul 2010 21:16:50 +0200,
Giuliano Pochini wrote:
>
> On Fri, 16 Jul 2010 20:15:43 +0400
> Kulikov Vasiliy <[email protected]> wrote:
>
> > If kmalloc() fails exit with -ENOMEM.
> >
> > Signed-off-by: Kulikov Vasiliy <[email protected]>
> > ---
> > sound/pci/echoaudio/echoaudio.c | 2 ++
> > 1 files changed, 2 insertions(+), 0 deletions(-)
> >
> > diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c
> > index 668a5ec..20763dd 100644
> > --- a/sound/pci/echoaudio/echoaudio.c
> > +++ b/sound/pci/echoaudio/echoaudio.c
> > @@ -2250,6 +2250,8 @@ static int snd_echo_resume(struct pci_dev *pci)
> > DE_INIT(("resume start\n"));
> > pci_restore_state(pci);
> > commpage_bak = kmalloc(sizeof(struct echoaudio), GFP_KERNEL);
> > + if (commpage_bak == NULL)
> > + return -ENOMEM;
> > commpage = chip->comm_page;
> > memcpy(commpage_bak, commpage, sizeof(struct comm_page));
> >
>
> Yes, of course. Thank you.
>
>
> Ack-by: Giuliano Pochini <[email protected]>

Applied now. Thanks.


Takashi