Merge tag 'devicetree-fixes-for-4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux

Pull Devicetree fixes from Rob Herring:

 - Add validation of NUMA distance map to prevent crashes with bad map

 - Fix setting of dma_mask

* tag 'devicetree-fixes-for-4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  of, numa: Validate some distance map rules
  of/device: Really only set bus DMA mask when appropriate

2 files changed, 10 insertions, 3 deletions

diff --git a/drivers/of/device.c b/drivers/of/device.c
index 0f27fad9fe94..5592437bb3d1 100644
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -149,9 +149,11 @@ int of_dma_configure(struct device *dev, struct device_node *np, bool force_dma)
          * set by the driver.
          */
         mask = DMA_BIT_MASK(ilog2(dma_addr + size - 1) + 1);
-        dev->bus_dma_mask = mask;
         dev->coherent_dma_mask &= mask;
         *dev->dma_mask &= mask;
+        /* ...but only set bus mask if we found valid dma-ranges earlier */
+        if (!ret)
+                dev->bus_dma_mask = mask;
 
         coherent = of_dma_is_coherent(np);
         dev_dbg(dev, "device is%sdma coherent\n",
diff --git a/drivers/of/of_numa.c b/drivers/of/of_numa.c
index 35c64a4295e0..fe6b13608e51 100644
--- a/drivers/of/of_numa.c
+++ b/drivers/of/of_numa.c
@@ -104,9 +104,14 @@ static int __init of_numa_parse_distance_map_v1(struct device_node *map)
                 distance = of_read_number(matrix, 1);
                 matrix++;
 
+                if ((nodea == nodeb && distance != LOCAL_DISTANCE) ||
+                    (nodea != nodeb && distance <= LOCAL_DISTANCE)) {
+                        pr_err("Invalid distance[node%d -> node%d] = %d\n",
+                               nodea, nodeb, distance);
+                        return -EINVAL;
+                }
+
                 numa_set_distance(nodea, nodeb, distance);
-                pr_debug("distance[node%d -> node%d] = %d\n",
-                         nodea, nodeb, distance);
 
                 /* Set default distance of node B->A same as A->B */
                 if (nodeb > nodea)