linux-kernel - Re: [PATCH 59/97] NOMMU: Optimise away the {dac_,}mmap_min

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]

Date:	Thu, 7 Jan 2010 09:58:09 -0800
From:	Greg KH <gregkh@...e.de>
To:	Mike Frysinger <vapier.adi@...il.com>
Cc:	linux-kernel@...r.kernel.org, stable@...nel.org,
	stable-review@...nel.org, torvalds@...ux-foundation.org,
	akpm@...ux-foundation.org, alan@...rguk.ukuu.org.uk,
	David Howells <dhowells@...hat.com>,
	James Morris <jmorris@...ei.org>
Subject: Re: [PATCH 59/97] NOMMU: Optimise away the {dac_,}mmap_min_addr
 tests

On Wed, Jan 06, 2010 at 09:03:31PM -0500, Mike Frysinger wrote:
> On Mon, Jan 4, 2010 at 19:33, Greg Kroah-Hartman wrote:
> > --- a/kernel/sysctl.c
> > +++ b/kernel/sysctl.c
> > @@ -1200,6 +1200,7 @@ static struct ctl_table vm_table[] = {
> >                .extra2         = (void *)&hugetlb_infinity,
> >        },
> >  #endif
> > +#ifdef CONFIG_MMU
> >        {
> >                .ctl_name       = VM_LOWMEM_RESERVE_RATIO,
> >                .procname       = "lowmem_reserve_ratio",
> > @@ -1353,6 +1354,7 @@ static struct ctl_table vm_table[] = {
> >                .mode           = 0644,
> >                .proc_handler   = &mmap_min_addr_handler,
> >        },
> > +#endif
> >  #ifdef CONFIG_NUMA
> >        {
> >                .ctl_name       = CTL_UNNUMBERED,
> 
> seems there was a merge error here when adding the patch to the stable
> branch.  this change disables a large number of things when it should
> only be disabling mmap_min_addr.  notice how the first #ifdef appears
> at line ~1200 while the second appears at line ~1353.  the original
> commit was ~1214 to ~1221.

Ah crap :(

Can you send me a patch against 2.6.32.3 that fixes this up so I can get
a new release out with it?

thanks,

greg k-h
--
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/