dma-mapping: Protect dma_addressing_limited against NULL dma_mask
PATCH 1/1 dma-mapping: Protect dma_addressing_limited against NULL dma_mask
There are cases when the helper gets called when the dma_mask is NULL.
This is observed when running virtio-block-pci devices protected by a virtual IOMMU. Guest crashes with NULL pointer dereference.
Fixes b866455423e0 ("dma-mapping: add a dma_addressing_limited helper")
Signed-off-by Eric Auger <[email protected]>
--- include/linux/dma-mapping.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/dma-mapping.h +2 -2
@@ -689,8 +689,8 @@ 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) < -dma_get_required_mask (dev); +return dev->dma_mask ?min_not_zero (*dev->dma_mask, dev->bus_dma_mask) < +dma_get_required_mask (dev) : false; }#ifdef CONFIG_ARCH_HAS_SETUP_DMA_OPS
Signature · 1 line
2.20.1
I posted a fix that takes care of this in SCSI this morning:
https://marc.info/?l=linux-scsi&m=156378725427719&w=2
I suspect for virtio-blk we should do the same.
include/linux/dma-mapping.h static inline int dma_coerce_mask_and_coherent(struct device *dev, u64 mask) · line 693
Quoted 6 lines
static inline bool
dma_addressing_limited(struct device *dev){include/linux/dma-mapping.h +2
-2-return min_not_zero (*dev->dma_mask, dev->bus_dma_mask) < -dma_get_required_mask (dev); +return dev->dma_mask ?min_not_zero (*dev->dma_mask, dev->bus_dma_mask) < +dma_get_required_mask (dev) : false;
But to be on the safe side we could still do an early return here, but it should have a WARN_ON_ONCE.