drm: Replace NULL with error value in drm_prime_pages_to_sg
Subsystems (3)
PATCH v2 1/1 drm: Replace NULL with error value in drm_prime_pages_to_sg
From: Oleksandr Andrushchenko <[email protected]>
Dan Carpenter has reported that there is the following static checker warning:
drivers/gpu/drm/drm_prime.c:317 drm_gem_map_dma_buf() warn: 'sgt' can also be NULL
314 sgt = obj->dev->driver->gem_prime_get_sg_table(obj);
315
316 if (!IS_ERR(sgt)) {
317 if (!dma_map_sg_attrs(attach->dev, sgt->sgl, sgt->nents, dir,
Problematic functions are xen_drm_front_gem_get_sg_table and drm_gem_cma_prime_get_sg_table. Fix those by replacing NULL with error value.
--- drivers/gpu/drm/drm_gem_cma_helper.c | 2 +- drivers/gpu/drm/xen/xen_drm_front_gem.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_gem_cma_helper.c +1 -1
@@ -436,7 +436,7 @@ struct sg_table *drm_gem_cma_prime_get_sg_table(struct drm_gem_object *obj) sgt =kzalloc (sizeof (*sgt),GFP_KERNEL );if (!sgt) -return NULL ; +return ERR_PTR (-ENOMEM ); ret =dma_get_sgtable (obj->dev->dev, sgt, cma_obj->vaddr, cma_obj->paddr, obj->size);
drivers/gpu/drm/xen/xen_drm_front_gem.c +1 -1
@@ -179,7 +179,7 @@ struct sg_table *xen_drm_front_gem_get_sg_table(struct drm_gem_object *gem_obj)struct xen_gem_object *xen_obj =to_xen_gem_obj (gem_obj);if (!xen_obj->pages) -return NULL ; +return ERR_PTR (-ENOMEM );return drm_prime_pages_to_sg (xen_obj->pages, xen_obj->num_pages); }
Signature · 1 line
2.17.1
Quoted 12 lines · Oleksandr Andrushchenko
From: Oleksandr Andrushchenko <[email protected]>
Dan Carpenter has reported that there is the following static checker warning:
drivers/gpu/drm/drm_prime.c:317 drm_gem_map_dma_buf() warn: 'sgt' can also be NULL314 sgt =
obj->dev->driver->gem_prime_get_sg_table(obj);
315
316 if (!IS_ERR(sgt)) {
317 if (!dma_map_sg_attrs(attach->dev,sgt->sgl,sgt->nents, dir,
Quoted 5 lines
Problematic functions are
xen_drm_front_gem_get_sg_tableanddrm_gem_cma_prime_get_sg_table. Fix those by replacing NULL with error value.Signed-off-by Oleksandr Andrushchenko <[email protected]>Reported-by Dan Carpenter <[email protected]>
Dan, could you please review?
Quoted 10 lines
--- drivers/gpu/drm/drm_gem_cma_helper.c | 2 +- drivers/gpu/drm/xen/xen_drm_front_gem.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/drm_gem_cma_helper.c +0
-0
drivers/gpu/drm/drm_gem_cma_helper.c struct sg_table *drm_gem_cma_prime_get_sg_table(struct drm_gem_object *obj) · line 440
Quoted 6 lines
drivers/gpu/drm/drm_gem_cma_helper.c +1
-1@@ -436,7 +436,7 @@ struct sg_table *drm_gem_cma_prime_get_sg_table(struct drm_gem_object *obj) sgt =kzalloc (sizeof (*sgt),GFP_KERNEL );if (!sgt) -return NULL ; +return ERR_PTR (-ENOMEM );
Forgot to patch CMA helpers, thus v2
Quoted 7 lines
drivers/gpu/drm/drm_gem_cma_helper.c +0
-0ret =dma_get_sgtable (obj->dev->dev, sgt, cma_obj->vaddr, cma_obj->paddr, obj->size);drivers/gpu/drm/xen/xen_drm_front_gem.c +0
-0
drivers/gpu/drm/xen/xen_drm_front_gem.c struct sg_table *xen_drm_front_gem_get_sg_table(struct drm_gem_object *gem_obj) · line 185
Quoted 8 lines
drivers/gpu/drm/xen/xen_drm_front_gem.c +1
-1@@ -179,7 +179,7 @@ struct sg_table *xen_drm_front_gem_get_sg_table(struct drm_gem_object *gem_obj)struct xen_gem_object *xen_obj =to_xen_gem_obj (gem_obj);if (!xen_obj->pages) -return NULL ; +return ERR_PTR (-ENOMEM );return drm_prime_pages_to_sg (xen_obj->pages, xen_obj->num_pages); }
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 12 lines · Oleksandr Andrushchenko
From: Oleksandr Andrushchenko <[email protected]>
Dan Carpenter has reported that there is the following static checker warning:
drivers/gpu/drm/drm_prime.c:317 drm_gem_map_dma_buf() warn: 'sgt' can also be NULL314 sgt =
obj->dev->driver->gem_prime_get_sg_table(obj);
315
316 if (!IS_ERR(sgt)) {
317 if (!dma_map_sg_attrs(attach->dev,sgt->sgl,sgt->nents, dir,
Quoted 5 lines
Problematic functions are
xen_drm_front_gem_get_sg_tableanddrm_gem_cma_prime_get_sg_table. Fix those by replacing NULL with error value.Signed-off-by Oleksandr Andrushchenko <[email protected]>Reported-by Dan Carpenter <[email protected]>
Dan, could you please review?
Quoted 10 lines
--- drivers/gpu/drm/drm_gem_cma_helper.c | 2 +- drivers/gpu/drm/xen/xen_drm_front_gem.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/drm_gem_cma_helper.c +0
-0
drivers/gpu/drm/drm_gem_cma_helper.c struct sg_table *drm_gem_cma_prime_get_sg_table(struct drm_gem_object *obj) · line 440
Quoted 6 lines
drivers/gpu/drm/drm_gem_cma_helper.c +1
-1@@ -436,7 +436,7 @@ struct sg_table *drm_gem_cma_prime_get_sg_table(struct drm_gem_object *obj) sgt =kzalloc (sizeof (*sgt),GFP_KERNEL );if (!sgt) -return NULL ; +return ERR_PTR (-ENOMEM );
Forgot to patch CMA helpers, thus v2
Quoted 7 lines
drivers/gpu/drm/drm_gem_cma_helper.c +0
-0ret =dma_get_sgtable (obj->dev->dev, sgt, cma_obj->vaddr, cma_obj->paddr, obj->size);drivers/gpu/drm/xen/xen_drm_front_gem.c +0
-0
drivers/gpu/drm/xen/xen_drm_front_gem.c struct sg_table *xen_drm_front_gem_get_sg_table(struct drm_gem_object *gem_obj) · line 185
Quoted 8 lines
drivers/gpu/drm/xen/xen_drm_front_gem.c +1
-1@@ -179,7 +179,7 @@ struct sg_table *xen_drm_front_gem_get_sg_table(struct drm_gem_object *gem_obj)struct xen_gem_object *xen_obj =to_xen_gem_obj (gem_obj);if (!xen_obj->pages) -return NULL ; +return ERR_PTR (-ENOMEM );return drm_prime_pages_to_sg (xen_obj->pages, xen_obj->num_pages); }
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 9 lines · Oleksandr Andrushchenko
drivers/gpu/drm/drm_gem_cma_helper.c | 2 +- drivers/gpu/drm/xen/xen_drm_front_gem.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/drm_gem_cma_helper.c +0
-0
drivers/gpu/drm/drm_gem_cma_helper.c struct sg_table *drm_gem_cma_prime_get_sg_table(struct drm_gem_object *obj) · line 442
Quoted 8 lines
drivers/gpu/drm/drm_gem_cma_helper.c +1
-1@@ -436,7 +436,7 @@ struct sg_table *drm_gem_cma_prime_get_sg_table(struct drm_gem_object *obj) sgt =kzalloc (sizeof (*sgt),GFP_KERNEL );if (!sgt) -return NULL ; +return ERR_PTR (-ENOMEM ); ret =dma_get_sgtable (obj->dev->dev, sgt, cma_obj->vaddr, cma_obj->paddr, obj->size);
If dma_get_sgtable() fails then we return NULL.
Fix that and it should be good.
regards,
dan carpenter
Quoted 9 lines · Oleksandr Andrushchenko
drivers/gpu/drm/drm_gem_cma_helper.c | 2 +- drivers/gpu/drm/xen/xen_drm_front_gem.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/drm_gem_cma_helper.c +0
-0
drivers/gpu/drm/drm_gem_cma_helper.c struct sg_table *drm_gem_cma_prime_get_sg_table(struct drm_gem_object *obj) · line 442
Quoted 8 lines
drivers/gpu/drm/drm_gem_cma_helper.c +1
-1@@ -436,7 +436,7 @@ struct sg_table *drm_gem_cma_prime_get_sg_table(struct drm_gem_object *obj) sgt =kzalloc (sizeof (*sgt),GFP_KERNEL );if (!sgt) -return NULL ; +return ERR_PTR (-ENOMEM ); ret =dma_get_sgtable (obj->dev->dev, sgt, cma_obj->vaddr, cma_obj->paddr, obj->size);
If dma_get_sgtable() fails then we return NULL.
Fix that and it should be good.
regards,
dan carpenter
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Oleksandr Andrushchenko
maintainerQuoted 16 lines · Dan Carpenter
Quoted 15 lines · Oleksandr Andrushchenko
drivers/gpu/drm/drm_gem_cma_helper.c | 2 +- drivers/gpu/drm/xen/xen_drm_front_gem.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/drm_gem_cma_helper.c +1
-1@@ -436,7 +436,7 @@ struct sg_table *drm_gem_cma_prime_get_sg_table(struct drm_gem_object *obj) sgt =kzalloc (sizeof (*sgt),GFP_KERNEL );if (!sgt) -return NULL ; +return ERR_PTR (-ENOMEM );
Quoted 6 lines
drivers/gpu/drm/drm_gem_cma_helper.c struct sg_table *drm_gem_cma_prime_get_sg_table(struct drm_gem_object *obj) · line 442
Quoted 2 lines
drivers/gpu/drm/drm_gem_cma_helper.c +0
-0ret =dma_get_sgtable (obj->dev->dev, sgt, cma_obj->vaddr, cma_obj->paddr, obj->size);If
dma_get_sgtable()fails then we return NULL.Fix that and it should be good.
You mean I can put your r-b with that fixed?
Quoted 3 lines
regards,
dan carpenter
Oleksandr Andrushchenko
maintainerQuoted 16 lines · Dan Carpenter
Quoted 15 lines · Oleksandr Andrushchenko
drivers/gpu/drm/drm_gem_cma_helper.c | 2 +- drivers/gpu/drm/xen/xen_drm_front_gem.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/drm_gem_cma_helper.c +1
-1@@ -436,7 +436,7 @@ struct sg_table *drm_gem_cma_prime_get_sg_table(struct drm_gem_object *obj) sgt =kzalloc (sizeof (*sgt),GFP_KERNEL );if (!sgt) -return NULL ; +return ERR_PTR (-ENOMEM );
Quoted 6 lines
drivers/gpu/drm/drm_gem_cma_helper.c struct sg_table *drm_gem_cma_prime_get_sg_table(struct drm_gem_object *obj) · line 442
Quoted 2 lines
drivers/gpu/drm/drm_gem_cma_helper.c +0
-0ret =dma_get_sgtable (obj->dev->dev, sgt, cma_obj->vaddr, cma_obj->paddr, obj->size);If
dma_get_sgtable()fails then we return NULL.Fix that and it should be good.
You mean I can put your r-b with that fixed?
Quoted 3 lines
regards,
dan carpenter
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 21 lines · Oleksandr Andrushchenko
Quoted 20 lines · Dan Carpenter
Quoted 9 lines · Oleksandr Andrushchenko
drivers/gpu/drm/drm_gem_cma_helper.c | 2 +-
drivers/gpu/drm/xen/xen_drm_front_gem.c| 2 +-2 files changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/drm_gem_cma_helper.c +0
-0drivers/gpu/drm/drm_gem_cma_helper.c struct sg_table · line 441
Quoted 7 lines
drivers/gpu/drm/drm_gem_cma_helper.c +1
-1@@ -436,7 +436,7 @@ struct sg_table *drm_gem_cma_prime_get_sg_table(struct drm_gem_object *obj) sgt = kzalloc(sizeof(*sgt), GFP_KERNEL); if (!sgt) - return NULL; + return ERR_PTR(-ENOMEM); ret = dma_get_sgtable(obj->dev->dev, sgt, cma_obj->vaddr, cma_obj->paddr, obj->size);If
dma_get_sgtable()fails then we return NULL.
Quoted 2 lines
Quoted 1 line
Fix that and it should be good.
You mean I can put your r-b with that fixed?
ping
Quoted 4 lines
Quoted 3 lines
regards,
dan carpenter
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 21 lines · Oleksandr Andrushchenko
Quoted 20 lines · Dan Carpenter
Quoted 9 lines · Oleksandr Andrushchenko
drivers/gpu/drm/drm_gem_cma_helper.c | 2 +-
drivers/gpu/drm/xen/xen_drm_front_gem.c| 2 +-2 files changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/drm_gem_cma_helper.c +0
-0drivers/gpu/drm/drm_gem_cma_helper.c struct sg_table · line 441
Quoted 7 lines
drivers/gpu/drm/drm_gem_cma_helper.c +1
-1@@ -436,7 +436,7 @@ struct sg_table *drm_gem_cma_prime_get_sg_table(struct drm_gem_object *obj) sgt = kzalloc(sizeof(*sgt), GFP_KERNEL); if (!sgt) - return NULL; + return ERR_PTR(-ENOMEM); ret = dma_get_sgtable(obj->dev->dev, sgt, cma_obj->vaddr, cma_obj->paddr, obj->size);If
dma_get_sgtable()fails then we return NULL.
Quoted 2 lines
Quoted 1 line
Fix that and it should be good.
You mean I can put your r-b with that fixed?
ping
Quoted 4 lines
Quoted 3 lines
regards,
dan carpenter
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 23 lines · Oleksandr Andrushchenko
Quoted 22 lines · Oleksandr Andrushchenko
Quoted 21 lines · Dan Carpenter
Quoted 10 lines · Oleksandr Andrushchenko
drivers/gpu/drm/drm_gem_cma_helper.c | 2 +-
drivers/gpu/drm/xen/xen_drm_front_gem.c| 2 +-2 files changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/drm_gem_cma_helper.c +0
-0drivers/gpu/drm/drm_gem_cma_helper.c struct sg_table · line 441
Quoted 7 lines
drivers/gpu/drm/drm_gem_cma_helper.c +1
-1@@ -436,7 +436,7 @@ struct sg_table *drm_gem_cma_prime_get_sg_table(struct drm_gem_object *obj) sgt = kzalloc(sizeof(*sgt), GFP_KERNEL); if (!sgt) - return NULL; + return ERR_PTR(-ENOMEM); ret = dma_get_sgtable(obj->dev->dev, sgt, cma_obj->vaddr, cma_obj->paddr, obj->size);If
dma_get_sgtable()fails then we return NULL.
Quoted 3 lines
Quoted 2 lines
Quoted 1 line
Fix that and it should be good.
You mean I can put your r-b with that fixed?
ping
Yeah. Send the v2 patch and I'll review it.
regards,
dan carpenter
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 23 lines · Oleksandr Andrushchenko
Quoted 22 lines · Oleksandr Andrushchenko
Quoted 21 lines · Dan Carpenter
Quoted 10 lines · Oleksandr Andrushchenko
drivers/gpu/drm/drm_gem_cma_helper.c | 2 +-
drivers/gpu/drm/xen/xen_drm_front_gem.c| 2 +-2 files changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/drm_gem_cma_helper.c +0
-0drivers/gpu/drm/drm_gem_cma_helper.c struct sg_table · line 441
Quoted 7 lines
drivers/gpu/drm/drm_gem_cma_helper.c +1
-1@@ -436,7 +436,7 @@ struct sg_table *drm_gem_cma_prime_get_sg_table(struct drm_gem_object *obj) sgt = kzalloc(sizeof(*sgt), GFP_KERNEL); if (!sgt) - return NULL; + return ERR_PTR(-ENOMEM); ret = dma_get_sgtable(obj->dev->dev, sgt, cma_obj->vaddr, cma_obj->paddr, obj->size);If
dma_get_sgtable()fails then we return NULL.
Quoted 3 lines
Quoted 2 lines
Quoted 1 line
Fix that and it should be good.
You mean I can put your r-b with that fixed?
ping
Yeah. Send the v2 patch and I'll review it.
regards,
dan carpenter
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel