Skip to contentSkip to conversation

drm/etnaviv: potential NULL dereference

PATCH In review Dan Carpenter 2 participants 2 messages Feb 5, 2019 – Feb 8, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/etnaviv: potential NULL dereference

The etnaviv_gem_prime_get_sg_table() is supposed to return error pointers. Otherwise it can lead to a NULL dereference when it's called from drm_gem_map_dma_buf().

Fixes 5f4a4a73f437 ("drm/etnaviv: fix gem_prime_get_sg_table to return new SG table")
---
 drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c +1 -1
index 0566171f8df2..f21529e635e3 100644
@@ -15,7 +15,7 @@ struct sg_table *etnaviv_gem_prime_get_sg_table(struct drm_gem_object *obj)
 	int npages = obj->size >> PAGE_SHIFT;
 
 	if (WARN_ON(!etnaviv_obj->pages))  /* should have already pinned! */
-		return NULL;
+		return ERR_PTR(-EINVAL);
 
 	return drm_prime_pages_to_sg(etnaviv_obj->pages, npages);
 }
Signature · 6 lines
2.17.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
reviewer Reviewed-by on v1 1/1
#1 lore raw

Am Di., 5. Feb. 2019 um 10:09 Uhr schrieb Dan Carpenter <[email protected]>:

Quoted 7 lines

The etnaviv_gem_prime_get_sg_table() is supposed to return error pointers. Otherwise it can lead to a NULL dereference when it's called from drm_gem_map_dma_buf().

Fixes 5f4a4a73f437 ("drm/etnaviv: fix gem_prime_get_sg_table to return new SG table")
Quoted 20 lines
---
 drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c +1 -2
index 0566171f8df2..f21529e635e3 100644
@@ -15,7 +15,7 @@ struct sg_table *etnaviv_gem_prime_get_sg_table(struct drm_gem_object *obj)
        int npages = obj->size >> PAGE_SHIFT;
 
        if (WARN_ON(!etnaviv_obj->pages))  /* should have already pinned! */
-               return NULL;
+               return ERR_PTR(-EINVAL);
 
        return drm_prime_pages_to_sg(etnaviv_obj->pages, npages);
 }
--

2.17.1

Signature · 9 lines
greets
--
Christian Gmeiner, MSc

https://christian-gmeiner.info
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel