linux-kernel - Re: linux-next: manual merge of the kmemcheck tree with the tracing tree

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 for Android: free password hash cracker in your pocket

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

Message-Id: <20090602103216.dab209a1.sfr@canb.auug.org.au>
Date:	Tue, 2 Jun 2009 10:32:16 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Steven Rostedt <srostedt@...hat.com>
Cc:	Vegard Nossum <vegard.nossum@...il.com>,
	Pekka Enberg <penberg@...helsinki.fi>,
	Ingo Molnar <mingo@...e.hu>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the kmemcheck tree with the tracing
 tree

Hi Steve,

On Mon, 01 Jun 2009 10:33:19 -0400 Steven Rostedt <srostedt@...hat.com> wrote:
>
> >  +	/*
> >  +	 * The actual tail page has moved forward.
> >  +	 */
> >  +	if (tail < BUF_PAGE_SIZE) {
> >  +		/* Mark the rest of the page with padding */
> >  +		event = __rb_page_index(tail_page, tail);
> > ++		kmemcheck_annotate_bitfield(event, bitfield);
> 
> Is this...

Just this (since the code was outdented and moved slightly).

> > @@@ -1311,12 -1289,9 +1313,13 @@@
> >   		return NULL;
> >   
> >   	event = __rb_page_index(tail_page, tail);
> > + 	kmemcheck_annotate_bitfield(event, bitfield);
> 
> and this the only changes you needed to fix?

This one git merged on its own.

The "++" is the clue.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped