Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06532750 authored by Eric Auger's avatar Eric Auger Committed by Christoph Hellwig
Browse files

dma-mapping: use dma_get_mask in dma_addressing_limited 



We currently have cases where the dma_addressing_limited() gets
called with dma_mask unset. This causes a NULL pointer dereference.

Use dma_get_mask() accessor to prevent the crash.

Fixes: b8664554 ("dma-mapping: add a dma_addressing_limited helper")
Signed-off-by: default avatarEric Auger <eric.auger@redhat.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 7b5cf701

include/linux/dma-mapping.h

+2 −2
Original line number Diff line number Diff line
@@ -689,7 +689,7 @@ static inline int dma_coerce_mask_and_coherent(struct device *dev, u64 mask) 
 */

static inline bool dma_addressing_limited(struct device *dev)

{

	return min_not_zero(*dev->dma_mask, dev->bus_dma_mask) <

	return min_not_zero(dma_get_mask(dev), dev->bus_dma_mask) <

			    dma_get_required_mask(dev);

}