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

tcg: Fix PAGE/PROT confusion 

The bug was hidden because they happen to have the same values.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2023-04-02 08:13:50 -07:00
parent 653c46daf2
commit 649795665f
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tcg/region.c
View File

@ -505,6 +505,14 @@ static int alloc_code_gen_buffer(size_t tb_size, int splitwx, Error **errp)
return PROT_READ | PROT_WRITE; return PROT_READ | PROT_WRITE;
} }
#elif defined(_WIN32) #elif defined(_WIN32)
/*
* Local source-level compatibility with Unix.
* Used by tcg_region_init below.
*/
#define PROT_READ 1
#define PROT_WRITE 2
#define PROT_EXEC 4
static int alloc_code_gen_buffer(size_t size, int splitwx, Error **errp) static int alloc_code_gen_buffer(size_t size, int splitwx, Error **errp)
{ {
void *buf; void *buf;
@ -525,7 +533,7 @@ static int alloc_code_gen_buffer(size_t size, int splitwx, Error **errp)
region.start_aligned = buf; region.start_aligned = buf;
region.total_size = size; region.total_size = size;
return PAGE_READ | PAGE_WRITE | PAGE_EXEC; return PROT_READ | PROT_WRITE | PROT_EXEC;
} }
#else #else
static int alloc_code_gen_buffer_anon(size_t size, int prot, static int alloc_code_gen_buffer_anon(size_t size, int prot,
@ -794,10 +802,10 @@ void tcg_region_init(size_t tb_size, int splitwx, unsigned max_cpus)
* buffer -- let that one use hugepages throughout. * buffer -- let that one use hugepages throughout.
* Work with the page protections set up with the initial mapping. * Work with the page protections set up with the initial mapping.
*/ */
need_prot = PAGE_READ | PAGE_WRITE; need_prot = PROT_READ | PROT_WRITE;
#ifndef CONFIG_TCG_INTERPRETER #ifndef CONFIG_TCG_INTERPRETER
if (tcg_splitwx_diff == 0) { if (tcg_splitwx_diff == 0) {
need_prot |= PAGE_EXEC; need_prot |= PROT_EXEC;
} }
#endif #endif
for (size_t i = 0, n = region.n; i < n; i++) { for (size_t i = 0, n = region.n; i < n; i++) {
@ -807,9 +815,9 @@ void tcg_region_init(size_t tb_size, int splitwx, unsigned max_cpus)
if (have_prot != need_prot) { if (have_prot != need_prot) {
int rc; int rc;
if (need_prot == (PAGE_READ | PAGE_WRITE | PAGE_EXEC)) { if (need_prot == (PROT_READ | PROT_WRITE | PROT_EXEC)) {
rc = qemu_mprotect_rwx(start, end - start); rc = qemu_mprotect_rwx(start, end - start);
} else if (need_prot == (PAGE_READ | PAGE_WRITE)) { } else if (need_prot == (PROT_READ | PROT_WRITE)) {
rc = qemu_mprotect_rw(start, end - start); rc = qemu_mprotect_rw(start, end - start);
} else { } else {
g_assert_not_reached(); g_assert_not_reached();