linux-user: Fix siginfo_t contents when jumping to non-readable pages
v2 cover linux-user: Fix siginfo_t contents when jumping to non-readable pages
Hi,
I noticed that when we get a SEGV due to jumping to non-readable memory, sometimes si_addr and program counter in siginfo_t are slightly off. I tracked this down to the assumption that translators stop before the end of a page, while in reality they may stop right after it.
Patch 1 fixes a minor invalidation issue, which may prevent SEGV from happening altogether.
Patches 2-3 fix the main issue on x86_64 and s390x. Many other architectures have fixed-size instructions and are not affected. Patch 4 adds tests.
Best regards,
Ilya
v1: https://lists.gnu.org/archive/html/qemu-devel/2022-08/msg00822.html
v1 -> v2: Fix individual translators instead of translator_loop
(Peter).
Ilya Leoshkevich (4):
accel/tcg: Invalidate translations when clearing PAGE_READ target/s390x: Make translator stop before the end of a page target/i386: Make translator stop before the end of a page tests/tcg: Test siginfo_t contents when jumping to non-readable pages
accel/tcg/translate-all.c | 17 ++-- include/exec/translator.h | 10 +++ target/i386/tcg/translate.c | 42 ++++++++- target/s390x/tcg/translate.c | 35 ++++---- tests/tcg/multiarch/noexec.h | 114 ++++++++++++++++++++++++ tests/tcg/s390x/Makefile.target | 1 + tests/tcg/s390x/noexec.c | 145 +++++++++++++++++++++++++++++++ tests/tcg/x86_64/Makefile.target | 3 +- tests/tcg/x86_64/noexec.c | 116 +++++++++++++++++++++++++ 9 files changed, 461 insertions(+), 22 deletions(-) create mode 100644 tests/tcg/multiarch/noexec.h create mode 100644 tests/tcg/s390x/noexec.c create mode 100644 tests/tcg/x86_64/noexec.c
Signature · 1 line
2.35.3
PATCH v2 1/4 accel/tcg: Invalidate translations when clearing PAGE_READ
After mprotect(addr, PROT_NONE), addr can still be executed if there are cached translations. Drop them.
--- accel/tcg/translate-all.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
accel/tcg/translate-all.c +12 -5
@@ -2295,12 +2295,19 @@ void page_set_flags(target_ulong start, target_ulong end, int flags) len !=0 ; len -= TARGET_PAGE_SIZE, addr += TARGET_PAGE_SIZE) {PageDesc *p =page_find_alloc (addr >>TARGET_PAGE_BITS ,1 ); +bool write_set, read_cleared; -/* If the write protection bit is set, then we invalidate -the code inside. */ -if (!(p->flags &PAGE_WRITE ) && - (flags &PAGE_WRITE ) && - p->first_tb) { +/* +* If the write protection bit is set, then we invalidate the code +* inside. +*/ + write_set = !(p->flags &PAGE_WRITE ) && (flags &PAGE_WRITE ); +/* +* If PAGE_READ is cleared, we also need to invalidate the code in +* order to force a fault when trying to run it. +*/ + read_cleared = (p->flags &PAGE_READ ) && !(flags &PAGE_READ ); +if ((write_set || read_cleared) && p->first_tb) {tb_invalidate_phys_page (addr,0 ); }if (reset_target_data) {
Signature · 1 line
2.35.3
Re: [PATCH v2 1/4] accel/tcg: Invalidate translations when clearing PAGE_READ
Quoted 24 lines · Ilya Leoshkevich
After
mprotect(addr, PROT_NONE), addr can still be executed if there are cached translations. Drop them.Signed-off-by Ilya Leoshkevich <[email protected]>--- accel/tcg/translate-all.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)accel/tcg/translate-all.c +1
-5@@ -2295,12 +2295,19 @@ void page_set_flags(target_ulong start, target_ulong end, int flags) len !=0 ; len -= TARGET_PAGE_SIZE, addr += TARGET_PAGE_SIZE) {PageDesc *p =page_find_alloc (addr >>TARGET_PAGE_BITS ,1 ); +bool write_set, read_cleared; -/* If the write protection bit is set, then we invalidate -the code inside. */ -if (!(p->flags &PAGE_WRITE ) && - (flags &PAGE_WRITE ) && - p->first_tb) {
accel/tcg/translate-all.c void page_set_flags(target_ulong start, target_ulong end, int flags) · line 2309
Quoted 10 lines
accel/tcg/translate-all.c +10
-0+/* +* If the write protection bit is set, then we invalidate the code +* inside. +*/ + write_set = !(p->flags &PAGE_WRITE ) && (flags &PAGE_WRITE ); +/* +* If PAGE_READ is cleared, we also need to invalidate the code in +* order to force a fault when trying to run it. +*/ + read_cleared = (p->flags &PAGE_READ ) && !(flags &PAGE_READ );
Isn't it architecture-dependent whether you need PAGE_READ to execute code ? How about PAGE_EXEC ?
thanks
-- PMM
Re: [PATCH v2 1/4] accel/tcg: Invalidate translations when clearing PAGE_READ
In reply to Ilya LeoshkevichQuoted 23 lines · Ilya Leoshkevich
After
mprotect(addr, PROT_NONE), addr can still be executed if there are cached translations. Drop them.Signed-off-by Ilya Leoshkevich <[email protected]>--- accel/tcg/translate-all.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)accel/tcg/translate-all.c +1
-5@@ -2295,12 +2295,19 @@ void page_set_flags(target_ulong start, target_ulong end, int flags) len !=0 ; len -= TARGET_PAGE_SIZE, addr += TARGET_PAGE_SIZE) {PageDesc *p =page_find_alloc (addr >>TARGET_PAGE_BITS ,1 ); +bool write_set, read_cleared; -/* If the write protection bit is set, then we invalidate -the code inside. */ -if (!(p->flags &PAGE_WRITE ) && - (flags &PAGE_WRITE ) && - p->first_tb) {
accel/tcg/translate-all.c void page_set_flags(target_ulong start, target_ulong end, int flags) · line 2309
Quoted 10 lines
accel/tcg/translate-all.c +10
-0+/* +* If the write protection bit is set, then we invalidate the code +* inside. +*/ + write_set = !(p->flags &PAGE_WRITE ) && (flags &PAGE_WRITE ); +/* +* If PAGE_READ is cleared, we also need to invalidate the code in +* order to force a fault when trying to run it. +*/ + read_cleared = (p->flags &PAGE_READ ) && !(flags &PAGE_READ );
PAGE_READ has nothing to do with it -- PAGE_EXEC does though.
r~
PATCH v2 2/4 target/s390x: Make translator stop before the end of a page
In reply to Ilya LeoshkevichRight now translator stops right *after* the end of a page, which breaks reporting of fault locations when the last instruction of a multi-insn translation block crosses a page boundary.
--- include/exec/translator.h | 10 ++++++++++ target/s390x/tcg/translate.c | 35 ++++++++++++++++++++--------------- 2 files changed, 30 insertions(+), 15 deletions(-)
include/exec/translator.h +10 -0
@@ -187,4 +187,14 @@ FOR_EACH_TRANSLATOR_LD(GEN_TRANSLATOR_LD)#undef GEN_TRANSLATOR_LD +/* +* Return whether addr is on the same page as where disassembly started. +* Translators can use this to enforce the rule that only single-insn +* translation blocks are allowed to cross page boundaries. +*/ +static inline bool is_same_page (DisasContextBase *db,target_ulong addr) +{ +return ((addr ^ db->pc_first) &TARGET_PAGE_MASK ) ==0 ; +} +#endif /* EXEC__TRANSLATOR_H */
target/s390x/tcg/translate.c +20 -15
@@ -6305,14 +6305,13 @@ static void extract_field(DisasFields *o, const DisasField *f, uint64_t insn) o->c[f->indexC] = r; } -/* Lookup the insn at the current PC, extracting the operands into O and -returning the info struct for the insn. Returns NULL for invalid insn. */ +/* Lookup the insn at the current PC, filling the info struct. */ -static const DisasInsn *extract_insn (CPUS390XState *env,DisasContext *s) +static DisasJumpType extract_insn (CPUS390XState *env,DisasContext *s, +const DisasInsn **info) {uint64_t insn, pc = s->base.pc_next;int op, op2, ilen; -const DisasInsn *info;if (unlikely (s->ex_value)) {/* Drop the EX data now, so that it's clear on exception paths. */
@@ -6325,9 +6324,13 @@ static const DisasInsn *extract_insn(CPUS390XState *env, DisasContext *s) ilen = s->ex_value &0xf ; op = insn >>56 ; }else { +assert (s->base.num_insns ==1 ||is_same_page (&s->base, pc)); insn =ld_code2 (env, s, pc); op = (insn >>8 ) &0xff ; ilen =get_ilen (op); +if (s->base.num_insns >1 && !is_same_page (&s->base, pc + ilen -1 )) { +return DISAS_TOO_MANY ; + }switch (ilen) {case 2 : insn = insn <<48 ;
@@ -6394,19 +6397,19 @@ static const DisasInsn *extract_insn(CPUS390XState *env, DisasContext *s) s->fields.op2 = op2;/* Lookup the instruction. */ - info =lookup_opc (op <<8 | op2); - s->insn = info; + *info =lookup_opc (op <<8 | op2); + s->insn = *info;/* If we found it, extract the operands. */ -if (info !=NULL ) { -DisasFormat fmt = info->fmt; +if (*info !=NULL ) { +DisasFormat fmt = (*info)->fmt;int i;for (i =0 ; i <NUM_C_FIELD ; ++i) {extract_field (&s->fields, &format_info[fmt].op[i], insn); } } -return info; +return DISAS_NEXT ; }static bool is_afp_reg (int reg)
@@ -6423,12 +6426,17 @@ static bool is_fp_pair(int reg)static DisasJumpType translate_one (CPUS390XState *env,DisasContext *s) {const DisasInsn *insn; -DisasJumpType ret =DISAS_NEXT ; +DisasJumpType ret;DisasOps o = {};bool icount = false;/* Search for the insn in the table. */ - insn =extract_insn (env, s); + ret =extract_insn (env, s, &insn); + +/* This is a subsequent insn that crosses a page boundary. */ +if (ret ==DISAS_TOO_MANY ) { + goto out; + }/* Update insn_start now that we know the ILEN. */ tcg_set_insn_start_param (s->insn_start,2 , s->ilen);
@@ -6616,10 +6624,7 @@ static void s390x_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs) dc->base.is_jmp =translate_one (env, dc);if (dc->base.is_jmp ==DISAS_NEXT ) { -uint64_t page_start; - - page_start = dc->base.pc_first &TARGET_PAGE_MASK ; -if (dc->base.pc_next - page_start >=TARGET_PAGE_SIZE || dc->ex_value) { +if (!is_same_page (dcbase, dc->base.pc_next) || dc->ex_value) { dc->base.is_jmp =DISAS_TOO_MANY ; } }
Signature · 1 line
2.35.3
Re: [PATCH v2 2/4] target/s390x: Make translator stop before the end of a page
Quoted 52 lines · Ilya Leoshkevich
Right now translator stops right *after* the end of a page, which breaks reporting of fault locations when the last instruction of a multi-insn translation block crosses a page boundary.
Signed-off-by Ilya Leoshkevich <[email protected]>--- include/exec/translator.h | 10 ++++++++++ target/s390x/tcg/translate.c | 35 ++++++++++++++++++++--------------- 2 files changed, 30 insertions(+), 15 deletions(-)include/exec/translator.h +10
-0@@ -187,4 +187,14 @@ FOR_EACH_TRANSLATOR_LD(GEN_TRANSLATOR_LD)#undef GEN_TRANSLATOR_LD +/* +* Return whether addr is on the same page as where disassembly started. +* Translators can use this to enforce the rule that only single-insn +* translation blocks are allowed to cross page boundaries. +*/ +static inline bool is_same_page (DisasContextBase *db,target_ulong addr) +{ +return ((addr ^ db->pc_first) &TARGET_PAGE_MASK ) ==0 ; +} +#endif /* EXEC__TRANSLATOR_H */ target/s390x/tcg/translate.c +3
-4@@ -6305,14 +6305,13 @@ static void extract_field(DisasFields *o, const DisasField *f, uint64_t insn) o->c[f->indexC] = r; } -/* Lookup the insn at the current PC, extracting the operands into O and -returning the info struct for the insn. Returns NULL for invalid insn. */ +/* Lookup the insn at the current PC, filling the info struct. */ -static const DisasInsn *extract_insn (CPUS390XState *env,DisasContext *s) +static DisasJumpType extract_insn (CPUS390XState *env,DisasContext *s, +const DisasInsn **info) {uint64_t insn, pc = s->base.pc_next;int op, op2, ilen; -const DisasInsn *info;if (unlikely (s->ex_value)) {/* Drop the EX data now, so that it's clear on exception paths. */
target/s390x/tcg/translate.c static const DisasInsn *extract_insn(CPUS390XState *env, DisasContext *s) · line 6333
Quoted 10 lines
target/s390x/tcg/translate.c +4
-0@@ -6325,9 +6324,13 @@ static const DisasInsn *extract_insn(CPUS390XState *env, DisasContext *s) ilen = s->ex_value &0xf ; op = insn >>56 ; }else { +assert (s->base.num_insns ==1 ||is_same_page (&s->base, pc)); insn =ld_code2 (env, s, pc); op = (insn >>8 ) &0xff ; ilen =get_ilen (op); +if (s->base.num_insns >1 && !is_same_page (&s->base, pc + ilen -1 )) { +return DISAS_TOO_MANY ; + }
This doesn't work.
You need to end the TB at the end of the previous insn, not at the beginning of the current insn. Here, we have already committed to executing one instruction.
You need to model this similar to arm's insn_crosses_page, where we check at the end of one instruction whether we'll be able to run another.
r~
PATCH v2 3/4 target/i386: Make translator stop before the end of a page
In reply to Ilya LeoshkevichRight now translator stops right *after* the end of a page, which breaks reporting of fault locations when the last instruction of a multi-insn translation block crosses a page boundary.
We may find out that we crossed page boundary after some ops were emitted and cc_op was updated. In theory it might be possible to rearrange the code to disassemble first, but this is too error-prone. Simply snapshot and restore the disassembly state instead.
--- target/i386/tcg/translate.c | 42 ++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-)
target/i386/tcg/translate.c +41 -1
@@ -2008,6 +2008,12 @@ static uint64_t advance_pc(CPUX86State *env, DisasContext *s, int num_bytes) {uint64_t pc = s->pc; +/* This is a subsequent insn that crosses a page boundary. */ +if (s->base.num_insns >1 && + !is_same_page (&s->base, s->pc + num_bytes -1 )) { +siglongjmp (s->jmpbuf,2 ); + } + s->pc += num_bytes;if (unlikely (s->pc - s->pc_start >X86_MAX_INSN_LENGTH )) {/* If the instruction's 16th byte is on a different page than the 1st, a
@@ -4545,6 +4551,29 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b, } } +/* Disassembly state that may affect the next instruction. */ +typedef struct { +TCGOp *last_op; +bool cc_op_dirty; +CCOp cc_op; +}DisasSnapshot ; + +/* Save disassembly state. */ +static void disas_save (DisasSnapshot *snapshot,const DisasContext *s) +{ + snapshot->last_op =tcg_last_op (); + snapshot->cc_op_dirty = s->cc_op_dirty; + snapshot->cc_op = s->cc_op; +} + +/* Restore disassembly state. */ +static void disas_restore (const DisasSnapshot *snapshot,DisasContext *s) +{ +tcg_remove_ops_after (snapshot->last_op); + s->cc_op_dirty = snapshot->cc_op_dirty; + s->cc_op = snapshot->cc_op; +} +/* convert one instruction. s->base.is_jmp is set if the translation must be stopped. Return the next pc value */ static target_ulong disas_insn (DisasContext *s,CPUState *cpu)
@@ -4556,6 +4585,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)int modrm, reg, rm, mod, op, opreg, val;target_ulong next_eip, tval;target_ulong pc_start = s->base.pc_next; +DisasSnapshot snapshot; s->pc_start = s->pc = pc_start; s->override =-1 ;
@@ -4568,9 +4598,19 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) s->rip_offset =0 ;/* for relative ip address */ s->vex_l =0 ; s->vex_v =0 ; -if (sigsetjmp (s->jmpbuf,0 ) !=0 ) { +disas_save (&snapshot, s); +switch (sigsetjmp (s->jmpbuf,0 )) { +case 0 : +break ; +case 1 :gen_exception_gpf (s);return s->pc; +case 2 : +disas_restore (&snapshot, s); + s->base.is_jmp =DISAS_TOO_MANY ; +return pc_start; +default : +g_assert_not_reached (); } prefixes =0 ;
Signature · 1 line
2.35.3
Re: [PATCH v2 3/4] target/i386: Make translator stop before the end of a page
Quoted 7 lines · Ilya Leoshkevich
target/i386/tcg/translate.c +2
-1@@ -4568,9 +4598,19 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) s->rip_offset =0 ;/* for relative ip address */ s->vex_l =0 ; s->vex_v =0 ; -if (sigsetjmp (s->jmpbuf,0 ) !=0 ) { +disas_save (&snapshot, s); +switch (sigsetjmp (s->jmpbuf,0 )) {
target/i386/tcg/translate.c static target_ulong disas_insn(DisasContext *s, CPUState *cpu) · line 4612
Quoted 10 lines
target/i386/tcg/translate.c +8
-0+case 0 : +break ; +case 1 :gen_exception_gpf (s);return s->pc; +case 2 : +disas_restore (&snapshot, s); + s->base.is_jmp =DISAS_TOO_MANY ; +return pc_start; +default :
Similarly, this is too late for DISAS_TOO_MANY.
It will be more difficult to fix this for x86, since unlike s390x (or arm for that matter), we cannot probe for the total insn length within the first few bits of the insn.
The simplest possibility would to force single-stepping when we're within 16 bytes of the end of the page, as that's a hard maximum on the number of bytes within an x86 insn.
We could probably still use this sort of longjmp thing, but we'd need to unwind more than you're doing here. We'd need to discard the insn_start opcode (which is before the last_op that you're currently saving), and decrement s->base.num_insns.
r~
PATCH v2 4/4 tests/tcg: Test siginfo_t contents when jumping to non-readable pages
In reply to Ilya LeoshkevichAdd x86_64 and s390x tests to prevent regressions.
--- tests/tcg/multiarch/noexec.h | 114 ++++++++++++++++++++++++ tests/tcg/s390x/Makefile.target | 1 + tests/tcg/s390x/noexec.c | 145 +++++++++++++++++++++++++++++++ tests/tcg/x86_64/Makefile.target | 3 +- tests/tcg/x86_64/noexec.c | 116 +++++++++++++++++++++++++ 5 files changed, 378 insertions(+), 1 deletion(-) create mode 100644 tests/tcg/multiarch/noexec.h create mode 100644 tests/tcg/s390x/noexec.c create mode 100644 tests/tcg/x86_64/noexec.c
tests/tcg/multiarch/noexec.h new file +114 -0
@@ -0,0 +1,114 @@ +/* +* Common code for arch-specific MMU_INST_FETCH fault testing. +* +* Declare struct arch_noexec_test before including this file and define +* arch_check_mcontext() after that. +*/ + +#include <assert.h> +#include <signal.h> +#include <stdlib.h> +#include <string.h> +#include <sys/mman.h> +#include <sys/ucontext.h> +#include <unistd.h> + +/* Forward declarations. */ + +static void arch_check_mcontext (const struct arch_noexec_test *test, +const mcontext_t *ctx); + +/* Utility functions. */ + +static void safe_print (const char *s) +{ +write (0 , s,strlen (s)); +} + +static void safe_puts (const char *s) +{ +safe_print (s); +safe_print ("\n" ); +} + +#define PAGE_ALIGN (p) (void *)((unsigned long)(p) & ~0xfffUL) + +/* Testing infrastructure. */ + +struct noexec_test { +const char *name; +void (*func)(int ); +void *page; +void *expected_si_addr; +struct arch_noexec_test arch; +}; + +static const struct noexec_test *current_noexec_test; + +static void handle_segv (int sig,siginfo_t *info,void *ucontext) +{ +int err; + +if (current_noexec_test ==NULL ) { +safe_puts ("[ FAILED ] unexpected SEGV" ); +_exit (1 ); + } + +if (info->si_addr != current_noexec_test->expected_si_addr) { +safe_puts ("[ FAILED ] wrong si_addr" ); +_exit (1 ); + } + +arch_check_mcontext (¤t_noexec_test->arch, + &((ucontext_t *)ucontext)->uc_mcontext); + + err =mprotect (current_noexec_test->page,0x1000 ,PROT_READ |PROT_EXEC ); +if (err !=0 ) { +safe_puts ("[ FAILED ] mprotect() failed" ); +_exit (1 ); + } + + current_noexec_test =NULL ; +} + +static void test_noexec_1 (const struct noexec_test *test) +{ +int ret; + +/* Trigger TB creation in order to test invalidation. */ + test->func (0 ); + + ret =mprotect (test->page,0x1000 ,PROT_NONE ); +assert (ret ==0 ); + +/* Trigger SEGV and check that handle_segv() ran. */ + current_noexec_test = test; + test->func (0 ); +assert (current_noexec_test ==NULL ); +} + +static int test_noexec (struct noexec_test *tests,size_t n_tests) +{ +struct sigaction act; +size_t i; +int err; + +memset (&act,0 ,sizeof (act)); + act.sa_sigaction = handle_segv; + act.sa_flags =SA_SIGINFO ; + err =sigaction (SIGSEGV , &act,NULL ); +assert (err ==0 ); + +for (i =0 ; i < n_tests; i++) { +struct noexec_test *test = &tests[i]; + +safe_print ("[ RUN ] " ); +safe_puts (test->name); +test_noexec_1 (test); +safe_puts ("[ OK ]" ); + } + +safe_puts ("[ PASSED ]" ); + +return EXIT_SUCCESS ; +}
tests/tcg/s390x/Makefile.target +1 -0
@@ -16,6 +16,7 @@ TESTS+=shift TESTS+=trap TESTS+=signals-s390x TESTS+=branch-relative-long +TESTS+=noexec Z14_TESTS=vfminmax vfminmax: LDFLAGS+=-lm
tests/tcg/s390x/noexec.c new file +145 -0
145 lines not on this page · raw message
tests/tcg/x86_64/Makefile.target +2 -1
@@ -10,6 +10,7 @@ include $(SRC_PATH)/tests/tcg/i386/Makefile.target ifeq ($(filter %-linux-user, $(TARGET)),$(TARGET)) X86_64_TESTS += vsyscall +X86_64_TESTS += noexec TESTS=$(MULTIARCH_TESTS) $(X86_64_TESTS) test-x86_64 else TESTS=$(MULTIARCH_TESTS)
@@ -20,5 +21,5 @@ test-x86_64: LDFLAGS+=-lm -lc test-x86_64: test-i386.c test-i386.h test-i386-shift.h test-i386-muldiv.h $(CC) $(CFLAGS) $< -o $@ $(LDFLAGS) -vsyscall: $(SRC_PATH)/tests/tcg/x86_64/vsyscall.c +%: $(SRC_PATH)/tests/tcg/x86_64/%.c $(CC) $(CFLAGS) $< -o $@ $(LDFLAGS)
tests/tcg/x86_64/noexec.c new file +116 -0
116 lines not on this page · raw message
Signature · 1 line
2.35.3