From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51882) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwD97-00057d-KF for qemu-devel@nongnu.org; Sun, 15 Jun 2014 12:19:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WwD91-00066E-U9 for qemu-devel@nongnu.org; Sun, 15 Jun 2014 12:19:05 -0400 Received: from mail-we0-x22e.google.com ([2a00:1450:400c:c03::22e]:44074) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwD91-000663-NO for qemu-devel@nongnu.org; Sun, 15 Jun 2014 12:18:59 -0400 Received: by mail-we0-f174.google.com with SMTP id u57so4760024wes.33 for ; Sun, 15 Jun 2014 09:18:59 -0700 (PDT) Sender: Paul Burton From: Paul Burton Date: Sun, 15 Jun 2014 17:18:26 +0100 Message-Id: <1402849113-11402-10-git-send-email-paul@archlinuxmips.org> In-Reply-To: <1402849113-11402-1-git-send-email-paul@archlinuxmips.org> References: <1402849113-11402-1-git-send-email-paul@archlinuxmips.org> Subject: [Qemu-devel] [PATCH 09/16] linux-user: allow NULL tv argument for settimeofday List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Riku Voipio , Paul Burton The tv argument to the settimeofday syscall is allowed to be NULL, if the program only wishes to provide the timezone. QEMU previously returned -EFAULT when tv was NULL. Instead, execute the syscall & provide NULL to the kernel as the target program expected. Signed-off-by: Paul Burton --- linux-user/syscall.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index d30dff8..8ebb9e7 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -6344,11 +6344,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, break; case TARGET_NR_settimeofday: { - struct timeval tv; + struct timeval tv, *ptv = NULL; struct timezone tz, *ptz = NULL; - if (copy_from_user_timeval(&tv, arg1)) - goto efault; + if (arg1) { + if (copy_from_user_timeval(&tv, arg1)) + goto efault; + ptv = &tv; + } if (arg2) { if (copy_from_user_timezone(&tz, arg2)) @@ -6356,7 +6359,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, ptz = &tz; } - ret = get_errno(settimeofday(&tv, ptz)); + ret = get_errno(settimeofday(ptv, ptz)); } break; #if defined(TARGET_NR_select) -- 2.0.0