drm/msm: return an error pointer in msm_gem_prime_get_sg_table()
[ Upstream commitcf575e3161
] 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:ac45146733
("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>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
22d8424913
commit
ab888b1a9a
@ -17,7 +17,7 @@ struct sg_table *msm_gem_prime_get_sg_table(struct drm_gem_object *obj)
|
|||||||
int npages = obj->size >> PAGE_SHIFT;
|
int npages = obj->size >> PAGE_SHIFT;
|
||||||
|
|
||||||
if (WARN_ON(!msm_obj->pages)) /* should have already pinned! */
|
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);
|
return drm_prime_pages_to_sg(msm_obj->pages, npages);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user