futex null pointer timeout
PATCH 1/1 futex null pointer timeout
This fix is mostly from Thomas ..
The problem was that a futex can be called with a zero timeout (0 seconds, 0 nanoseconds) and it's a valid expired timeout. However, the current futex in -rt assumes a zero timeout is an infinite timeout.
Kevin Hilman found this using LTP's nptl01 test case which would soft hang occasionally.
The patch reworks do_futex, and futex_wait* so a NULL pointer in the timeout position is infinite, and anything else is evaluated as a real timeout.
--- kernel/futex.c | 14 ++++++++------ kernel/futex_compat.c | 5 +++-- 2 files changed, 11 insertions(+), 8 deletions(-)
kernel/futex.c +8 -6
@@ -1466,7 +1466,7 @@ static int futex_wait(u32 __user *uaddr, current->flags &= ~PF_NOSCHED ; -if (time->tv_sec ==0 && time->tv_nsec ==0 ) +if (!time)schedule ();else { to = &t;
@@ -3070,7 +3070,7 @@ static int futex_wait64(u64 __user *uadd current->flags &= ~PF_NOSCHED ; -if (time->tv_sec ==0 && time->tv_nsec ==0 ) +if (!time)schedule ();else { to = &t;
@@ -3560,7 +3560,7 @@ asmlinkage long sys_futex64(u64 __user *uaddr, int op, u64 val, struct timespec __user *utime, u64 __user *uaddr2, u64 val3) { -struct timespec t = {.tv_sec=0 , .tv_nsec=0 }; +struct timespec t, *tp =NULL ;u64 val2 =0 ;if (utime && (op ==FUTEX_WAIT || op ==FUTEX_LOCK_PI )) {
@@ -3568,6 +3568,7 @@ sys_futex64(u64 __user *uaddr, int op, ureturn -EFAULT ;if (!timespec_valid (&t))return -EINVAL ; + tp = &t; }/* * requeue parameter in 'utime' if op == FUTEX_REQUEUE.
@@ -3576,7 +3577,7 @@ sys_futex64(u64 __user *uaddr, int op, u || op == FUTEX_CMP_REQUEUE_PI) val2 = (unsigned long ) utime; - return do_futex64(uaddr, op, val, &t, uaddr2, val2, val3); + return do_futex64(uaddr, op, val, tp, uaddr2, val2, val3); }#endif
@@ -3585,7 +3586,7 @@ asmlinkage long sys_futex(u32 __user *ua struct timespec __user *utime, u32 __user *uaddr2, u32 val3) { - struct timespec t = {.tv_sec=0, .tv_nsec=0}; + struct timespec t, *tp = NULL;u32 val2 =0 ;if (utime && (op ==FUTEX_WAIT || op ==FUTEX_LOCK_PI )) {
@@ -3593,6 +3594,7 @@ asmlinkage long sys_futex(u32 __user *uareturn -EFAULT ;if (!timespec_valid (&t))return -EINVAL ; + tp = &t; }/* * requeue parameter in 'utime' if op == FUTEX_REQUEUE.
@@ -3601,7 +3603,7 @@ asmlinkage long sys_futex(u32 __user *ua || op == FUTEX_CMP_REQUEUE_PI) val2 = (u32 ) (unsigned long ) utime; -return do_futex (uaddr, op, val, &t, uaddr2, val2, val3); +return do_futex (uaddr, op, val, tp, uaddr2, val2, val3); } static int futexfs_get_sb(struct file_system_type *fs_type,
kernel/futex_compat.c +3 -2
@@ -141,7 +141,7 @@ asmlinkage long compat_sys_futex(u32 __u struct compat_timespec __user *utime, u32 __user *uaddr2, u32 val3) { - struct timespec t = {.tv_sec = 0, .tv_nsec = 0}; + struct timespec t, *tp = NULL;int val2 =0 ;if (utime && (op ==FUTEX_WAIT || op ==FUTEX_LOCK_PI )) {
@@ -149,10 +149,11 @@ asmlinkage long compat_sys_futex(u32 __ureturn -EFAULT ;if (!timespec_valid (&t))return -EINVAL ; + tp = &t; }if (op ==FUTEX_REQUEUE || op ==FUTEX_CMP_REQUEUE || op ==FUTEX_CMP_REQUEUE_PI ) val2 = (int ) (unsigned long ) utime; -return do_futex (uaddr, op, val, &t, uaddr2, val2, val3); +return do_futex (uaddr, op, val, tp, uaddr2, val2, val3); }
Quoted 4 lines · Daniel Walker
The patch reworks
do_futex, and futex_wait* so a NULL pointer in the timeout position is infinite, and anything else is evaluated as a real timeout.Signed-off-by Daniel Walker <[email protected]>
Ack.
tglx
Ingo Molnar
AppliedQuoted 6 lines · Daniel Walker
This fix is mostly from Thomas ..
The problem was that a futex can be called with a zero timeout (0 seconds, 0 nanoseconds) and it's a valid expired timeout. However, the current futex in -rt assumes a zero timeout is an infinite timeout.
Quoted 6 lines
Kevin Hilman found this using LTP's nptl01 test case which would soft hang occasionally.
The patch reworks
do_futex, and futex_wait* so a NULL pointer in the timeout position is infinite, and anything else is evaluated as a real timeout.
thanks, applied.
Ingo
Quoted 2 lines · Ingo Molnar
* Daniel Walker <[email protected]> wrote:
[...]
Quoted 4 lines
Quoted 1 line
The patch reworks
do_futex, and futex_wait* so a NULL pointer in the timeout position is infinite, and anything else is evaluated as a real timeout.thanks, applied.
On top of this patch, you will need the following patch: futex_lock_pi is also involved.
--- futex.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
---
---
kernel/futex.c +2 -2
@@ -1644,7 +1644,7 @@ static int futex_lock_pi(u32 __user *uadif (refill_pi_state_cache ())return -ENOMEM ; -if (time->tv_sec || time->tv_nsec) { +if (time) { to = &timeout;hrtimer_init (&to->timer,CLOCK_REALTIME ,HRTIMER_MODE_ABS );hrtimer_init_sleeper (to, current);
@@ -3197,7 +3197,7 @@ static int futex_lock_pi64(u64 __user *uif (refill_pi_state_cache ())return -ENOMEM ; -if (time->tv_sec || time->tv_nsec) { +if (time) { to = &timeout;hrtimer_init (&to->timer,CLOCK_REALTIME ,HRTIMER_MODE_ABS );hrtimer_init_sleeper (to, current);
Signature · 1 line
Pierre
Quoted 8 lines · Pierre Peiffer
Quoted 2 lines · Ingo Molnar
* Daniel Walker <[email protected]> wrote:
[...]
Quoted 4 lines
Quoted 3 lines
The patch reworks
do_futex, and futex_wait* so a NULL pointer in the timeout position is infinite, and anything else is evaluated as a real timeout.
Quoted 6 lines
Quoted 2 lines
thanks, applied.
On top of this patch, you will need the following patch:
futex_lock_piis also involved.
True.
Daniel
Ingo Molnar
AppliedQuoted 8 lines · Pierre Peiffer
Quoted 2 lines · Ingo Molnar
* Daniel Walker <[email protected]> wrote:
[...]
Quoted 4 lines
Quoted 3 lines
The patch reworks
do_futex, and futex_wait* so a NULL pointer in the timeout position is infinite, and anything else is evaluated as a real timeout.
Quoted 5 lines
Quoted 2 lines
thanks, applied.
On top of this patch, you will need the following patch:
futex_lock_piis also involved.
thanks, applied. (FYI, your mailer added an extra space to every context line in the patch and thus corrupted it, i fixed it up by hand.)
Ingo