From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: Richard Henderson <richard.henderson@linaro.org>, qemu-devel@nongnu.org
Cc: alex.bennee@linaro.org, laurent@vivier.eu
Subject: Re: [PATCH v2 5/5] linux-user: Flush out implementation of gettimeofday
Date: Fri, 17 Jan 2020 07:37:21 +0100 [thread overview]
Message-ID: <da0fef63-2a14-ce3e-7328-efa689ad19ea@redhat.com> (raw)
In-Reply-To: <20200116194341.402-6-richard.henderson@linaro.org>
On 1/16/20 8:43 PM, Richard Henderson wrote:
> 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.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> linux-user/syscall.c | 27 +++++++++++++++++++++++++--
> 1 file changed, 25 insertions(+), 2 deletions(-)
>
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index eb867a5296..628b4de9a1 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -1219,6 +1219,23 @@ static inline abi_long host_to_target_timespec64(abi_ulong target_addr,
> return 0;
> }
>
> +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;
> +}
> +
> static inline abi_long copy_from_user_timezone(struct timezone *tz,
> abi_ulong target_tz_addr)
> {
> @@ -8567,10 +8584,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;
>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
next prev parent reply other threads:[~2020-01-17 6:39 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-16 19:43 [PATCH v2 0/5] linux-user: Implement x86_64 vsyscalls Richard Henderson
2020-01-16 19:43 ` [PATCH v2 1/5] target/i386: Renumber EXCP_SYSCALL Richard Henderson
2020-01-16 19:43 ` [PATCH v2 2/5] linux-user/i386: Split out gen_signal Richard Henderson
2020-01-16 19:43 ` [PATCH v2 3/5] linux-user/i386: Emulate x86_64 vsyscalls Richard Henderson
2020-01-20 11:48 ` Alex Bennée
2020-01-21 3:38 ` Richard Henderson
2020-01-21 10:13 ` Alex Bennée
2020-01-21 15:51 ` Richard Henderson
2020-01-21 16:15 ` Alex Bennée
2020-01-21 16:23 ` Paolo Bonzini
2020-01-16 19:43 ` [PATCH v2 4/5] linux-user: Add x86_64 vsyscall page to /proc/self/maps Richard Henderson
2020-01-17 6:39 ` Philippe Mathieu-Daudé
2020-01-20 14:41 ` Alex Bennée
2020-01-16 19:43 ` [PATCH v2 5/5] linux-user: Flush out implementation of gettimeofday Richard Henderson
2020-01-17 6:37 ` Philippe Mathieu-Daudé [this message]
2020-01-20 13:27 ` Alex Bennée
2020-01-16 19:46 ` [PATCH v2 0/5] linux-user: Implement x86_64 vsyscalls Richard Henderson
2020-01-28 17:26 ` Laurent Vivier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=da0fef63-2a14-ce3e-7328-efa689ad19ea@redhat.com \
--to=philmd@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=laurent@vivier.eu \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).