| Message ID | 20170118192428.2661-1-bobby.prani@gmail.com |
|---|---|
| State | New |
| Headers | show |
Le 18/01/2017 à 20:24, Pranith Kumar a écrit : > From: Marc-André Lureau <marcandre.lureau@redhat.com> > > old_value is the 4th argument of timer_settime(), not the 2nd. > > CC: Laurent Vivier <laurent@vivier.eu> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > [pranith: review comments] > Signed-off-by: Pranith Kumar <bobby.prani@gmail.com> > Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > --- > linux-user/syscall.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/linux-user/syscall.c b/linux-user/syscall.c > index 7b77503f94..724607be43 100644 > --- a/linux-user/syscall.c > +++ b/linux-user/syscall.c > @@ -12027,7 +12027,9 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, > target_to_host_itimerspec(&hspec_new, arg3); as said by Peter in his first comment, target_to_host_itimerspec() can return -TARGET_EFAULT. You should fix that too. Thanks, Laurent
On Wed, Jan 18, 2017 at 2:59 PM, Laurent Vivier <laurent@vivier.eu> wrote: > Le 18/01/2017 à 20:24, Pranith Kumar a écrit : >> From: Marc-André Lureau <marcandre.lureau@redhat.com> >> >> old_value is the 4th argument of timer_settime(), not the 2nd. >> >> CC: Laurent Vivier <laurent@vivier.eu> >> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> >> [pranith: review comments] >> Signed-off-by: Pranith Kumar <bobby.prani@gmail.com> >> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> >> --- >> linux-user/syscall.c | 4 +++- >> 1 file changed, 3 insertions(+), 1 deletion(-) >> >> diff --git a/linux-user/syscall.c b/linux-user/syscall.c >> index 7b77503f94..724607be43 100644 >> --- a/linux-user/syscall.c >> +++ b/linux-user/syscall.c >> @@ -12027,7 +12027,9 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, >> target_to_host_itimerspec(&hspec_new, arg3); > > as said by Peter in his first comment, target_to_host_itimerspec() can > return -TARGET_EFAULT. You should fix that too. Hmm, shoddy job by me. I missed his comments from the first time. Will fix them. Thanks,
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 7b77503f94..724607be43 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -12027,7 +12027,9 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, target_to_host_itimerspec(&hspec_new, arg3); ret = get_errno( timer_settime(htimer, arg2, &hspec_new, &hspec_old)); - host_to_target_itimerspec(arg2, &hspec_old); + if (arg4 && host_to_target_itimerspec(arg4, &hspec_old)) { + goto efault; + } } break; }