linux-kernel - Re: [PATCH v3] ktime: Fix ktime

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: <20150511114112.04fea52d@pog.tecnopolis.ca>
Date:	Mon, 11 May 2015 11:41:12 -0500
From:	Trevor Cordes <trevor@...nopolis.ca>
To:	John Stultz <john.stultz@...aro.org>
Cc:	lkml <linux-kernel@...r.kernel.org>,
	Nicolas Pitre <nicolas.pitre@...aro.org>,
	Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...nel.org>,
	Josh Boyer <jwboyer@...hat.com>,
	One Thousand Gnomes <gnomes@...rguk.ukuu.org.uk>,
	<stable@...r.kernel.org>
Subject: Re: [PATCH v3] ktime: Fix ktime_divns to do signed division

On 2015-05-08 John Stultz wrote:
> It was noted that the 32bit implementation of ktime_divns()
> was doing unsigned division and didn't properly handle
> negative values.
[...]

I have compiled, installed and tested (all weekend) the v3 of the patch
against 3.19.5-201.fc21.i686+PAE and it seems to work fine / stable,
and fixes my bug.  I think it's a done deal!  Thanks once again!

> Cc: Nicolas Pitre <nicolas.pitre@...aro.org>
> Cc: Thomas Gleixner <tglx@...utronix.de>
> Cc: Ingo Molnar <mingo@...nel.org>
> Cc: Josh Boyer <jwboyer@...hat.com>
> Cc: One Thousand Gnomes <gnomes@...rguk.ukuu.org.uk>
> Cc: Trevor Cordes <trevor@...nopolis.ca>
> Cc: <stable@...r.kernel.org> # 3.17+ for regression
> Tested-by: Trevor Cordes <trevor@...nopolis.ca>
> Reported-by: Trevor Cordes <trevor@...nopolis.ca>

Tested-by: Trevor Cordes <trevor@...nopolis.ca> [runtime test i686-PAE]

> Signed-off-by: John Stultz <john.stultz@...aro.org>
> ---
> 
> New in v3:
> * Fix casting issue Nicolas pointed out
> * Use WARN_ON for 64bit case
> 
>  include/linux/ktime.h | 27 +++++++++++++++++++++++----
>  kernel/time/hrtimer.c | 11 ++++++++---
>  2 files changed, 31 insertions(+), 7 deletions(-)
> 
> diff --git a/include/linux/ktime.h b/include/linux/ktime.h
> index 5fc3d10..ab2de1c7 100644
> --- a/include/linux/ktime.h
> +++ b/include/linux/ktime.h
> @@ -166,19 +166,38 @@ static inline bool ktime_before(const ktime_t
> cmp1, const ktime_t cmp2) }
>  
>  #if BITS_PER_LONG < 64
> -extern u64 __ktime_divns(const ktime_t kt, s64 div);
> -static inline u64 ktime_divns(const ktime_t kt, s64 div)
> +extern s64 __ktime_divns(const ktime_t kt, s64 div);
> +static inline s64 ktime_divns(const ktime_t kt, s64 div)
>  {
> +	/*
> +	 * Negative divisors could cause an inf loop,
> +	 * so bug out here.
> +	 */
> +	BUG_ON(div < 0);
>  	if (__builtin_constant_p(div) && !(div >> 32)) {
> -		u64 ns = kt.tv64;
> +		s64 ns = kt.tv64;
> +		int neg = (ns < 0);
> +
> +		if (neg)
> +			ns = -ns;
>  		do_div(ns, div);
> +		if (neg)
> +			ns = -ns;
>  		return ns;
>  	} else {
>  		return __ktime_divns(kt, div);
>  	}
>  }
>  #else /* BITS_PER_LONG < 64 */
> -# define ktime_divns(kt, div)		(u64)((kt).tv64 / (div))
> +static inline s64 ktime_divns(const ktime_t kt, s64 div)
> +{
> +	/*
> +	 * 32-bit implementation cannot handle negative divisors,
> +	 * so catch them on 64bit as well.
> +	 */
> +	WARN_ON(div < 0);
> +	return kt.tv64 / div;
> +}
>  #endif
>  
>  static inline s64 ktime_to_us(const ktime_t kt)
> diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
> index 76d4bd9..c98ce4d 100644
> --- a/kernel/time/hrtimer.c
> +++ b/kernel/time/hrtimer.c
> @@ -266,12 +266,15 @@ lock_hrtimer_base(const struct hrtimer *timer,
> unsigned long *flags) /*
>   * Divide a ktime value by a nanosecond value
>   */
> -u64 __ktime_divns(const ktime_t kt, s64 div)
> +s64 __ktime_divns(const ktime_t kt, s64 div)
>  {
> -	u64 dclc;
> -	int sft = 0;
> +	s64 dclc;
> +	int neg, sft = 0;
>  
>  	dclc = ktime_to_ns(kt);
> +	neg = (dclc < 0);
> +	if (neg)
> +		dclc = -dclc;
>  	/* Make sure the divisor is less than 2^32: */
>  	while (div >> 32) {
>  		sft++;
> @@ -279,6 +282,8 @@ u64 __ktime_divns(const ktime_t kt, s64 div)
>  	}
>  	dclc >>= sft;
>  	do_div(dclc, (unsigned long) div);
> +	if (neg)
> +		dclc = -dclc;
>  
>  	return dclc;
>  }

--
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/