| From 18757da828c993a8c58ff9ddfb0e25892dc23cb3 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 5 May 2022 13:28:05 +0300 |
| Subject: drm/msm: return an error pointer in msm_gem_prime_get_sg_table() |
| |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| |
| [ Upstream commit cf575e31611eb6dccf08fad02e57e35b2187704d ] |
| |
| The msm_gem_prime_get_sg_table() needs to return error pointers on |
| error. This is called from drm_gem_map_dma_buf() and returning a |
| NULL will lead to a crash in that function. |
| |
| Fixes: ac45146733b0 ("drm/msm: fix msm_gem_prime_get_sg_table()") |
| Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> |
| Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> |
| Patchwork: https://patchwork.freedesktop.org/patch/485023/ |
| Link: https://lore.kernel.org/r/YnOmtS5tfENywR9m@kili |
| Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/msm/msm_gem_prime.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/gpu/drm/msm/msm_gem_prime.c b/drivers/gpu/drm/msm/msm_gem_prime.c |
| index 13403c6da6c7..7e4664968106 100644 |
| --- a/drivers/gpu/drm/msm/msm_gem_prime.c |
| +++ b/drivers/gpu/drm/msm/msm_gem_prime.c |
| @@ -26,7 +26,7 @@ struct sg_table *msm_gem_prime_get_sg_table(struct drm_gem_object *obj) |
| int npages = obj->size >> PAGE_SHIFT; |
| |
| if (WARN_ON(!msm_obj->pages)) /* should have already pinned! */ |
| - return NULL; |
| + return ERR_PTR(-ENOMEM); |
| |
| return drm_prime_pages_to_sg(msm_obj->pages, npages); |
| } |
| -- |
| 2.35.1 |
| |
