[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 06/43] semihosting: Simplify softmmu_lock_user_string
From: |
Richard Henderson |
Subject: |
[PATCH 06/43] semihosting: Simplify softmmu_lock_user_string |
Date: |
Sat, 30 Apr 2022 06:28:55 -0700 |
We are not currently bounding the search to the 1024 bytes
that we allocated, possibly overrunning the buffer.
Use softmmu_strlen_user to find the length and allocate the
correct size from the beginning.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
semihosting/uaccess.c | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/semihosting/uaccess.c b/semihosting/uaccess.c
index 3cd809122c..f5fc94c401 100644
--- a/semihosting/uaccess.c
+++ b/semihosting/uaccess.c
@@ -54,20 +54,11 @@ ssize_t softmmu_strlen_user(CPUArchState *env, target_ulong
addr)
char *softmmu_lock_user_string(CPUArchState *env, target_ulong addr)
{
- /* TODO: Make this something that isn't fixed size. */
- char *s = malloc(1024);
- size_t len = 0;
-
- if (!s) {
+ ssize_t len = softmmu_strlen_user(env, addr);
+ if (len < 0) {
return NULL;
}
- do {
- if (cpu_memory_rw_debug(env_cpu(env), addr++, s + len, 1, 0)) {
- free(s);
- return NULL;
- }
- } while (s[len++]);
- return s;
+ return softmmu_lock_user(env, addr, len + 1, true);
}
void softmmu_unlock_user(CPUArchState *env, void *p,
--
2.34.1
- [PATCH 38/43] target/m68k: Enable semihosting for non-coldfire, (continued)
- [PATCH 38/43] target/m68k: Enable semihosting for non-coldfire, Richard Henderson, 2022/04/30
- [PATCH 34/43] target/m68k: Eliminate m68k_semi_is_fseek, Richard Henderson, 2022/04/30
- [PATCH 16/43] semihosting: Split common_semi_flen_buf per target, Richard Henderson, 2022/04/30
- [PATCH 23/43] semihosting: Split out semihost_sys_write, Richard Henderson, 2022/04/30
- [PATCH 28/43] semihosting: Split out semihost_sys_remove, Richard Henderson, 2022/04/30
- [PATCH 29/43] semihosting: Split out semihost_sys_rename, Richard Henderson, 2022/04/30
- [PATCH 37/43] target/m68k: Do semihosting call as a normal helper, Richard Henderson, 2022/04/30
- [PATCH 32/43] semihosting: Create semihost_sys_gettimeofday, Richard Henderson, 2022/04/30
- [PATCH 08/43] semihosting: Generalize GuestFDFeatureFile, Richard Henderson, 2022/04/30
- [PATCH 18/43] semihosting: Use env more often in do_common_semihosting, Richard Henderson, 2022/04/30
- [PATCH 06/43] semihosting: Simplify softmmu_lock_user_string,
Richard Henderson <=
- [PATCH 36/43] target/m68k: Use guestfd.h to implement syscalls., Richard Henderson, 2022/04/30
- [PATCH 40/43] target/nios2: Eliminate nios2_semi_is_lseek, Richard Henderson, 2022/04/30
- [PATCH 41/43] target/nios2: Move nios2-semi.c to nios2_softmmu_ss, Richard Henderson, 2022/04/30
- [PATCH 42/43] target/nios2: Use guestfd.h to implement syscalls., Richard Henderson, 2022/04/30
- [PATCH 43/43] target/nios2: Do semihosting call as a normal helper, Richard Henderson, 2022/04/30