ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NOVA: fix overflow in address check

This commit is contained in:
Alexander Boettcher 2012-09-14 10:39:45 +02:00 committed by Norman Feske
parent f5efbff19c
commit 7bd0ed7c44
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
base-nova/src/core/include/nova_util.h
View File

@ -122,18 +122,22 @@ inline int map_local(Nova::Utcb *utcb,
* size (and are always zero).
*/
size_t order = get_page_size_log2();
for (; order < 32 && !(common_bits & (1 << order)); order++);
for (; order < 32 && !(common_bits & (1UL << order)); order++);
/*
* Look if flexpage fits into both 'from' and 'to' address range
*/
if (from_curr + (1 << order) > from_end)
if ((from_end - from_curr) < (1UL << order))
order = log2(from_end - from_curr);
if (to_curr + (1 << order) > to_end)
if ((to_end - to_curr) < (1UL << order))
order = log2(to_end - to_curr);
if (verbose_local_map)
Genode::printf("::map_local: order %lx %lx:%lx %lx:%lx\n",
order, from_curr, from_end, to_curr, to_end);
int const res = map_local(utcb,
Mem_crd((from_curr >> 12), order - get_page_size_log2(), rwx),
Mem_crd((to_curr >> 12), order - get_page_size_log2(), rwx),
@ -141,7 +145,7 @@ inline int map_local(Nova::Utcb *utcb,
if (res) return res;
/* advance offset by current flexpage size */
offset += (1 << order);
offset += (1UL << order);
}
return 0;
}