Skip to contentSkip to conversation

do not limit locked memory when RLIMIT_MEMLOCK is RLIM_INFINITY

PATCH New Herbert van den Bergh 1 participant 1 message Jun 28, 2007

Subsystems (2)
Memory management Memory mapping
lore
Share & tools
lore

Herbert van den Bergh

author
#0 lore raw

PATCH 1/1 do not limit locked memory when RLIMIT_MEMLOCK is RLIM_INFINITY

This patch fixes a bug in mm/mlock.c on 32-bit architectures that prevents a user from locking more than 4GB of shared memory, or allocating more than 4GB of shared memory in hugepages, when rlim[RLIMIT_MEMLOCK] is set to RLIM_INFINITY.

Signed-off-by Herbert van den Bergh <[email protected]>
Acked-by Chris Mason <[email protected]>
mm/mlock.c 2007-06-28 11:18:48.000000000 -0700 renamed from mm/mlock.c.orig 2007-06-26 15:17:22.000000000 -0700 +4 -1
@@ -244,9 +244,12 @@ int user_shm_lock(size_t size, struct us
 
     locked = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
     lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
+    if (lock_limit == RLIM_INFINITY)
+        allowed = 1;
     lock_limit >>= PAGE_SHIFT;
     spin_lock(&shmlock_user_lock);
-    if (locked + user->locked_shm > lock_limit && !capable(CAP_IPC_LOCK))
+    if (!allowed &&
+        locked + user->locked_shm > lock_limit && !capable(CAP_IPC_LOCK))
         goto out;
     get_uid(user);
     user->locked_shm += locked;

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>