[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 10/13] linux-user: respect timezone for settimeofd
From: |
riku . voipio |
Subject: |
[Qemu-devel] [PULL v2 10/13] linux-user: respect timezone for settimeofday |
Date: |
Sun, 29 Jun 2014 15:14:50 +0300 |
From: Paul Burton <address@hidden>
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 <address@hidden>
Signed-off-by: Riku Voipio <address@hidden>
---
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 4e48af6..0ce1a4e 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 <mqueue.h>
@@ -6385,9 +6402,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.rc2
- [Qemu-devel] [PULL v2 00/13] linux-user changes for 2.1, riku . voipio, 2014/06/29
- [Qemu-devel] [PULL v2 01/13] Add support for MAP_NORESERVE mmap flag., riku . voipio, 2014/06/29
- [Qemu-devel] [PULL v2 03/13] linux-user: translate the result of getsockopt SO_TYPE, riku . voipio, 2014/06/29
- [Qemu-devel] [PULL v2 04/13] linux-user: support SO_ACCEPTCONN getsockopt option, riku . voipio, 2014/06/29
- [Qemu-devel] [PULL v2 08/13] linux-user: support strace of epoll_create1, riku . voipio, 2014/06/29
- [Qemu-devel] [PULL v2 05/13] linux-user: support SO_{SND, RCV}BUFFORCE setsockopt options, riku . voipio, 2014/06/29
- [Qemu-devel] [PULL v2 06/13] linux-user: support SO_PASSSEC setsockopt option, riku . voipio, 2014/06/29
- [Qemu-devel] [PULL v2 12/13] linux-user: support the KDSIGACCEPT ioctl, riku . voipio, 2014/06/29
- [Qemu-devel] [PULL v2 07/13] linux-user: allow NULL arguments to mount, riku . voipio, 2014/06/29
- [Qemu-devel] [PULL v2 11/13] linux-user: allow NULL tv argument for settimeofday, riku . voipio, 2014/06/29
- [Qemu-devel] [PULL v2 10/13] linux-user: respect timezone for settimeofday,
riku . voipio <=
- [Qemu-devel] [PULL v2 09/13] linux-user: fix struct target_epoll_event layout for MIPS, riku . voipio, 2014/06/29
- [Qemu-devel] [PULL v2 02/13] linux-user: added fake open() for /proc/self/cmdline, riku . voipio, 2014/06/29
- [Qemu-devel] [PULL v2 13/13] linux-user: support the SIOCGIFINDEX ioctl, riku . voipio, 2014/06/29
- Re: [Qemu-devel] [PULL v2 00/13] linux-user changes for 2.1, Peter Maydell, 2014/06/29