2019-02-03 13:32:47

by Souptick Joarder

Subject: [PATCH] media: videobuf2: Return error after allocation failure

There is no point to continuing assignemnt after memory allocation
failed, rather throw error immediately.

Signed-off-by: Souptick Joarder <[email protected]>
---
drivers/media/common/videobuf2/videobuf2-vmalloc.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/media/common/videobuf2/videobuf2-vmalloc.c b/drivers/media/common/videobuf2/videobuf2-vmalloc.c
index 6dfbd5b..d3f71e2 100644
--- a/drivers/media/common/videobuf2/videobuf2-vmalloc.c
+++ b/drivers/media/common/videobuf2/videobuf2-vmalloc.c
@@ -46,16 +46,16 @@ static void *vb2_vmalloc_alloc(struct device *dev, unsigned long attrs,

buf->size = size;
buf->vaddr = vmalloc_user(buf->size);
- buf->dma_dir = dma_dir;
- buf->handler.refcount = &buf->refcount;
- buf->handler.put = vb2_vmalloc_put;
- buf->handler.arg = buf;

if (!buf->vaddr) {
pr_debug("vmalloc of size %ld failed\n", buf->size);
kfree(buf);
return ERR_PTR(-ENOMEM);
}
+ buf->dma_dir = dma_dir;
+ buf->handler.refcount = &buf->refcount;
+ buf->handler.put = vb2_vmalloc_put;
+ buf->handler.arg = buf;

refcount_set(&buf->refcount, 1);
return buf;
--
1.9.1

2019-02-03 22:01:08

by Nicolas Dufresne

Subject: Re: [PATCH] media: videobuf2: Return error after allocation failure

Le dimanche 03 février 2019 à 19:06 +0530, Souptick Joarder a écrit :
> There is no point to continuing assignemnt after memory allocation

assignemnt -> assignment.

> failed, rather throw error immediately.
>
> Signed-off-by: Souptick Joarder <[email protected]>
> ---
> drivers/media/common/videobuf2/videobuf2-vmalloc.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/media/common/videobuf2/videobuf2-vmalloc.c b/drivers/media/common/videobuf2/videobuf2-vmalloc.c
> index 6dfbd5b..d3f71e2 100644
> --- a/drivers/media/common/videobuf2/videobuf2-vmalloc.c
> +++ b/drivers/media/common/videobuf2/videobuf2-vmalloc.c
> @@ -46,16 +46,16 @@ static void *vb2_vmalloc_alloc(struct device *dev, unsigned long attrs,
>
> buf->size = size;
> buf->vaddr = vmalloc_user(buf->size);
> - buf->dma_dir = dma_dir;
> - buf->handler.refcount = &buf->refcount;
> - buf->handler.put = vb2_vmalloc_put;
> - buf->handler.arg = buf;
>
> if (!buf->vaddr) {
> pr_debug("vmalloc of size %ld failed\n", buf->size);
> kfree(buf);
> return ERR_PTR(-ENOMEM);
> }
> + buf->dma_dir = dma_dir;
> + buf->handler.refcount = &buf->refcount;
> + buf->handler.put = vb2_vmalloc_put;
> + buf->handler.arg = buf;
>
> refcount_set(&buf->refcount, 1);
> return buf;

2019-02-04 02:05:33

by Souptick Joarder

Subject: Re: [PATCH] media: videobuf2: Return error after allocation failure

On Mon, Feb 4, 2019 at 3:25 AM Nicolas Dufresne <[email protected]> wrote:
>
> Le dimanche 03 février 2019 à 19:06 +0530, Souptick Joarder a écrit :
> > There is no point to continuing assignemnt after memory allocation
>
> assignemnt -> assignment.

Ah, type.
>
> > failed, rather throw error immediately.
> >
> > Signed-off-by: Souptick Joarder <[email protected]>
> > ---
> > drivers/media/common/videobuf2/videobuf2-vmalloc.c | 8 ++++----
> > 1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/media/common/videobuf2/videobuf2-vmalloc.c b/drivers/media/common/videobuf2/videobuf2-vmalloc.c
> > index 6dfbd5b..d3f71e2 100644
> > --- a/drivers/media/common/videobuf2/videobuf2-vmalloc.c
> > +++ b/drivers/media/common/videobuf2/videobuf2-vmalloc.c
> > @@ -46,16 +46,16 @@ static void *vb2_vmalloc_alloc(struct device *dev, unsigned long attrs,
> >
> > buf->size = size;
> > buf->vaddr = vmalloc_user(buf->size);
> > - buf->dma_dir = dma_dir;
> > - buf->handler.refcount = &buf->refcount;
> > - buf->handler.put = vb2_vmalloc_put;
> > - buf->handler.arg = buf;
> >
> > if (!buf->vaddr) {
> > pr_debug("vmalloc of size %ld failed\n", buf->size);
> > kfree(buf);
> > return ERR_PTR(-ENOMEM);
> > }
> > + buf->dma_dir = dma_dir;
> > + buf->handler.refcount = &buf->refcount;
> > + buf->handler.put = vb2_vmalloc_put;
> > + buf->handler.arg = buf;
> >
> > refcount_set(&buf->refcount, 1);
> > return buf;
>