mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Randy.Dunlap" <rddunlap@osdl.org>
To: Rik van Riel <riel@redhat.com>
Cc: akpm@osdl.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] increase mlock limit to 32k
Date: Thu, 5 Aug 2004 08:14:45 -0700	[thread overview]
Message-ID: <20040805081445.1c4b085e.rddunlap@osdl.org> (raw)
In-Reply-To: <Pine.LNX.4.44.0408050005380.25023-100000@dhcp83-102.boston.redhat.com>

On Thu, 5 Aug 2004 00:08:33 -0400 (EDT) Rik van Riel wrote:

| Since various gnupg users have indicated that gpg wants to mlock
| 32kB of memory, I created the patch below that increases the
| default mlock ulimit to 32kB.
| 
| This is no security problem because it's trivial for processes
| to lock way more memory than this in page tables, network buffers,
| etc.   In fact, since this patch allows gnupg to mlock to prevent
| passphrase data from being swapped out, the security people will
| probably like it ;)
| 
| Signed-off-by: Rik van Riel <riel@redhat.com>
| 
| 
| --- linux-2.6.7/include/asm-ppc64/resource.h.mlock	2004-08-04 07:46:42.000000000 -0400
| +++ linux-2.6.7/include/asm-ppc64/resource.h	2004-08-04 07:47:06.000000000 -0400
| @@ -45,7 +45,7 @@
|  	{ RLIM_INFINITY, RLIM_INFINITY },		\
|  	{             0,             0 },		\
|  	{      INR_OPEN,     INR_OPEN  },		\
| -	{ PAGE_SIZE,     PAGE_SIZE     },		\
| +	{ 32768,	     32768     },		\
|  	{ RLIM_INFINITY, RLIM_INFINITY },		\
|  	{ RLIM_INFINITY, RLIM_INFINITY },		\
|  	{ MAX_SIGPENDING, MAX_SIGPENDING },		\
| --- linux-2.6.7/include/asm-m68k/resource.h.mlock	2004-08-04 07:46:42.000000000 -0400
| +++ linux-2.6.7/include/asm-m68k/resource.h	2004-08-04 07:47:06.000000000 -0400
| @@ -39,7 +39,7 @@
|  	{ RLIM_INFINITY, RLIM_INFINITY },		\
|  	{             0,             0 },		\
|  	{      INR_OPEN,     INR_OPEN  },		\
| -	{ PAGE_SIZE,     PAGE_SIZE     },		\
| +	{ 	32768,		32768  },			\
|  	{ RLIM_INFINITY, RLIM_INFINITY },		\
|  	{ RLIM_INFINITY, RLIM_INFINITY },		\
|  	{ MAX_SIGPENDING, MAX_SIGPENDING },		\
| --- linux-2.6.7/include/asm-parisc/resource.h.mlock	2004-08-04 07:46:42.000000000 -0400
| +++ linux-2.6.7/include/asm-parisc/resource.h	2004-08-04 07:47:06.000000000 -0400
| @@ -39,7 +39,7 @@
|  	{ RLIM_INFINITY, RLIM_INFINITY },		\
|  	{             0,             0 },		\
|  	{      INR_OPEN,     INR_OPEN  },		\
| -	{ PAGE_SIZE,     PAGE_SIZE     },		\
| +	{ 	32768,		32768  },		\
|  	{ RLIM_INFINITY, RLIM_INFINITY },		\
|  	{ RLIM_INFINITY, RLIM_INFINITY },		\
|  	{ MAX_SIGPENDING, MAX_SIGPENDING },		\
| --- linux-2.6.7/include/asm-ppc/resource.h.mlock	2004-08-04 07:46:42.000000000 -0400
| +++ linux-2.6.7/include/asm-ppc/resource.h	2004-08-04 07:47:06.000000000 -0400
| @@ -36,7 +36,7 @@
|  	{ RLIM_INFINITY, RLIM_INFINITY },		\
|  	{             0,             0 },		\
|  	{      INR_OPEN,     INR_OPEN  },		\
| -	{ PAGE_SIZE,     PAGE_SIZE     },		\
| +	{	 32768,		32768  },		\
|  	{ RLIM_INFINITY, RLIM_INFINITY },		\
|  	{ RLIM_INFINITY, RLIM_INFINITY },		\
|  	{ MAX_SIGPENDING, MAX_SIGPENDING },		\
| --- linux-2.6.7/include/asm-x86_64/resource.h.mlock	2004-08-04 07:46:43.000000000 -0400
| +++ linux-2.6.7/include/asm-x86_64/resource.h	2004-08-04 07:47:06.000000000 -0400
| @@ -39,7 +39,7 @@
|  	{ RLIM_INFINITY, RLIM_INFINITY },		\
|  	{             0,             0 },		\
|  	{      INR_OPEN,     INR_OPEN  },		\
| -	{ PAGE_SIZE , PAGE_SIZE  },		\
| +	{ 	32768 ,		32768  },		\
|  	{ RLIM_INFINITY, RLIM_INFINITY },		\
|  	{ RLIM_INFINITY, RLIM_INFINITY },		\
|  	{ MAX_SIGPENDING, MAX_SIGPENDING },		\
| --- linux-2.6.7/include/asm-ia64/resource.h.mlock	2004-08-04 07:46:42.000000000 -0400
| +++ linux-2.6.7/include/asm-ia64/resource.h	2004-08-04 07:47:06.000000000 -0400
| @@ -46,7 +46,7 @@
|  	{ RLIM_INFINITY, RLIM_INFINITY },		\
|  	{             0,             0 },		\
|  	{      INR_OPEN,     INR_OPEN  },		\
| -	{ PAGE_SIZE,     PAGE_SIZE     },		\
| +	{ 	32768,		 32768 },		\
|  	{ RLIM_INFINITY, RLIM_INFINITY },		\
|  	{ RLIM_INFINITY, RLIM_INFINITY },		\
|  	{ MAX_SIGPENDING, MAX_SIGPENDING },		\
| --- linux-2.6.7/include/asm-arm/resource.h.mlock	2004-08-04 07:46:41.000000000 -0400
| +++ linux-2.6.7/include/asm-arm/resource.h	2004-08-04 07:47:06.000000000 -0400
| @@ -39,7 +39,7 @@
|  	{ RLIM_INFINITY, RLIM_INFINITY },	\
|  	{ 0,             0             },	\
|  	{ INR_OPEN,      INR_OPEN      },	\
| -	{ PAGE_SIZE,      PAGE_SIZE    },	\
| +	{ 	32768,      	32768  },	\
|  	{ RLIM_INFINITY, RLIM_INFINITY },	\
|  	{ RLIM_INFINITY, RLIM_INFINITY },	\
|  	{ MAX_SIGPENDING, MAX_SIGPENDING},	\
| --- linux-2.6.7/include/asm-sparc/resource.h.mlock	2004-08-04 07:46:43.000000000 -0400
| +++ linux-2.6.7/include/asm-sparc/resource.h	2004-08-04 07:47:06.000000000 -0400
| @@ -44,7 +44,7 @@
|      {       0, RLIM_INFINITY},		\
|      {RLIM_INFINITY, RLIM_INFINITY},	\
|      {INR_OPEN, INR_OPEN}, {0, 0},	\
| -    {PAGE_SIZE, PAGE_SIZE},	\
| +    {		32768,	 32768},	\
|      {RLIM_INFINITY, RLIM_INFINITY},	\
|      {RLIM_INFINITY, RLIM_INFINITY},	\
|      {MAX_SIGPENDING, MAX_SIGPENDING},	\
| --- linux-2.6.7/include/asm-alpha/resource.h.mlock	2004-08-04 07:46:41.000000000 -0400
| +++ linux-2.6.7/include/asm-alpha/resource.h	2004-08-04 07:47:06.000000000 -0400
| @@ -41,7 +41,7 @@
|      {INR_OPEN, INR_OPEN},			/* RLIMIT_NOFILE */	\
|      {LONG_MAX, LONG_MAX},			/* RLIMIT_AS */		\
|      {LONG_MAX, LONG_MAX},			/* RLIMIT_NPROC */	\
| -    {PAGE_SIZE, PAGE_SIZE},			/* RLIMIT_MEMLOCK */	\
| +    {	32768, 32768},				/* RLIMIT_MEMLOCK */	\
|      {LONG_MAX, LONG_MAX},			/* RLIMIT_LOCKS */	\
|      {MAX_SIGPENDING, MAX_SIGPENDING},		/* RLIMIT_SIGPENDING */ \
|      {MQ_BYTES_MAX, MQ_BYTES_MAX},		/* RLIMIT_MSGQUEUE */	\
| --- linux-2.6.7/include/asm-h8300/resource.h.mlock	2004-08-04 07:46:41.000000000 -0400
| +++ linux-2.6.7/include/asm-h8300/resource.h	2004-08-04 07:47:06.000000000 -0400
| @@ -39,7 +39,7 @@
|  	{ RLIM_INFINITY, RLIM_INFINITY },		\
|  	{             0,             0 },		\
|  	{      INR_OPEN,     INR_OPEN  },		\
| -	{ PAGE_SIZE,     PAGE_SIZE     },		\
| +	{ 	32768,     32768     },			\
|  	{ RLIM_INFINITY, RLIM_INFINITY },		\
|  	{ RLIM_INFINITY, RLIM_INFINITY },		\
|  	{ MAX_SIGPENDING, MAX_SIGPENDING },		\
| --- linux-2.6.7/include/asm-i386/resource.h.mlock	2004-08-04 07:46:42.000000000 -0400
| +++ linux-2.6.7/include/asm-i386/resource.h	2004-08-04 07:47:06.000000000 -0400
| @@ -40,7 +40,7 @@
|  	{ RLIM_INFINITY, RLIM_INFINITY },		\
|  	{             0,             0 },		\
|  	{      INR_OPEN,     INR_OPEN  },		\
| -	{ PAGE_SIZE,     PAGE_SIZE     },		\
| +	{ 	32768,		32768  },		\
|  	{ RLIM_INFINITY, RLIM_INFINITY },		\
|  	{ RLIM_INFINITY, RLIM_INFINITY },		\
|  	{ MAX_SIGPENDING, MAX_SIGPENDING },		\
| --- linux-2.6.7/include/asm-s390/resource.h.mlock	2004-08-04 07:46:42.000000000 -0400
| +++ linux-2.6.7/include/asm-s390/resource.h	2004-08-04 07:47:06.000000000 -0400
| @@ -47,7 +47,7 @@
|  	{ RLIM_INFINITY, RLIM_INFINITY },		\
|  	{             0,             0 },		\
|  	{ INR_OPEN, INR_OPEN },                         \
| -	{ PAGE_SIZE,     PAGE_SIZE     },		\
| +	{ 	32768,		32768  },		\
|  	{ RLIM_INFINITY, RLIM_INFINITY },		\
|  	{ RLIM_INFINITY, RLIM_INFINITY },		\
|  	{ MAX_SIGPENDING, MAX_SIGPENDING },		\
| --- linux-2.6.7/include/asm-cris/resource.h.mlock	2004-08-04 07:46:41.000000000 -0400
| +++ linux-2.6.7/include/asm-cris/resource.h	2004-08-04 07:47:06.000000000 -0400
| @@ -39,7 +39,7 @@
|  	{ RLIM_INFINITY, RLIM_INFINITY },		\
|  	{             0,             0 },		\
|  	{      INR_OPEN,     INR_OPEN  },		\
| -	{     PAGE_SIZE,    PAGE_SIZE  },               \
| +	{	32768,		32768  },               \
|  	{ RLIM_INFINITY, RLIM_INFINITY },		\
|  	{ RLIM_INFINITY, RLIM_INFINITY },		\
|  	{ MAX_SIGPENDING, MAX_SIGPENDING },		\
| --- linux-2.6.7/include/asm-sparc64/resource.h.mlock	2004-08-04 07:46:43.000000000 -0400
| +++ linux-2.6.7/include/asm-sparc64/resource.h	2004-08-04 07:47:06.000000000 -0400
| @@ -43,7 +43,7 @@
|      {       0, RLIM_INFINITY},		\
|      {RLIM_INFINITY, RLIM_INFINITY},	\
|      {INR_OPEN, INR_OPEN}, {0, 0},	\
| -    {PAGE_SIZE,     PAGE_SIZE    },	\
| +    {	32768,     32768    },		\
|      {RLIM_INFINITY, RLIM_INFINITY},	\
|      {RLIM_INFINITY, RLIM_INFINITY},	\
|      {MAX_SIGPENDING, MAX_SIGPENDING},	\
| --- linux-2.6.7/include/asm-arm26/resource.h.mlock	2004-08-04 07:46:41.000000000 -0400
| +++ linux-2.6.7/include/asm-arm26/resource.h	2004-08-04 07:47:06.000000000 -0400
| @@ -39,7 +39,7 @@
|  	{ RLIM_INFINITY, RLIM_INFINITY },	\
|  	{ 0,             0             },	\
|  	{ INR_OPEN,      INR_OPEN      },	\
| -	{ PAGE_SIZE,     PAGE_SIZE     },	\
| +	{ 32768,         32768         },	\
|  	{ RLIM_INFINITY, RLIM_INFINITY },	\
|  	{ RLIM_INFINITY, RLIM_INFINITY },	\
|  	{ MAX_SIGPENDING, MAX_SIGPENDING},	\
| --- linux-2.6.7/include/asm-v850/resource.h.mlock	2004-08-04 07:46:43.000000000 -0400
| +++ linux-2.6.7/include/asm-v850/resource.h	2004-08-04 07:47:06.000000000 -0400
| @@ -39,7 +39,7 @@
|  	{ RLIM_INFINITY, RLIM_INFINITY },		\
|  	{             0,             0 },		\
|  	{      INR_OPEN,     INR_OPEN  },		\
| -	{ PAGE_SIZE, PAGE_SIZE  },		\
| +	{ 	32768,		 32768 },		\
|  	{ RLIM_INFINITY, RLIM_INFINITY },		\
|  	{ RLIM_INFINITY, RLIM_INFINITY },		\
|  	{ MAX_SIGPENDING, MAX_SIGPENDING },		\
| --- linux-2.6.7/include/asm-sh/resource.h.mlock	2004-08-04 07:46:43.000000000 -0400
| +++ linux-2.6.7/include/asm-sh/resource.h	2004-08-04 07:47:06.000000000 -0400
| @@ -39,7 +39,7 @@
|  	{ RLIM_INFINITY, RLIM_INFINITY },		\
|  	{             0,             0 },		\
|  	{      INR_OPEN,     INR_OPEN  },		\
| -	{ PAGE_SIZE,     PAGE_SIZE     },		\
| +	{ 	32768,     32768     },			\
|  	{ RLIM_INFINITY, RLIM_INFINITY },		\
|  	{ RLIM_INFINITY, RLIM_INFINITY },		\
|  	{ MAX_SIGPENDING, MAX_SIGPENDING },		\
| 
| -

Please s/32768/MLOCK_LIMIT/g (above)

and use:
#define MLOCK_LIMIT		32768

--
~Randy

  reply	other threads:[~2004-08-05 15:36 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-08-05  4:08 Rik van Riel
2004-08-05 15:14 ` Randy.Dunlap [this message]
2004-08-05 15:42   ` Rik van Riel
2004-08-05 17:29     ` Andrew Morton
2004-08-05 17:39       ` Rik van Riel
2004-08-05 17:52       ` Rik van Riel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20040805081445.1c4b085e.rddunlap@osdl.org \
    --to=rddunlap@osdl.org \
    --cc=akpm@osdl.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=riel@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®