[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 11/13] linux-user: allow NULL tv argument for sett
From: |
riku . voipio |
Subject: |
[Qemu-devel] [PULL v2 11/13] linux-user: allow NULL tv argument for settimeofday |
Date: |
Sun, 29 Jun 2014 15:14:51 +0300 |
From: Paul Burton <address@hidden>
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 <address@hidden>
Signed-off-by: Riku Voipio <address@hidden>
---
linux-user/syscall.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 0ce1a4e..8e2762b 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -6401,11 +6401,15 @@ 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)) {
@@ -6414,7 +6418,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.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 <=
- [Qemu-devel] [PULL v2 10/13] linux-user: respect timezone for settimeofday, riku . voipio, 2014/06/29
- [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