[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 07/53] semihosting: Simplify softmmu_lock_user_string
From: |
Richard Henderson |
Subject: |
[PATCH v4 07/53] semihosting: Simplify softmmu_lock_user_string |
Date: |
Tue, 7 Jun 2022 13:45:11 -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.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
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 d6997e3c65..8018828069 100644
--- a/semihosting/uaccess.c
+++ b/semihosting/uaccess.c
@@ -74,20 +74,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 v4 06/53] semihosting: Add target_strlen for softmmu-uaccess.h, (continued)
- [PATCH v4 06/53] semihosting: Add target_strlen for softmmu-uaccess.h, Richard Henderson, 2022/06/07
- [PATCH v4 09/53] semihosting: Inline set_swi_errno into common_semi_cb, Richard Henderson, 2022/06/07
- [PATCH v4 12/53] semihosting: Clean up common_semi_open_cb, Richard Henderson, 2022/06/07
- [PATCH v4 04/53] semihosting: Move softmmu-uaccess.h functions out of line, Richard Henderson, 2022/06/07
- [PATCH v4 13/53] semihosting: Return void from do_common_semihosting, Richard Henderson, 2022/06/07
- [PATCH v4 18/53] include/exec: Define errno values in gdbstub.h, Richard Henderson, 2022/06/07
- [PATCH v4 17/53] include/exec: Move gdb_stat and gdb_timeval to gdbstub.h, Richard Henderson, 2022/06/07
- [PATCH v4 03/53] semihosting: Improve condition for config.c and console.c, Richard Henderson, 2022/06/07
- [PATCH v4 07/53] semihosting: Simplify softmmu_lock_user_string,
Richard Henderson <=
- [PATCH v4 05/53] accel/stubs: Add tcg stub for probe_access_flags, Richard Henderson, 2022/06/07
- [PATCH v4 08/53] semihosting: Split out guestfd.c, Richard Henderson, 2022/06/07
- [PATCH v4 11/53] semihosting: Clean up common_semi_flen_cb, Richard Henderson, 2022/06/07
- [PATCH v4 10/53] semihosting: Adjust error checking in common_semi_cb, Richard Henderson, 2022/06/07
- [PATCH v4 02/53] semihosting: Return failure from softmmu-uaccess.h functions, Richard Henderson, 2022/06/07