Skip to contentSkip to conversation

dma-direct: don't crash on device without dma_mask

PATCH In review Christoph Hellwig 2 participants 2 messages May 29, 2018 – May 30, 2018 1 message not in the archive Library code

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dma-direct: don't crash on device without dma_mask

Print a useful warning instead.

---
 lib/dma-direct.c | 7 +++++++
 1 file changed, 7 insertions(+)
lib/dma-direct.c +7 -0
index a48f94eff62e..8be8106270c2 100644
@@ -34,6 +34,13 @@ check_addr(struct device *dev, dma_addr_t dma_addr, size_t size,
 		const char *caller)
 {
 	if (unlikely(dev && !dma_capable(dev, dma_addr, size))) {
+		if (!dev->dma_mask) {
+			dev_err(dev,
+				"%s: call on device without dma_mask\n",
+				caller);
+			return false;
+		}
+
 		if (*dev->dma_mask >= DMA_BIT_MASK(32)) {
 			dev_err(dev,
 				"%s: overflow %pad+%zu of device mask %llx\n",
Signature · 1 line
2.17.0

A message that is not in the archive (sent off-list or not yet received): [email protected]

Tested-by
#2 lore raw
Quoted 4 lines · Christoph Hellwig

Print a useful warning instead.

Thanks.

Quoted 23 lines
---
 lib/dma-direct.c | 7 +++++++
 1 file changed, 7 insertions(+)
lib/dma-direct.c +7 -0
index a48f94eff62e..8be8106270c2 100644
@@ -34,6 +34,13 @@ check_addr(struct device *dev, dma_addr_t dma_addr, size_t size,
 		const char *caller)
 {
 	if (unlikely(dev && !dma_capable(dev, dma_addr, size))) {
+		if (!dev->dma_mask) {
+			dev_err(dev,
+				"%s: call on device without dma_mask\n",
+				caller);
+			return false;
+		}
+
 		if (*dev->dma_mask >= DMA_BIT_MASK(32)) {
 			dev_err(dev,
 				"%s: overflow %pad+%zu of device mask %llx\n",