Skip to contentSkip to conversation

drm: prime: Potential Oops in drm_gem_map_dma_buf()

PATCH In review Dan Carpenter 2 participants 2 messages Sep 28, 2020

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

PATCH 1/1 drm: prime: Potential Oops in drm_gem_map_dma_buf()

This code doesn't check if the call to ->get_sg_table() fails so it could dereference an error pointer and Oops.

Fixes c614d7e66c6a ("drm: remove prime sg_table caching")
---
 drivers/gpu/drm/drm_prime.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/gpu/drm/drm_prime.c +3 -0
index 11fe9ff76fd5..1e2c7ff63f16 100644
@@ -627,6 +627,9 @@ struct sg_table *drm_gem_map_dma_buf(struct dma_buf_attachment *attach,
 	else
 		sgt = obj->dev->driver->gem_prime_get_sg_table(obj);
 
+	if (IS_ERR(sgt))
+		return sgt;
+
 	ret = dma_map_sgtable(attach->dev, sgt, dir,
 			      DMA_ATTR_SKIP_CPU_SYNC);
 	if (ret) {
Signature · 1 line
2.28.0
#1 lore raw

Hi Dan,

Am 28.09.20 um 11:07 schrieb Dan Carpenter:

Quoted 5 lines

This code doesn't check if the call to ->get_sg_table() fails so it could dereference an error pointer and Oops.

Fixes c614d7e66c6a ("drm: remove prime sg_table caching")

this patch is based on outdated code, please take a look at current drm-misc-next.

The gem_prime_get_sg_table callback was removed from the driver functions and the missing error check already fixed.

Regards,
Christian.

Quoted 18 lines
---
  drivers/gpu/drm/drm_prime.c | 3 +++
  1 file changed, 3 insertions(+)
drivers/gpu/drm/drm_prime.c +3 -0
index 11fe9ff76fd5..1e2c7ff63f16 100644
@@ -627,6 +627,9 @@ struct sg_table *drm_gem_map_dma_buf(struct dma_buf_attachment *attach,
  	else
  		sgt = obj->dev->driver->gem_prime_get_sg_table(obj);
 
+	if (IS_ERR(sgt))
+		return sgt;
+
  	ret = dma_map_sgtable(attach->dev, sgt, dir,
  			      DMA_ATTR_SKIP_CPU_SYNC);
  	if (ret) {