[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 5/5] linux-user: Flush out implementation of gettimeofday
From: |
Laurent Vivier |
Subject: |
[PULL v2 5/5] linux-user: Flush out implementation of gettimeofday |
Date: |
Tue, 24 Mar 2020 12:17:00 +0100 |
From: Richard Henderson <address@hidden>
The first argument, timeval, is allowed to be NULL.
The second argument, timezone, was missing. While its use is
deprecated, it is still present in the syscall.
Reviewed-by: Alex Bennée <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
Message-Id: <address@hidden>
[lv: add "#if defined(TARGET_NR_gettimeofday)"]
Signed-off-by: Laurent Vivier <address@hidden>
---
linux-user/syscall.c | 29 +++++++++++++++++++++++++++--
1 file changed, 27 insertions(+), 2 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index dbdd56e42077..49395dcea978 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -1273,6 +1273,25 @@ static inline abi_long
host_to_target_timespec64(abi_ulong target_addr,
return 0;
}
+#if defined(TARGET_NR_gettimeofday)
+static inline abi_long copy_to_user_timezone(abi_ulong target_tz_addr,
+ struct timezone *tz)
+{
+ struct target_timezone *target_tz;
+
+ if (!lock_user_struct(VERIFY_WRITE, target_tz, target_tz_addr, 1)) {
+ return -TARGET_EFAULT;
+ }
+
+ __put_user(tz->tz_minuteswest, &target_tz->tz_minuteswest);
+ __put_user(tz->tz_dsttime, &target_tz->tz_dsttime);
+
+ unlock_user_struct(target_tz, target_tz_addr, 1);
+
+ return 0;
+}
+#endif
+
#if defined(TARGET_NR_settimeofday)
static inline abi_long copy_from_user_timezone(struct timezone *tz,
abi_ulong target_tz_addr)
@@ -8710,10 +8729,16 @@ static abi_long do_syscall1(void *cpu_env, int num,
abi_long arg1,
case TARGET_NR_gettimeofday:
{
struct timeval tv;
- ret = get_errno(gettimeofday(&tv, NULL));
+ struct timezone tz;
+
+ ret = get_errno(gettimeofday(&tv, &tz));
if (!is_error(ret)) {
- if (copy_to_user_timeval(arg1, &tv))
+ if (arg1 && copy_to_user_timeval(arg1, &tv)) {
+ return -TARGET_EFAULT;
+ }
+ if (arg2 && copy_to_user_timezone(arg2, &tz)) {
return -TARGET_EFAULT;
+ }
}
}
return ret;
--
2.25.1
- [PULL v2 0/5] Linux user for 5.0 patches, Laurent Vivier, 2020/03/24
- [PULL v2 4/5] linux-user: Add x86_64 vsyscall page to /proc/self/maps, Laurent Vivier, 2020/03/24
- [PULL v2 1/5] target/i386: Renumber EXCP_SYSCALL, Laurent Vivier, 2020/03/24
- [PULL v2 2/5] linux-user/i386: Split out gen_signal, Laurent Vivier, 2020/03/24
- [PULL v2 3/5] linux-user/i386: Emulate x86_64 vsyscalls, Laurent Vivier, 2020/03/24
- [PULL v2 5/5] linux-user: Flush out implementation of gettimeofday,
Laurent Vivier <=
- Re: [PULL v2 0/5] Linux user for 5.0 patches, Peter Maydell, 2020/03/24