diff options
| author | Richard Henderson | 2021-02-12 19:48:47 +0100 |
|---|---|---|
| committer | Peter Maydell | 2021-02-16 12:04:53 +0100 |
| commit | c7169b022b329a121d0c7acb550a08efa04d816a (patch) | |
| tree | 44da53572b4e3ee2c859b498a4e67acc643c6ce4 /linux-user/i386 | |
| parent | exec: Rename guest_{addr,range}_valid to *_untagged (diff) | |
| download | qemu-c7169b022b329a121d0c7acb550a08efa04d816a.tar.gz qemu-c7169b022b329a121d0c7acb550a08efa04d816a.tar.xz qemu-c7169b022b329a121d0c7acb550a08efa04d816a.zip | |
linux-user: Use cpu_untagged_addr in access_ok; split out *_untagged
Provide both tagged and untagged versions of access_ok.
In a few places use thread_cpu, as the user is several
callees removed from do_syscall1.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20210212184902.1251044-17-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/i386')
| -rw-r--r-- | linux-user/i386/cpu_loop.c | 2 | ||||
| -rw-r--r-- | linux-user/i386/signal.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/linux-user/i386/cpu_loop.c b/linux-user/i386/cpu_loop.c index 19c8a18cd3..f813e87294 100644 --- a/linux-user/i386/cpu_loop.c +++ b/linux-user/i386/cpu_loop.c @@ -99,7 +99,7 @@ static bool write_ok_or_segv(CPUX86State *env, abi_ptr addr, size_t len) * For all the vsyscalls, NULL means "don't write anything" not * "write it at address 0". */ - if (addr == 0 || access_ok(VERIFY_WRITE, addr, len)) { + if (addr == 0 || access_ok(env_cpu(env), VERIFY_WRITE, addr, len)) { return true; } diff --git a/linux-user/i386/signal.c b/linux-user/i386/signal.c index 97a39204cc..9320e1d472 100644 --- a/linux-user/i386/signal.c +++ b/linux-user/i386/signal.c @@ -513,9 +513,10 @@ restore_sigcontext(CPUX86State *env, struct target_sigcontext *sc) fpstate_addr = tswapl(sc->fpstate); if (fpstate_addr != 0) { - if (!access_ok(VERIFY_READ, fpstate_addr, - sizeof(struct target_fpstate))) + if (!access_ok(env_cpu(env), VERIFY_READ, fpstate_addr, + sizeof(struct target_fpstate))) { goto badframe; + } #ifndef TARGET_X86_64 cpu_x86_frstor(env, fpstate_addr, 1); #else |