From: Jan-Simon Möller <dl9pf@gmx.de>
Date: Sat, 17 Oct 2009 18:52:43 +0000 (+0300)
Subject: Re: linux-user/syscall.c - don't add GUEST_BASE to NULL pointer
X-Git-Tag: TizenStudio_2.0_p2.3~7004^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3d6aae3f8049d57e02721633eceefd183db6fb3a;p=sdk%2Femulator%2Fqemu.git

Re: linux-user/syscall.c - don't add GUEST_BASE to NULL pointer

This patch fixes the mount call. GUEST_BASE shouldn't be added to a NULL pointer on arg5 . failing call:
mount("rootfs", "/", 0x47a78, MS_MGC_VAL|MS_REMOUNT, 0x10000) = -1 EFAULT (Bad address)

correct call:
mount("rootfs", "/", 0x37ab0, MS_MGC_VAL|MS_REMOUNT, NULL) = 0

Signed-off-by:  Jan-Simon Möller  <dl9pf@gmx.de>
Signed-off-by: Riku Voipio <riku.voipio@iki.fi>
---

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 31dfcb7..0254226 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -4463,12 +4463,16 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
 			p3 = lock_user_string(arg3);
                         if (!p || !p2 || !p3)
                             ret = -TARGET_EFAULT;
-                        else
+                        else {
                             /* FIXME - arg5 should be locked, but it isn't clear how to
                              * do that since it's not guaranteed to be a NULL-terminated
                              * string.
                              */
-                            ret = get_errno(mount(p, p2, p3, (unsigned long)arg4, g2h(arg5)));
+                            if ( ! arg5 )
+                                ret = get_errno(mount(p, p2, p3, (unsigned long)arg4, NULL));
+                            else
+                                ret = get_errno(mount(p, p2, p3, (unsigned long)arg4, g2h(arg5)));
+                        }
                         unlock_user(p, arg1, 0);
                         unlock_user(p2, arg2, 0);
                         unlock_user(p3, arg3, 0);