* [PATCH] increase mlock limit to 32k
@ 2004-08-05 4:08 Rik van Riel
2004-08-05 15:14 ` Randy.Dunlap
0 siblings, 1 reply; 6+ messages in thread
From: Rik van Riel @ 2004-08-05 4:08 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel
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 }, \
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] increase mlock limit to 32k
2004-08-05 4:08 [PATCH] increase mlock limit to 32k Rik van Riel
@ 2004-08-05 15:14 ` Randy.Dunlap
2004-08-05 15:42 ` Rik van Riel
0 siblings, 1 reply; 6+ messages in thread
From: Randy.Dunlap @ 2004-08-05 15:14 UTC (permalink / raw)
To: Rik van Riel; +Cc: akpm, linux-kernel
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] increase mlock limit to 32k
2004-08-05 15:14 ` Randy.Dunlap
@ 2004-08-05 15:42 ` Rik van Riel
2004-08-05 17:29 ` Andrew Morton
0 siblings, 1 reply; 6+ messages in thread
From: Rik van Riel @ 2004-08-05 15:42 UTC (permalink / raw)
To: Randy.Dunlap; +Cc: Andrew Morton, linux-kernel
On Thu, 5 Aug 2004, Randy.Dunlap wrote:
> Please s/32768/MLOCK_LIMIT/g (above)
>
> and use:
> #define MLOCK_LIMIT 32768
I got thrown off by the fact that asm-*/resource.h don't
include any other files, but you're right that I can just
#define the value in include/linux/resource.h and work
from there.
Andrew, I'll send you an updated patch (not an incremental)
later today.
--
"Debugging is twice as hard as writing the code in the first place.
Therefore, if you write the code as cleverly as possible, you are,
by definition, not smart enough to debug it." - Brian W. Kernighan
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] increase mlock limit to 32k
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
0 siblings, 2 replies; 6+ messages in thread
From: Andrew Morton @ 2004-08-05 17:29 UTC (permalink / raw)
To: Rik van Riel; +Cc: rddunlap, linux-kernel
Rik van Riel <riel@redhat.com> wrote:
>
> Andrew, I'll send you an updated patch (not an incremental)
> later today.
Well please note that the initial patch got 100% rejects because it was
against a kernel which was already using limits of PAGE_SIZE rather than
zero. An incremental patch might be saner..
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] increase mlock limit to 32k
2004-08-05 17:29 ` Andrew Morton
@ 2004-08-05 17:39 ` Rik van Riel
2004-08-05 17:52 ` Rik van Riel
1 sibling, 0 replies; 6+ messages in thread
From: Rik van Riel @ 2004-08-05 17:39 UTC (permalink / raw)
To: Andrew Morton; +Cc: rddunlap, linux-kernel
On Thu, 5 Aug 2004, Andrew Morton wrote:
> Well please note that the initial patch got 100% rejects because it was
> against a kernel which was already using limits of PAGE_SIZE rather than
> zero. An incremental patch might be saner..
Oh duh, Chris Wright's patch decreased the limits from PAGE_SIZE
to 0 ;( Sorry about the rejects...
--
"Debugging is twice as hard as writing the code in the first place.
Therefore, if you write the code as cleverly as possible, you are,
by definition, not smart enough to debug it." - Brian W. Kernighan
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] increase mlock limit to 32k
2004-08-05 17:29 ` Andrew Morton
2004-08-05 17:39 ` Rik van Riel
@ 2004-08-05 17:52 ` Rik van Riel
1 sibling, 0 replies; 6+ messages in thread
From: Rik van Riel @ 2004-08-05 17:52 UTC (permalink / raw)
To: Andrew Morton; +Cc: rddunlap, linux-kernel
On Thu, 5 Aug 2004, Andrew Morton wrote:
> An incremental patch might be saner..
Here you are. The following patch replaces the numbers with
a define called MLOCK_LIMIT.
Signed-off-by: Rik van Riel <riel@redhat.com>
--- linux-2.6.8-rc3/include/asm-x86_64/resource.h.cleanup 2004-08-05 13:42:06.916010295 -0400
+++ linux-2.6.8-rc3/include/asm-x86_64/resource.h 2004-08-05 13:47:30.195214447 -0400
@@ -39,7 +39,7 @@
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ 0, 0 }, \
{ INR_OPEN, INR_OPEN }, \
- { 32768, 32768 }, \
+ { MLOCK_LIMIT, MLOCK_LIMIT }, \
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ MAX_SIGPENDING, MAX_SIGPENDING }, \
--- linux-2.6.8-rc3/include/asm-ppc64/resource.h.cleanup 2004-08-05 13:42:06.751059190 -0400
+++ linux-2.6.8-rc3/include/asm-ppc64/resource.h 2004-08-05 13:45:47.718581254 -0400
@@ -45,7 +45,7 @@
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ 0, 0 }, \
{ INR_OPEN, INR_OPEN }, \
- { 32768, 32768 }, \
+ { MLOCK_LIMIT, MLOCK_LIMIT }, \
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ MAX_SIGPENDING, MAX_SIGPENDING }, \
--- linux-2.6.8-rc3/include/asm-mips/resource.h.cleanup 2004-08-05 13:42:06.717069265 -0400
+++ linux-2.6.8-rc3/include/asm-mips/resource.h 2004-08-05 13:45:23.380792896 -0400
@@ -53,7 +53,7 @@
{ INR_OPEN, INR_OPEN }, \
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ RLIM_INFINITY, RLIM_INFINITY }, \
- { 0, 0 }, \
+ { MLOCK_LIMIT, MLOCK_LIMIT }, \
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ MAX_SIGPENDING, MAX_SIGPENDING }, \
--- linux-2.6.8-rc3/include/asm-m68k/resource.h.cleanup 2004-08-05 13:42:06.705072821 -0400
+++ linux-2.6.8-rc3/include/asm-m68k/resource.h 2004-08-05 13:44:42.160006853 -0400
@@ -39,7 +39,7 @@
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ 0, 0 }, \
{ INR_OPEN, INR_OPEN }, \
- { 32768, 32768 }, \
+ { MLOCK_LIMIT, MLOCK_LIMIT }, \
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ MAX_SIGPENDING, MAX_SIGPENDING }, \
--- linux-2.6.8-rc3/include/asm-parisc/resource.h.cleanup 2004-08-05 13:42:06.727066302 -0400
+++ linux-2.6.8-rc3/include/asm-parisc/resource.h 2004-08-05 13:45:38.153415570 -0400
@@ -39,7 +39,7 @@
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ 0, 0 }, \
{ INR_OPEN, INR_OPEN }, \
- { 32768, 32768 }, \
+ { MLOCK_LIMIT, MLOCK_LIMIT }, \
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ MAX_SIGPENDING, MAX_SIGPENDING }, \
--- linux-2.6.8-rc3/include/asm-ppc/resource.h.cleanup 2004-08-05 13:42:06.768054152 -0400
+++ linux-2.6.8-rc3/include/asm-ppc/resource.h 2004-08-05 13:45:58.287449497 -0400
@@ -36,7 +36,7 @@
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ 0, 0 }, \
{ INR_OPEN, INR_OPEN }, \
- { 32768, 32768 }, \
+ { MLOCK_LIMIT, MLOCK_LIMIT }, \
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ MAX_SIGPENDING, MAX_SIGPENDING }, \
--- linux-2.6.8-rc3/include/asm-ia64/resource.h.cleanup 2004-08-05 13:42:06.657087045 -0400
+++ linux-2.6.8-rc3/include/asm-ia64/resource.h 2004-08-05 13:44:23.847432826 -0400
@@ -46,7 +46,7 @@
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ 0, 0 }, \
{ INR_OPEN, INR_OPEN }, \
- { 32768, 32768 }, \
+ { MLOCK_LIMIT, MLOCK_LIMIT }, \
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ MAX_SIGPENDING, MAX_SIGPENDING }, \
--- linux-2.6.8-rc3/include/linux/resource.h.cleanup 2004-08-05 13:42:06.941002887 -0400
+++ linux-2.6.8-rc3/include/linux/resource.h 2004-08-05 13:48:13.058512450 -0400
@@ -56,6 +56,12 @@ struct rlimit {
#define _STK_LIM (8*1024*1024)
/*
+ * GPG wants 32kB of mlocked memory, to make sure pass phrases
+ * and other sensitive information are never written to disk.
+ */
+#define MLOCK_LIMIT (32*1024)
+
+/*
* Due to binary compatibility, the actual resource numbers
* may be different for different linux versions..
*/
--- linux-2.6.8-rc3/include/asm-arm/resource.h.cleanup 2004-08-05 13:42:06.598104528 -0400
+++ linux-2.6.8-rc3/include/asm-arm/resource.h 2004-08-05 13:43:37.951031395 -0400
@@ -39,7 +39,7 @@
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ 0, 0 }, \
{ INR_OPEN, INR_OPEN }, \
- { 32768, 32768 }, \
+ { MLOCK_LIMIT, MLOCK_LIMIT }, \
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ MAX_SIGPENDING, MAX_SIGPENDING}, \
--- linux-2.6.8-rc3/include/asm-v850/resource.h.cleanup 2004-08-05 13:42:06.904013851 -0400
+++ linux-2.6.8-rc3/include/asm-v850/resource.h 2004-08-05 13:47:20.929960031 -0400
@@ -39,7 +39,7 @@
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ 0, 0 }, \
{ INR_OPEN, INR_OPEN }, \
- { 32768, 32768 }, \
+ { MLOCK_LIMIT, MLOCK_LIMIT }, \
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ MAX_SIGPENDING, MAX_SIGPENDING }, \
--- linux-2.6.8-rc3/include/asm-sparc/resource.h.cleanup 2004-08-05 13:42:06.857027779 -0400
+++ linux-2.6.8-rc3/include/asm-sparc/resource.h 2004-08-05 13:47:05.714468923 -0400
@@ -44,7 +44,7 @@
{ 0, RLIM_INFINITY}, \
{RLIM_INFINITY, RLIM_INFINITY}, \
{INR_OPEN, INR_OPEN}, {0, 0}, \
- {32768, 32768}, \
+ {MLOCK_LIMIT, MLOCK_LIMIT}, \
{RLIM_INFINITY, RLIM_INFINITY}, \
{RLIM_INFINITY, RLIM_INFINITY}, \
{MAX_SIGPENDING, MAX_SIGPENDING}, \
--- linux-2.6.8-rc3/include/asm-alpha/resource.h.cleanup 2004-08-05 13:42:06.537122604 -0400
+++ linux-2.6.8-rc3/include/asm-alpha/resource.h 2004-08-05 13:43:06.538338256 -0400
@@ -41,7 +41,7 @@
{INR_OPEN, INR_OPEN}, /* RLIMIT_NOFILE */ \
{LONG_MAX, LONG_MAX}, /* RLIMIT_AS */ \
{LONG_MAX, LONG_MAX}, /* RLIMIT_NPROC */ \
- {32768, 32768 }, /* RLIMIT_MEMLOCK */ \
+ {MLOCK_LIMIT, MLOCK_LIMIT }, /* 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.8-rc3/include/asm-i386/resource.h.cleanup 2004-08-05 13:42:06.771053263 -0400
+++ linux-2.6.8-rc3/include/asm-i386/resource.h 2004-08-05 13:44:11.416116138 -0400
@@ -40,7 +40,7 @@
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ 0, 0 }, \
{ INR_OPEN, INR_OPEN }, \
- { 32768, 32768 }, \
+ { MLOCK_LIMIT, MLOCK_LIMIT }, \
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ MAX_SIGPENDING, MAX_SIGPENDING }, \
--- linux-2.6.8-rc3/include/asm-h8300/resource.h.cleanup 2004-08-05 13:42:06.627095934 -0400
+++ linux-2.6.8-rc3/include/asm-h8300/resource.h 2004-08-05 13:44:01.230134142 -0400
@@ -39,7 +39,7 @@
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ 0, 0 }, \
{ INR_OPEN, INR_OPEN }, \
- { 32768, 32768 }, \
+ { MLOCK_LIMIT, MLOCK_LIMIT }, \
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ MAX_SIGPENDING, MAX_SIGPENDING }, \
--- linux-2.6.8-rc3/include/asm-s390/resource.h.cleanup 2004-08-05 13:42:06.796045855 -0400
+++ linux-2.6.8-rc3/include/asm-s390/resource.h 2004-08-05 13:46:16.166151634 -0400
@@ -47,7 +47,7 @@
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ 0, 0 }, \
{ INR_OPEN, INR_OPEN }, \
- { 32768, 32768 }, \
+ { MLOCK_LIMIT, MLOCK_LIMIT }, \
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ MAX_SIGPENDING, MAX_SIGPENDING }, \
--- linux-2.6.8-rc3/include/asm-cris/resource.h.cleanup 2004-08-05 13:42:06.615099490 -0400
+++ linux-2.6.8-rc3/include/asm-cris/resource.h 2004-08-05 13:43:50.955178478 -0400
@@ -39,7 +39,7 @@
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ 0, 0 }, \
{ INR_OPEN, INR_OPEN }, \
- { 32768, 32768 }, \
+ { MLOCK_LIMIT, MLOCK_LIMIT }, \
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ MAX_SIGPENDING, MAX_SIGPENDING }, \
--- linux-2.6.8-rc3/include/asm-sparc64/resource.h.cleanup 2004-08-05 13:42:06.830035780 -0400
+++ linux-2.6.8-rc3/include/asm-sparc64/resource.h 2004-08-05 13:46:46.255235374 -0400
@@ -43,7 +43,7 @@
{ 0, RLIM_INFINITY}, \
{RLIM_INFINITY, RLIM_INFINITY}, \
{INR_OPEN, INR_OPEN}, {0, 0}, \
- {32768, 32768 }, \
+ { MLOCK_LIMIT, MLOCK_LIMIT}, \
{RLIM_INFINITY, RLIM_INFINITY}, \
{RLIM_INFINITY, RLIM_INFINITY}, \
{MAX_SIGPENDING, MAX_SIGPENDING}, \
--- linux-2.6.8-rc3/include/asm-arm26/resource.h.cleanup 2004-08-05 13:42:06.552118159 -0400
+++ linux-2.6.8-rc3/include/asm-arm26/resource.h 2004-08-05 13:43:24.978874784 -0400
@@ -39,7 +39,7 @@
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ 0, 0 }, \
{ INR_OPEN, INR_OPEN }, \
- { 32768, 32768 }, \
+ { MLOCK_LIMIT, MLOCK_LIMIT }, \
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ MAX_SIGPENDING, MAX_SIGPENDING}, \
--- linux-2.6.8-rc3/include/asm-sh/resource.h.cleanup 2004-08-05 13:42:06.825037261 -0400
+++ linux-2.6.8-rc3/include/asm-sh/resource.h 2004-08-05 13:46:27.449807991 -0400
@@ -39,7 +39,7 @@
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ 0, 0 }, \
{ INR_OPEN, INR_OPEN }, \
- { 32768, 32768 }, \
+ { MLOCK_LIMIT, MLOCK_LIMIT }, \
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ RLIM_INFINITY, RLIM_INFINITY }, \
{ MAX_SIGPENDING, MAX_SIGPENDING }, \
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2004-08-05 17:54 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-08-05 4:08 [PATCH] increase mlock limit to 32k Rik van Riel
2004-08-05 15:14 ` Randy.Dunlap
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
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®