2005-01-20 02:02:19

by Chris Wright

Subject: [PATCH] mips default mlock limit fix

Mips RLIMIT_MEMLOCK incorrectly defaults to unlimited, it was confused
with RLIMIT_NPROC. Found while consolidating resource.h headers.

Signed-off-by: Chris Wright <[email protected]>

===== include/asm-mips/resource.h 1.6 vs edited =====
--- 1.6/include/asm-mips/resource.h 2004-08-23 01:15:26 -07:00
+++ edited/include/asm-mips/resource.h 2005-01-19 17:34:25 -08:00
@@ -53,8 +53,8 @@
{ INR_OPEN, INR_OPEN }, \
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ RLIM_INFINITY, RLIM_INFINITY }, \
- { MLOCK_LIMIT, MLOCK_LIMIT }, \
- { RLIM_INFINITY, RLIM_INFINITY }, \
+ { 0, 0 }, \
+ { MLOCK_LIMIT, MLOCK_LIMIT }, \
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ MAX_SIGPENDING, MAX_SIGPENDING }, \
{ MQ_BYTES_MAX, MQ_BYTES_MAX }, \

2005-01-20 16:03:39

by Ralf Baechle

Subject: Re: [PATCH] mips default mlock limit fix

On Wed, Jan 19, 2005 at 05:59:45PM -0800, Chris Wright wrote:

> Mips RLIMIT_MEMLOCK incorrectly defaults to unlimited, it was confused
> with RLIMIT_NPROC. Found while consolidating resource.h headers.

Thanks, I applied a recent change off by one line. To avoid this I've
changed the code to use named initializers, see

http://www.linux-mips.org/cgi-bin/mesg.cgi?a=linux-cvs-patches&i=95f18dfc8e770c9885b796a676935677%40NO-ID-FOUND.mhonarc.org

Ralf

2005-01-20 18:18:21

by Chris Wright

Subject: Re: [PATCH] mips default mlock limit fix

* Ralf Baechle ([email protected]) wrote:
> On Wed, Jan 19, 2005 at 05:59:45PM -0800, Chris Wright wrote:
>
> > Mips RLIMIT_MEMLOCK incorrectly defaults to unlimited, it was confused
> > with RLIMIT_NPROC. Found while consolidating resource.h headers.
>
> Thanks, I applied a recent change off by one line. To avoid this I've
> changed the code to use named initializers, see
>
> http://www.linux-mips.org/cgi-bin/mesg.cgi?a=linux-cvs-patches&i=95f18dfc8e770c9885b796a676935677%40NO-ID-FOUND.mhonarc.org

That works too. I made a similar change in the consolidation patch. This
was just meant to be a very simple stop gap fix, while the consolidation
bits bake in -mm before they go to Linus. I prefer to leave it as is,
only so I don't have to respin the patches, but it's not that big a deal.
Either way, Linus should pick up one of the mips fixes.

thanks,
-chris
--
Linux Security Modules http://lsm.immunix.org http://lsm.bkbits.net