diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-11-08 18:02:13 +0300 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2018-01-26 03:34:31 +0300 |
| commit | 47669fb6b5951d0e09fc99719653e0ac92b50b99 (patch) | |
| tree | f640184dbb5f40b3391205b169f6e3a99b3c7e02 | |
| parent | 5bdd0c6f89fba430e18d636493398389dadc3b17 (diff) | |
| download | linux-47669fb6b5951d0e09fc99719653e0ac92b50b99.tar.xz | |
alpha: osf_sys.c: fix put_tv32 regression
There was a typo in the new version of put_tv32() that caused an unguarded
access of a user space pointer, and failed to return the correct result in
gettimeofday(), wait4(), usleep_thread() and old_adjtimex().
This fixes it to give the correct behavior again.
Cc: stable@vger.kernel.org
Fixes: 1cc6c4635e9f ("osf_sys.c: switch handling of timeval32/itimerval32 to copy_{to,from}_user()")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | arch/alpha/kernel/osf_sys.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c index ce3a675c0c4b..75a5c35a2067 100644 --- a/arch/alpha/kernel/osf_sys.c +++ b/arch/alpha/kernel/osf_sys.c @@ -964,8 +964,8 @@ static inline long put_tv32(struct timeval32 __user *o, struct timeval *i) { return copy_to_user(o, &(struct timeval32){ - .tv_sec = o->tv_sec, - .tv_usec = o->tv_usec}, + .tv_sec = i->tv_sec, + .tv_usec = i->tv_usec}, sizeof(struct timeval32)); } |