kata-containers/s390-tools
1
0
Fork 0
mirror of https://github.com/ibm-s390-linux/s390-tools.git synced 2026-08-05 02:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

zdump/dfi_mem_chunk: Validate parameters passed to dfi_mem_phys_read()

Browse Source 
To prevent segmentation faults when the function dfi_mem_phys_read() is
given invalid parameters, check that the given memory range falls within
a known physical memory chunk, just like it is done for dfi_mem_virt_read().

Signed-off-by: Alexander Egorenkov <egorenar@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
Alexander Egorenkov
2021-10-11 12:27:32 +02:00
committed by Jan Höppner
parent 40d4aa38e9
commit 6ece595532
3 changed files with 45 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zdump/dfi.c
+2 -4
View File
@@ -613,12 +613,10 @@ static void kdump_init(void)
util_log_print(UTIL_LOG_TRACE, "DFI kdump initialization\n");
if (!dfi_mem_range_valid(0x10418, sizeof(base)))
if (dfi_mem_phys_read(0x10418, &base, sizeof(base)))
return;
if (!dfi_mem_range_valid(0x10420, sizeof(size)))
if (dfi_mem_phys_read(0x10420, &size, sizeof(size)))
return;
dfi_mem_phys_read(0x10418, &base, sizeof(base));
dfi_mem_phys_read(0x10420, &size, sizeof(size));
if (base == 0 || size == 0)
return;
if (base % MIB || size % MIB)
zdump/dfi_mem_chunk.c
+42 -31
View File
@@ -119,10 +119,36 @@ void dfi_mem_map_print(bool verbose)
print_end, TO_MIB(print_end - print_start + 1));
}
/*
* Check if memory chunk contains address
*/
static int mem_chunk_has_addr(struct dfi_mem_chunk *mem_chunk, u64 addr)
{
return (addr >= mem_chunk->start && addr <= mem_chunk->end);
}
/*
* Find memory chunk that contains address
*/
static struct dfi_mem_chunk *mem_chunk_find(struct mem *mem, u64 addr)
{
struct dfi_mem_chunk *mem_chunk;
if (mem->chunk_cache && mem_chunk_has_addr(mem->chunk_cache, addr))
return mem->chunk_cache;
util_list_iterate(&mem->chunk_list, mem_chunk) {
if (mem_chunk_has_addr(mem_chunk, addr)) {
mem->chunk_cache = mem_chunk;
return mem_chunk;
}
}
return NULL;
}
/*
* Is memory range valid?
*/
int dfi_mem_range_valid(u64 addr, u64 len)
static int mem_range_valid(struct mem *mem, u64 addr, u64 len)
{
struct dfi_mem_chunk *mem_chunk;
u64 addr_end = addr + len;
@@ -132,7 +158,7 @@ int dfi_mem_range_valid(u64 addr, u64 len)
return 0;
do {
mem_chunk = dfi_mem_chunk_find(addr);
mem_chunk = mem_chunk_find(mem, addr);
if (!mem_chunk)
return 0;
addr += MIN(len, mem_chunk->end - addr + 1);
@@ -182,32 +208,6 @@ static void mem_chunk_create(struct mem *mem, u64 start, u64 size, void *data,
mem->chunk_cnt++;
}
/*
* Check if memory chunk contains address
*/
static int mem_chunk_has_addr(struct dfi_mem_chunk *mem_chunk, u64 addr)
{
return (addr >= mem_chunk->start && addr <= mem_chunk->end);
}
/*
* Find memory chunk that contains address
*/
static struct dfi_mem_chunk *mem_chunk_find(struct mem *mem, u64 addr)
{
struct dfi_mem_chunk *mem_chunk;
if (mem->chunk_cache && mem_chunk_has_addr(mem->chunk_cache, addr))
return mem->chunk_cache;
util_list_iterate(&mem->chunk_list, mem_chunk) {
if (mem_chunk_has_addr(mem_chunk, addr)) {
mem->chunk_cache = mem_chunk;
return mem_chunk;
}
}
return NULL;
}
/*
* Read memory at given address
*/
@@ -350,6 +350,14 @@ u64 dfi_mem_range(void)
return l.mem_virt.end_addr - l.mem_virt.start_addr + 1;
}
/*
* Is memory range valid?
*/
int dfi_mem_range_valid(u64 addr, u64 len)
{
return mem_range_valid(&l.mem_virt, addr, len);
}
/*
* Return first memory chunk
*/
@@ -397,12 +405,15 @@ struct dfi_mem_chunk *dfi_mem_chunk_find(u64 addr)
/*
* Read physical memory at given address
*/
void dfi_mem_phys_read(u64 addr, void *buf, size_t cnt)
int dfi_mem_phys_read(u64 addr, void *buf, size_t cnt)
{
util_log_print(UTIL_LOG_TRACE,
"DFI phys mem read addr 0x%016lx size 0x%016lx\n",
addr, cnt);
if (!mem_range_valid(&l.mem_phys, addr, cnt))
return -EINVAL;
mem_read(&l.mem_phys, addr, buf, cnt);
return 0;
}
/*
@@ -413,7 +424,7 @@ int dfi_mem_virt_read(u64 addr, void *buf, size_t cnt)
util_log_print(UTIL_LOG_TRACE,
"DFI virt mem read addr 0x%016lx size 0x%016lx\n",
addr, cnt);
if (!dfi_mem_range_valid(addr, cnt))
if (!mem_range_valid(&l.mem_virt, addr, cnt))
return -EINVAL;
mem_read(&l.mem_virt, addr, buf, cnt);
return 0;
@@ -478,7 +489,7 @@ void dfi_mem_unmap(u64 start, u64 size)
addr_phys = start_phys;
mem_chunk_map_add(addr_virt, size_virt, addr_phys);
}
free:
free:
util_list_remove(&l.mem_virt.chunk_list, mem_chunk);
l.mem_virt.chunk_cnt--;
if (mem_chunk->data && mem_chunk->free_fn)
zdump/dfi_mem_chunk.h
+1 -1
View File
@@ -56,7 +56,7 @@ struct util_list *dfi_mem_chunk_list(void);
util_list_iterate(dfi_mem_chunk_list(), mem_chunk)
int dfi_mem_virt_read(u64 addr, void *buf, size_t cnt);
void dfi_mem_phys_read(u64 addr, void *buf, size_t cnt);
int dfi_mem_phys_read(u64 addr, void *buf, size_t cnt);
void dfi_mem_map_print(bool verbose);