| Message ID | 20161201051433.17168-2-bobby.prani@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Pranith Kumar <bobby.prani@gmail.com> writes: > From: Marc-André Lureau <marcandre.lureau@redhat.com> > > old_value is the 4th argument of timer_settime(), not the 2nd. > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > Signed-off-by: Pranith Kumar <bobby.prani@gmail.com> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> but this should really be sent in another series. > --- > linux-user/syscall.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/linux-user/syscall.c b/linux-user/syscall.c > index 7b77503..5bd477a 100644 > --- a/linux-user/syscall.c > +++ b/linux-user/syscall.c > @@ -12027,7 +12027,7 @@ 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); > + host_to_target_itimerspec(arg4, &hspec_old); > } > break; > } -- Alex Bennée
Le 01/12/2016 à 06:14, Pranith Kumar a écrit : > From: Marc-André Lureau <marcandre.lureau@redhat.com> > > old_value is the 4th argument of timer_settime(), not the 2nd. > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > Signed-off-by: Pranith Kumar <bobby.prani@gmail.com> > --- > linux-user/syscall.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/linux-user/syscall.c b/linux-user/syscall.c > index 7b77503..5bd477a 100644 > --- a/linux-user/syscall.c > +++ b/linux-user/syscall.c > @@ -12027,7 +12027,7 @@ 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); > + host_to_target_itimerspec(arg4, &hspec_old); > } > break; > } > arg4 can be NULL. You should check for the return value like in timerfd_settime. In the kernel we have: if (old_setting && !error && copy_to_user(old_setting, &old_spec, sizeof (old_spec))) error = -EFAULT; Laurent
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 7b77503..5bd477a 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -12027,7 +12027,7 @@ 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); + host_to_target_itimerspec(arg4, &hspec_old); } break; }