linux-kernel - Re: [PATCH V3] futex: set FLAGS_HAS_TIMEOUT during demux for FUTEX

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1302813795.2744.41.camel@edumazet-laptop>
Date:	Thu, 14 Apr 2011 22:43:15 +0200
From:	Eric Dumazet <eric.dumazet@...il.com>
To:	Darren Hart <dvhart@...ux.intel.com>
Cc:	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Stable <stable@...nel.org>,
	Thomas Gleixner <tglx@...utronix.de>,
	Peter Zijlstra <peterz@...radead.org>,
	Ingo Molnar <mingo@...e.hu>, John Kacur <jkacur@...hat.com>
Subject: Re: [PATCH V3] futex: set FLAGS_HAS_TIMEOUT during demux for
 FUTEX_WAIT

Le jeudi 14 avril 2011 à 13:39 -0700, Darren Hart a écrit :
> The FLAGS_HAS_TIMEOUT flag was not getting set, causing the restart_block to
> restart futex_wait() without a timeout after a signal.
> 
> Commit b41277dc7a18ee332d in 2.6.38 introduced the regression by accidentally
> removing the the FLAGS_HAS_TIMEOUT assignment from futex_wait() during the setup
> of the restart block. Restore the originaly behavior.
> 
> Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=32922
> 
> V2: Added references to commit message.
> V3: Set flag during restart block instead of do_futex()
> 
> Signed-off-by: Darren Hart <dvhart@...ux.intel.com>
> Reported-by: Tim Smith <tsmith201104@...oo.com>
> Reported-by: Torsten Hilbrich <torsten.hilbrich@...unet.com>
> Cc: Thomas Gleixner <tglx@...utronix.de>
> Cc: Peter Zijlstra <peterz@...radead.org>
> Cc: Ingo Molnar <mingo@...e.hu>
> CC: Eric Dumazet <eric.dumazet@...il.com>
> CC: John Kacur <jkacur@...hat.com>
> ---
>  kernel/futex.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/kernel/futex.c b/kernel/futex.c
> index bda4157..9d9c476 100644
> --- a/kernel/futex.c
> +++ b/kernel/futex.c
> @@ -1887,6 +1887,7 @@ retry:
>  	restart->futex.time = abs_time->tv64;
>  	restart->futex.bitset = bitset;
>  	restart->futex.flags = flags;
> +	flags |= FLAGS_HAS_TIMEOUT;
>  
>  	ret = -ERESTART_RESTARTBLOCK;
>  


Hmmm, I am sorry but this wont work... please try :

-	restart->futex.flags = flags;
+	restart->futex.flags = flags | FLAGS_HAS_TIMEOUT;


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/