* [PATCH] drm/etnaviv: potential NULL dereference
@ 2019-02-05 9:08 Dan Carpenter
2019-02-08 9:52 ` Christian Gmeiner
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2019-02-05 9:08 UTC (permalink / raw)
To: Lucas Stach
Cc: David Airlie, kernel-janitors, etnaviv, dri-devel, Russell King
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")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
index 0566171f8df2..f21529e635e3 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
@@ -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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/etnaviv: potential NULL dereference
2019-02-05 9:08 [PATCH] drm/etnaviv: potential NULL dereference Dan Carpenter
@ 2019-02-08 9:52 ` Christian Gmeiner
0 siblings, 0 replies; 2+ messages in thread
From: Christian Gmeiner @ 2019-02-08 9:52 UTC (permalink / raw)
To: Dan Carpenter
Cc: David Airlie, kernel-janitors, The etnaviv authors,
DRI mailing list, Russell King
Am Di., 5. Feb. 2019 um 10:09 Uhr schrieb Dan Carpenter
<dan.carpenter@oracle.com>:
>
> 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")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
> ---
> drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
> index 0566171f8df2..f21529e635e3 100644
> --- a/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
> +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
> @@ -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
>
--
greets
--
Christian Gmeiner, MSc
https://christian-gmeiner.info
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-02-08 9:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-05 9:08 [PATCH] drm/etnaviv: potential NULL dereference Dan Carpenter
2019-02-08 9:52 ` Christian Gmeiner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox