The patch titled
do not limit locked memory when RLIMIT_MEMLOCK is RLIM_INFINITY
has been removed from the -mm tree. Its filename was
do-not-limit-locked-memory-when-rlimit_memlock-is-rlim_infinity.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: do not limit locked memory when RLIMIT_MEMLOCK is RLIM_INFINITY
From: Herbert van den Bergh <Herbert.van.den.Bergh@xxxxxxxxxx>
Fix 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 <herbert.van.den.bergh@xxxxxxxxxx>
Acked-by: Chris Mason <chris.mason@xxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/mlock.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff -puN mm/mlock.c~do-not-limit-locked-memory-when-rlimit_memlock-is-rlim_infinity mm/mlock.c
--- a/mm/mlock.c~do-not-limit-locked-memory-when-rlimit_memlock-is-rlim_infinity
+++ a/mm/mlock.c
@@ -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;
_
Patches currently in -mm which might be from Herbert.van.den.Bergh@xxxxxxxxxx are
origin.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
