u-boot/lib/addr_map.c
Dan Carpenter 7dd06b1621 addrmap: Fix off by one in addrmap_set_entry()
The > comparison needs to be changed to >= to prevent an out of bounds
write on th next line.

Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
2023-10-30 15:32:49 -04:00

68 lines
1.3 KiB
C

// SPDX-License-Identifier: GPL-2.0
/*
* Copyright 2008 Freescale Semiconductor, Inc.
*/
#include <common.h>
#include <addr_map.h>
#include <mapmem.h>
struct addrmap address_map[CONFIG_SYS_NUM_ADDR_MAP];
phys_addr_t addrmap_virt_to_phys(void * vaddr)
{
int i;
for (i = 0; i < CONFIG_SYS_NUM_ADDR_MAP; i++) {
u64 base, upper, addr;
if (address_map[i].size == 0)
continue;
addr = map_to_sysmem(vaddr);
base = (u64)(address_map[i].vaddr);
upper = (u64)(address_map[i].size) + base - 1;
if (addr >= base && addr <= upper) {
return addr - address_map[i].vaddr + address_map[i].paddr;
}
}
return (phys_addr_t)(~0);
}
void *addrmap_phys_to_virt(phys_addr_t paddr)
{
int i;
for (i = 0; i < CONFIG_SYS_NUM_ADDR_MAP; i++) {
phys_addr_t base, upper;
if (address_map[i].size == 0)
continue;
base = address_map[i].paddr;
upper = address_map[i].size + base - 1;
if (paddr >= base && paddr <= upper) {
phys_addr_t offset;
offset = address_map[i].paddr - address_map[i].vaddr;
return map_sysmem(paddr - offset, 0);
}
}
return (void *)(~0);
}
void addrmap_set_entry(unsigned long vaddr, phys_addr_t paddr,
phys_size_t size, int idx)
{
if (idx >= CONFIG_SYS_NUM_ADDR_MAP)
return;
address_map[idx].vaddr = vaddr;
address_map[idx].paddr = paddr;
address_map[idx].size = size;
}