diff options
| author | Eric Auger <eric.auger@redhat.com> | 2019-07-22 19:51:49 +0300 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2019-07-23 18:43:58 +0300 |
| commit | 06532750010e06dd4b6d69983773677df7fc5291 (patch) | |
| tree | 1405f8086f5465615024e5447062ead12f80ae7e /include/linux | |
| parent | 7b5cf701ea9c395c792e2a7e3b7caf4c68b87721 (diff) | |
| download | linux-06532750010e06dd4b6d69983773677df7fc5291.tar.xz | |
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: b866455423e0 ("dma-mapping: add a dma_addressing_limited helper")
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/dma-mapping.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index e11b115dd0e4..f7d1eea32c78 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -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 min_not_zero(dma_get_mask(dev), dev->bus_dma_mask) < + dma_get_required_mask(dev); } #ifdef CONFIG_ARCH_HAS_SETUP_DMA_OPS |