[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/7] linux-user: Verify MIPS syscall arguments
From: |
riku . voipio |
Subject: |
[Qemu-devel] [PATCH 5/7] linux-user: Verify MIPS syscall arguments |
Date: |
Fri, 9 Sep 2011 12:32:29 +0300 |
From: An-Cheng Huang <address@hidden>
On MIPS, some syscall arguments are taken from the stack. This patch adds
verification such that do_syscall() is only invoked if all arguments
have been successfully taken from the stack.
Signed-off-by: Riku Voipio <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: An-Cheng Huang <address@hidden>
---
linux-user/main.c | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/linux-user/main.c b/linux-user/main.c
index 3df91f3..0cc9148 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -2170,11 +2170,22 @@ void cpu_loop(CPUMIPSState *env)
sp_reg = env->active_tc.gpr[29];
switch (nb_args) {
/* these arguments are taken from the stack */
- /* FIXME - what to do if get_user() fails? */
- case 8: get_user_ual(arg8, sp_reg + 28);
- case 7: get_user_ual(arg7, sp_reg + 24);
- case 6: get_user_ual(arg6, sp_reg + 20);
- case 5: get_user_ual(arg5, sp_reg + 16);
+ case 8:
+ if ((ret = get_user_ual(arg8, sp_reg + 28)) != 0) {
+ goto done_syscall;
+ }
+ case 7:
+ if ((ret = get_user_ual(arg7, sp_reg + 24)) != 0) {
+ goto done_syscall;
+ }
+ case 6:
+ if ((ret = get_user_ual(arg6, sp_reg + 20)) != 0) {
+ goto done_syscall;
+ }
+ case 5:
+ if ((ret = get_user_ual(arg5, sp_reg + 16)) != 0) {
+ goto done_syscall;
+ }
default:
break;
}
@@ -2185,6 +2196,7 @@ void cpu_loop(CPUMIPSState *env)
env->active_tc.gpr[7],
arg5, arg6, arg7, arg8);
}
+done_syscall:
if (ret == -TARGET_QEMU_ESIGRETURN) {
/* Returning from a successful sigreturn syscall.
Avoid clobbering register state. */
--
1.7.4.1
- [Qemu-devel] [PATCH 0/7] pending linux-user patches, riku . voipio, 2011/09/09
- [Qemu-devel] [PATCH 4/7] linux-user: Fix MIPS indirect syscall handling, riku . voipio, 2011/09/09
- [Qemu-devel] [PATCH 5/7] linux-user: Verify MIPS syscall arguments,
riku . voipio <=
- [Qemu-devel] [PATCH 3/7] linux-user: Exit with an error if we couldn't set up gdbserver, riku . voipio, 2011/09/09
- [Qemu-devel] [PATCH 2/7] linux-user: Implement new ARM 64 bit cmpxchg kernel helper, riku . voipio, 2011/09/09
- [Qemu-devel] [PATCH 6/7] linux-user: Implement setxattr/getxattr/removexattr syscalls, riku . voipio, 2011/09/09
- [Qemu-devel] [PATCH 1/7] linux-user: Fix initialization of the heap contents when allocating new pages, riku . voipio, 2011/09/09
- [Qemu-devel] [PATCH 7/7] introduce environment variables for all qemu-user options, riku . voipio, 2011/09/09