summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/arm/mv/mv_common.c3
-rw-r--r--sys/arm/mv/mv_pci.c5
2 files changed, 3 insertions, 5 deletions
diff --git a/sys/arm/mv/mv_common.c b/sys/arm/mv/mv_common.c
index d62efc4..d92f88d 100644
--- a/sys/arm/mv/mv_common.c
+++ b/sys/arm/mv/mv_common.c
@@ -1939,8 +1939,7 @@ fdt_get_ranges(const char *nodename, void *buf, int size, int *tuples,
if (tuples_count <= 0)
return (ERANGE);
- if (fdt_ranges_verify(buf, tuples_count, par_addr_cells,
- addr_cells, size_cells) != 0)
+ if (par_addr_cells > 2 || addr_cells > 2 || size_cells > 2)
return (ERANGE);
*tuples = tuples_count;
diff --git a/sys/arm/mv/mv_pci.c b/sys/arm/mv/mv_pci.c
index 8ac6c76..061eaff 100644
--- a/sys/arm/mv/mv_pci.c
+++ b/sys/arm/mv/mv_pci.c
@@ -180,8 +180,7 @@ mv_pci_ranges_decode(phandle_t node, struct mv_pci_range *io_space,
rangesptr += offset_cells;
}
- if (fdt_data_verify((void *)rangesptr, par_addr_cells -
- offset_cells)) {
+ if ((par_addr_cells - offset_cells) > 2) {
rv = ERANGE;
goto out;
}
@@ -189,7 +188,7 @@ mv_pci_ranges_decode(phandle_t node, struct mv_pci_range *io_space,
par_addr_cells - offset_cells);
rangesptr += par_addr_cells - offset_cells;
- if (fdt_data_verify((void *)rangesptr, size_cells)) {
+ if (size_cells > 2)
rv = ERANGE;
goto out;
}
OpenPOWER on IntegriCloud