From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51177) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WyUAb-00059Q-88 for qemu-devel@nongnu.org; Sat, 21 Jun 2014 18:54:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WyUAV-0005dH-Js for qemu-devel@nongnu.org; Sat, 21 Jun 2014 18:54:01 -0400 Received: from mail-wg0-x22e.google.com ([2a00:1450:400c:c00::22e]:44952) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WyUAV-0005cx-Co for qemu-devel@nongnu.org; Sat, 21 Jun 2014 18:53:55 -0400 Received: by mail-wg0-f46.google.com with SMTP id y10so5135367wgg.5 for ; Sat, 21 Jun 2014 15:53:53 -0700 (PDT) Sender: Paul Burton From: Paul Burton Date: Sat, 21 Jun 2014 23:53:04 +0100 Message-Id: <1403391191-18603-10-git-send-email-paul@archlinuxmips.org> In-Reply-To: <1403391191-18603-1-git-send-email-paul@archlinuxmips.org> References: <1403391191-18603-1-git-send-email-paul@archlinuxmips.org> Subject: [Qemu-devel] [PATCH v2 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 --- Changes in v2: - None. --- 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 ef04dc6..cd0221b 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -6342,11 +6342,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)) @@ -6354,7 +6357,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