drm: Replace NULL with error value in drm_prime_pages_to_sg
Subsystems (3)
PATCH v3 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 | 4 ++-- drivers/gpu/drm/xen/xen_drm_front_gem.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/drm_gem_cma_helper.c +2 -2
@@ -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);
@@ -447,7 +447,7 @@ struct sg_table *drm_gem_cma_prime_get_sg_table(struct drm_gem_object *obj) out:kfree (sgt); -return NULL ; +return ERR_PTR (ret); }EXPORT_SYMBOL_GPL (drm_gem_cma_prime_get_sg_table);
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 · 6 lines
2.18.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
regards,
dan carpenter
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
regards,
dan carpenter
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 1 line · Dan Carpenter
Reviewed-by Dan Carpenter <[email protected]>
Thank you,
if nobody objects I'll push it to drm-misc-next next Monday
Quoted 3 lines
regards,
dan carpenter
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 1 line · Dan Carpenter
Reviewed-by Dan Carpenter <[email protected]>
Thank you,
if nobody objects I'll push it to drm-misc-next next Monday
Quoted 3 lines
regards,
dan carpenter
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 5 lines · Dan Carpenter
Reviewed-by Dan Carpenter <[email protected]>regards,
dan carpenter
Applied to drm-misc-next
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Oleksandr Andrushchenko
AppliedQuoted 5 lines · Dan Carpenter
Reviewed-by Dan Carpenter <[email protected]>regards,
dan carpenter
Applied to drm-misc-next
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel