linux-kernel - Re: [PATCH 4.5 142/238] watchdog: dont run proc_watchdog

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] [day] [month] [year] [list]

Message-ID: <20160413155634.GG91959@redhat.com>
Date:	Wed, 13 Apr 2016 11:56:34 -0400
From:	Don Zickus <dzickus@...hat.com>
To:	Ben Hutchings <ben@...adent.org.uk>
Cc:	Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
	linux-kernel@...r.kernel.org, stable@...r.kernel.org,
	Josh Hunt <johunt@...mai.com>,
	Aaron Tomlin <atomlin@...hat.com>,
	Ulrich Obergfell <uobergfe@...hat.com>,
	Andrew Morton <akpm@...ux-foundation.org>,
	Linus Torvalds <torvalds@...ux-foundation.org>
Subject: Re: [PATCH 4.5 142/238] watchdog: dont run proc_watchdog_update if
 new value is same as old

On Tue, Apr 12, 2016 at 11:41:43PM +0100, Ben Hutchings wrote:
> On Sun, 2016-04-10 at 11:35 -0700, Greg Kroah-Hartman wrote:
> 
> > 4.5-stable review patch.  If anyone has any objections, please let me know.
> > 
> > ------------------
> > 
> > From: Joshua Hunt <johunt@...mai.com>
> > 
> > commit a1ee1932aa6bea0bb074f5e3ced112664e4637ed upstream.
> > 
> > While working on a script to restore all sysctl params before a series of
> > tests I found that writing any value into the
> > /proc/sys/kernel/{nmi_watchdog,soft_watchdog,watchdog,watchdog_thresh}
> > causes them to call proc_watchdog_update().
> > 
> >   NMI watchdog: enabled on all CPUs, permanently consumes one hw-PMU counter.
> >   NMI watchdog: enabled on all CPUs, permanently consumes one hw-PMU counter.
> >   NMI watchdog: enabled on all CPUs, permanently consumes one hw-PMU counter.
> >   NMI watchdog: enabled on all CPUs, permanently consumes one hw-PMU counter.
> > 
> > There doesn't appear to be a reason for doing this work every time a write
> > occurs, so only do it when the values change.
> > 
> > Signed-off-by: Josh Hunt <johunt@...mai.com>
> > Acked-by: Don Zickus <dzickus@...hat.com>
> > Reviewed-by: Aaron Tomlin <atomlin@...hat.com>
> > Cc: Ulrich Obergfell <uobergfe@...hat.com>
> > Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
> > Signed-off-by: Linus Torvalds <torvalds@...ux-foundation.org>
> > Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
> > 
> > ---
> >  kernel/watchdog.c |    9 ++++++++-
> >  1 file changed, 8 insertions(+), 1 deletion(-)
> > 
> > --- a/kernel/watchdog.c
> > +++ b/kernel/watchdog.c
> [...]
> > @@ -967,7 +970,7 @@ int proc_soft_watchdog(struct ctl_table
> >  int proc_watchdog_thresh(struct ctl_table *table, int write,
> >  			 void __user *buffer, size_t *lenp, loff_t *ppos)
> >  {
> > -	int err, old;
> > +	int err, old, new;
> >  
> >  	get_online_cpus();
> >  	mutex_lock(&watchdog_proc_mutex);
> > @@ -987,6 +990,10 @@ int proc_watchdog_thresh(struct ctl_tabl
> >  	/*
> >  	 * Update the sample period. Restore on failure.
> >  	 */
> > +	new = ACCESS_ONCE(watchdog_thresh);
> 

Hi Ben,

> This ACCESS_ONCE() doesn't make any sense to me.  Isn't watchdog_thresh
> protected by watchdog_proc_mutex?  If a race on watchdog_thresh is

The write accesses are, but not all the reads.

> still possible then the check for old == new isn't a valid
> optimisation, and if it isn't possible then ACCESS_ONCE() shouldn't be
> used here.

The irq and nmi handlers may read it, but not write.  So there should not be
any race of overwriting watchdog_thresh, just a race to read stale data.

I don't fully understand the use case for ACCESS_ONCE, so it is hard for me
to comment on whether or not the code paths satisfy the use cases or not.

The check for 'old == new' is a needed optimization and should not race
because of the mutex protection.

So, I don't have a good answer for you without understanding ACCESS_ONCE
better.

Cheers,
Don