ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

linux-user/arm: Mark the commpage executable 

We're about to start validating PAGE_EXEC, which means
that we've got to mark the commpage executable.  We had
been placing the commpage outside of reserved_va, which
was incorrect and lead to an abort.

Acked-by: Ilya Leoshkevich <iii@linux.ibm.com>
Tested-by: Ilya Leoshkevich <iii@linux.ibm.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2022-08-10 17:22:04 -07:00
parent fd28528ece
commit fbd3c4cff6
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
linux-user/arm/target_cpu.h
View File

@ -34,9 +34,9 @@ static inline unsigned long arm_max_reserved_va(CPUState *cs)
} else { } else {
/* /*
* We need to be able to map the commpage. * We need to be able to map the commpage.
* See validate_guest_space in linux-user/elfload.c. * See init_guest_commpage in linux-user/elfload.c.
*/ */
return 0xffff0000ul; return 0xfffffffful;
} }
} }
#define MAX_RESERVED_VA arm_max_reserved_va #define MAX_RESERVED_VA arm_max_reserved_va

6
linux-user/elfload.c
View File

@ -398,7 +398,8 @@ enum {
static bool init_guest_commpage(void) static bool init_guest_commpage(void)
{ {
void *want = g2h_untagged(HI_COMMPAGE & -qemu_host_page_size); abi_ptr commpage = HI_COMMPAGE & -qemu_host_page_size;
void *want = g2h_untagged(commpage);
void *addr = mmap(want, qemu_host_page_size, PROT_READ | PROT_WRITE, void *addr = mmap(want, qemu_host_page_size, PROT_READ | PROT_WRITE,
MAP_ANONYMOUS | MAP_PRIVATE | MAP_FIXED, -1, 0); MAP_ANONYMOUS | MAP_PRIVATE | MAP_FIXED, -1, 0);
@ -417,6 +418,9 @@ static bool init_guest_commpage(void)
perror("Protecting guest commpage"); perror("Protecting guest commpage");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
page_set_flags(commpage, commpage + qemu_host_page_size,
PAGE_READ | PAGE_EXEC | PAGE_VALID);
return true; return true;
} }