Commit 11648b83 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by David S. Miller

sparc64: fix adjtimex regression

Anatoly Pugachev reported one of the y2038 patches to introduce
a fatal bug from a stupid typo:

[   96.384129] watchdog: BUG: soft lockup - CPU#8 stuck for 22s!
...
[   96.385624]  [0000000000652ca4] handle_mm_fault+0x84/0x320
[   96.385668]  [0000000000b6f2bc] do_sparc64_fault+0x43c/0x820
[   96.385720]  [0000000000407754] sparc64_realfault_common+0x10/0x20
[   96.385769]  [000000000042fa28] __do_sys_sparc_clock_adjtime+0x28/0x80
[   96.385819]  [00000000004307f0] sys_sparc_clock_adjtime+0x10/0x20
[   96.385866]  [0000000000406294] linux_sparc_syscall+0x34/0x44

Fix the code to dereference the correct pointer again.
Reported-by: default avatarAnatoly Pugachev <matorola@gmail.com>
Tested-by: default avatarAnatoly Pugachev <matorola@gmail.com>
Fixes: 251ec1c1 ("y2038: sparc: remove use of struct timex")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 94f2630b
...@@ -551,7 +551,7 @@ SYSCALL_DEFINE2(getdomainname, char __user *, name, int, len) ...@@ -551,7 +551,7 @@ SYSCALL_DEFINE2(getdomainname, char __user *, name, int, len)
SYSCALL_DEFINE1(sparc_adjtimex, struct __kernel_timex __user *, txc_p) SYSCALL_DEFINE1(sparc_adjtimex, struct __kernel_timex __user *, txc_p)
{ {
struct __kernel_timex txc; struct __kernel_timex txc;
struct __kernel_old_timeval *tv = (void *)&txc_p->time; struct __kernel_old_timeval *tv = (void *)&txc.time;
int ret; int ret;
/* Copy the user data space into the kernel copy /* Copy the user data space into the kernel copy
...@@ -576,7 +576,7 @@ SYSCALL_DEFINE2(sparc_clock_adjtime, const clockid_t, which_clock, ...@@ -576,7 +576,7 @@ SYSCALL_DEFINE2(sparc_clock_adjtime, const clockid_t, which_clock,
struct __kernel_timex __user *, txc_p) struct __kernel_timex __user *, txc_p)
{ {
struct __kernel_timex txc; struct __kernel_timex txc;
struct __kernel_old_timeval *tv = (void *)&txc_p->time; struct __kernel_old_timeval *tv = (void *)&txc.time;
int ret; int ret;
if (!IS_ENABLED(CONFIG_POSIX_TIMERS)) { if (!IS_ENABLED(CONFIG_POSIX_TIMERS)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment