diff options
author | wma <wma@FreeBSD.org> | 2016-02-29 09:22:39 +0000 |
---|---|---|
committer | wma <wma@FreeBSD.org> | 2016-02-29 09:22:39 +0000 |
commit | 6dd3382ff8741c8167dd44d3f94b1c162da3be3a (patch) | |
tree | 8f473b7ed4691fe398e44ade68a0d37d22739240 | |
parent | 62517cc3146261ea135285ef32ce74057c20648a (diff) | |
download | FreeBSD-src-6dd3382ff8741c8167dd44d3f94b1c162da3be3a.zip FreeBSD-src-6dd3382ff8741c8167dd44d3f94b1c162da3be3a.tar.gz |
Fix fdt_get_mem_regions() to work with 64-bit addresses
Use u_long instead of uint32_t variables to avoid overflow
in case of PA space bigger than 32-bit.
Obtained from: Semihalf
Submitted by: Michal Stanek <mst@semihalf.com>
Sponsored by: Annapurna Labs
Approved by: cognet (mentor)
Reviewed by: andrew, br, wma
Differential revision: https://reviews.freebsd.org/D5393
-rw-r--r-- | sys/arm/arm/machdep.c | 5 | ||||
-rw-r--r-- | sys/arm/mv/mv_common.c | 3 | ||||
-rw-r--r-- | sys/dev/cesa/cesa.c | 3 | ||||
-rw-r--r-- | sys/dev/fdt/fdt_common.c | 4 | ||||
-rw-r--r-- | sys/dev/fdt/fdt_common.h | 2 | ||||
-rw-r--r-- | sys/mips/beri/beri_machdep.c | 3 | ||||
-rw-r--r-- | sys/riscv/riscv/machdep.c | 2 |
7 files changed, 13 insertions, 9 deletions
diff --git a/sys/arm/arm/machdep.c b/sys/arm/arm/machdep.c index 4e7cb70..0dd3b2b 100644 --- a/sys/arm/arm/machdep.c +++ b/sys/arm/arm/machdep.c @@ -1445,7 +1445,8 @@ initarm(struct arm_boot_params *abp) struct pv_addr kernel_l1pt; struct pv_addr dpcpu; vm_offset_t dtbp, freemempos, l2_start, lastaddr; - uint32_t memsize, l2size; + u_long memsize; + uint32_t l2size; char *env; void *kmdp; u_int l1pagetable; @@ -1714,7 +1715,7 @@ initarm(struct arm_boot_params *abp) struct mem_region mem_regions[FDT_MEM_REGIONS]; vm_paddr_t lastaddr; vm_offset_t dtbp, kernelstack, dpcpu; - uint32_t memsize; + u_long memsize; char *env; void *kmdp; int err_devmap, mem_regions_sz; diff --git a/sys/arm/mv/mv_common.c b/sys/arm/mv/mv_common.c index ec55357..d58fb39f 100644 --- a/sys/arm/mv/mv_common.c +++ b/sys/arm/mv/mv_common.c @@ -917,7 +917,8 @@ decode_win_sdram_fixup(void) { struct mem_region mr[FDT_MEM_REGIONS]; uint8_t window_valid[MV_WIN_DDR_MAX]; - int mr_cnt, memsize, err, i, j; + int mr_cnt, err, i, j; + u_long memsize; uint32_t valid_win_num = 0; /* Grab physical memory regions information from device tree. */ diff --git a/sys/dev/cesa/cesa.c b/sys/dev/cesa/cesa.c index c14f944..9c747f3 100644 --- a/sys/dev/cesa/cesa.c +++ b/sys/dev/cesa/cesa.c @@ -1641,7 +1641,8 @@ decode_win_cesa_setup(struct cesa_softc *sc) { struct mem_region availmem_regions[FDT_MEM_REGIONS]; int availmem_regions_sz; - uint32_t memsize, br, cr, i; + uint32_t br, cr, i; + u_long memsize; /* Grab physical memory regions information from DTS */ if (fdt_get_mem_regions(availmem_regions, &availmem_regions_sz, diff --git a/sys/dev/fdt/fdt_common.c b/sys/dev/fdt/fdt_common.c index c7d3397..4360fa1 100644 --- a/sys/dev/fdt/fdt_common.c +++ b/sys/dev/fdt/fdt_common.c @@ -647,12 +647,12 @@ out: } int -fdt_get_mem_regions(struct mem_region *mr, int *mrcnt, uint32_t *memsize) +fdt_get_mem_regions(struct mem_region *mr, int *mrcnt, u_long *memsize) { pcell_t reg[FDT_REG_CELLS * FDT_MEM_REGIONS]; pcell_t *regp; phandle_t memory; - uint32_t memory_size; + u_long memory_size; int addr_cells, size_cells; int i, max_size, reg_len, rv, tuple_size, tuples; diff --git a/sys/dev/fdt/fdt_common.h b/sys/dev/fdt/fdt_common.h index 3eb33c1..278244e 100644 --- a/sys/dev/fdt/fdt_common.h +++ b/sys/dev/fdt/fdt_common.h @@ -85,7 +85,7 @@ u_long fdt_data_get(void *, int); int fdt_data_to_res(pcell_t *, int, int, u_long *, u_long *); phandle_t fdt_find_compatible(phandle_t, const char *, int); phandle_t fdt_depth_search_compatible(phandle_t, const char *, int); -int fdt_get_mem_regions(struct mem_region *, int *, uint32_t *); +int fdt_get_mem_regions(struct mem_region *, int *, u_long *); int fdt_get_reserved_regions(struct mem_region *, int *); int fdt_get_phyaddr(phandle_t, device_t, int *, void **); int fdt_get_range(phandle_t, int, u_long *, u_long *); diff --git a/sys/mips/beri/beri_machdep.c b/sys/mips/beri/beri_machdep.c index 54f61ab..50d8b71 100644 --- a/sys/mips/beri/beri_machdep.c +++ b/sys/mips/beri/beri_machdep.c @@ -90,7 +90,8 @@ mips_init(void) int i; #ifdef FDT struct mem_region mr[FDT_MEM_REGIONS]; - int mr_cnt, val; + int mr_cnt; + u_long val; int j; #endif diff --git a/sys/riscv/riscv/machdep.c b/sys/riscv/riscv/machdep.c index 0c6676e..7db7f48 100644 --- a/sys/riscv/riscv/machdep.c +++ b/sys/riscv/riscv/machdep.c @@ -739,7 +739,7 @@ initriscv(struct riscv_bootparams *rvbp) vm_offset_t lastaddr; int mem_regions_sz; vm_size_t kernlen; - uint32_t memsize; + u_long memsize; caddr_t kmdp; int i; |