Эх сурвалжийг харах

udmabuf: fix error code in map_udmabuf()

We accidentally forgot to set "ret" on this error path so it means we
return NULL instead of an error pointer.  The caller checks for NULL and
changes it to an error pointer so it doesn't cause an issue at run time.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20180914065615.GA12043@mwanda
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Dan Carpenter 7 жил өмнө
parent
commit
6f19eb21a2

+ 3 - 1
drivers/dma-buf/udmabuf.c

@@ -61,8 +61,10 @@ static struct sg_table *map_udmabuf(struct dma_buf_attachment *at,
 					GFP_KERNEL);
 					GFP_KERNEL);
 	if (ret < 0)
 	if (ret < 0)
 		goto err;
 		goto err;
-	if (!dma_map_sg(at->dev, sg->sgl, sg->nents, direction))
+	if (!dma_map_sg(at->dev, sg->sgl, sg->nents, direction)) {
+		ret = -EINVAL;
 		goto err;
 		goto err;
+	}
 	return sg;
 	return sg;
 
 
 err:
 err: