david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Jan-Simon Möller 2009-10-17 21:52:43 +03:00 committed by Riku Voipio
parent f7680a5593
commit dab46405d9
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
linux-user/syscall.c
View File

@ -4463,12 +4463,16 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
p3 = lock_user_string(arg3); p3 = lock_user_string(arg3);
if (!p || !p2 || !p3) if (!p || !p2 || !p3)
ret = -TARGET_EFAULT; ret = -TARGET_EFAULT;
else else {
/* FIXME - arg5 should be locked, but it isn't clear how to /* FIXME - arg5 should be locked, but it isn't clear how to
* do that since it's not guaranteed to be a NULL-terminated * do that since it's not guaranteed to be a NULL-terminated
* string. * 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(p, arg1, 0);
unlock_user(p2, arg2, 0); unlock_user(p2, arg2, 0);
unlock_user(p3, arg3, 0); unlock_user(p3, arg3, 0);