From 01c0bef1625d8e5d6d5c6abaf413214d667615ad Mon Sep 17 00:00:00 2001 From: Juergen Lock Date: Wed, 31 Mar 2010 23:00:36 +0200 Subject: Avoid page_set_flags() assert in qemu-user host page protection code V2 that uses endaddr = end-of-guest-address-space if !h2g_valid(endaddr) after I found out that indeed works; and also disables the FreeBSD 6.x /compat/linux/proc/self/maps fallback because it can return partial lines if (at least I think that's the reason) the mappings change between subsequent read() calls. Signed-off-by: Juergen Lock Acked-by: Richard Henderson Signed-off-by: Aurelien Jarno --- exec.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'exec.c') diff --git a/exec.c b/exec.c index 76163aa..a6d3bad 100644 --- a/exec.c +++ b/exec.c @@ -307,13 +307,14 @@ static void page_init(void) if (h2g_valid(endaddr)) { endaddr = h2g(endaddr); - page_set_flags(startaddr, endaddr, PAGE_RESERVED); } else { #if TARGET_ABI_BITS <= L1_MAP_ADDR_SPACE_BITS endaddr = ~0ul; - page_set_flags(startaddr, endaddr, PAGE_RESERVED); +#else + endaddr = ((abi_ulong)1 << L1_MAP_ADDR_SPACE_BITS) - 1; #endif } + page_set_flags(startaddr, endaddr, PAGE_RESERVED); } } free(freep); @@ -324,11 +325,7 @@ static void page_init(void) last_brk = (unsigned long)sbrk(0); -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) - f = fopen("/compat/linux/proc/self/maps", "r"); -#else f = fopen("/proc/self/maps", "r"); -#endif if (f) { mmap_lock(); @@ -344,7 +341,11 @@ static void page_init(void) if (h2g_valid(endaddr)) { endaddr = h2g(endaddr); } else { +#if TARGET_ABI_BITS <= L1_MAP_ADDR_SPACE_BITS endaddr = ~0ul; +#else + endaddr = ((abi_ulong)1 << L1_MAP_ADDR_SPACE_BITS) - 1; +#endif } page_set_flags(startaddr, endaddr, PAGE_RESERVED); } -- cgit v1.1