From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44968) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wyeyp-0000kJ-O5 for qemu-devel@nongnu.org; Sun, 22 Jun 2014 06:26:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wyeyg-0005Kr-EZ for qemu-devel@nongnu.org; Sun, 22 Jun 2014 06:26:35 -0400 Received: from mail-we0-x232.google.com ([2a00:1450:400c:c03::232]:60440) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wyeyg-0005KL-8Z for qemu-devel@nongnu.org; Sun, 22 Jun 2014 06:26:26 -0400 Received: by mail-we0-f178.google.com with SMTP id x48so5633447wes.9 for ; Sun, 22 Jun 2014 03:26:25 -0700 (PDT) Sender: Paul Burton From: Paul Burton Date: Sun, 22 Jun 2014 11:25:40 +0100 Message-Id: <1403432748-4679-9-git-send-email-paul@archlinuxmips.org> In-Reply-To: <1403432748-4679-1-git-send-email-paul@archlinuxmips.org> References: <1403432748-4679-1-git-send-email-paul@archlinuxmips.org> Subject: [Qemu-devel] [PATCH v3 08/16] linux-user: respect timezone 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 settimeofday syscall accepts a tz argument indicating the desired timezone to the kernel. QEMU previously ignored any argument provided by the target program & always passed NULL to the kernel. Instead, translate the argument & pass along the data userland provided. Although this argument is described by the settimeofday man page as obsolete, it is used by systemd as of version 213. Signed-off-by: Paul Burton --- Changes in v3: - Fix coding style, checkpatch clean. Changes in v2: - None. --- linux-user/syscall.c | 29 ++++++++++++++++++++++++++++- linux-user/syscall_defs.h | 5 +++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 19c73c9..4f01bb7 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -935,6 +935,23 @@ static inline abi_long copy_to_user_timeval(abi_ulong target_tv_addr, return 0; } +static inline abi_long copy_from_user_timezone(struct timezone *tz, + abi_ulong target_tz_addr) +{ + struct target_timezone *target_tz; + + if (!lock_user_struct(VERIFY_READ, target_tz, target_tz_addr, 1)) { + return -TARGET_EFAULT; + } + + __get_user(tz->tz_minuteswest, &target_tz->tz_minuteswest); + __get_user(tz->tz_dsttime, &target_tz->tz_dsttime); + + unlock_user_struct(target_tz, target_tz_addr, 0); + + return 0; +} + #if defined(TARGET_NR_mq_open) && defined(__NR_mq_open) #include @@ -6337,9 +6354,19 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, case TARGET_NR_settimeofday: { struct timeval tv; + struct timezone tz, *ptz = NULL; + if (copy_from_user_timeval(&tv, arg1)) goto efault; - ret = get_errno(settimeofday(&tv, NULL)); + + if (arg2) { + if (copy_from_user_timezone(&tz, arg2)) { + goto efault; + } + ptz = &tz; + } + + ret = get_errno(settimeofday(&tv, ptz)); } break; #if defined(TARGET_NR_select) diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index e379b45..a1f1fce 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -165,6 +165,11 @@ struct target_timespec { abi_long tv_nsec; }; +struct target_timezone { + abi_int tz_minuteswest; + abi_int tz_dsttime; +}; + struct target_itimerval { struct target_timeval it_interval; struct target_timeval it_value; -- 2.0.0