[PATCH] SHM_NORESERVE flags for shmget()

Add SHM_NORESERVE functionality similar to MAP_NORESERVE for shared memory
segments.

This is mainly to avoid abuse of OVERCOMMIT_ALWAYS and this flag is ignored
for OVERCOMMIT_NEVER.

Signed-off-by: Badari Pulavarty <pbadari@us.ibm.com>
Cc: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 9 insertions, 1 deletions

diff --git a/ipc/shm.c b/ipc/shm.c
index b58c651d31ae..587d836d80d9 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -212,8 +212,16 @@ static int newseg (key_t key, int shmflg, size_t size)
                 file = hugetlb_zero_setup(size);
                 shp->mlock_user = current->user;
         } else {
+                int acctflag = VM_ACCOUNT;
+                /*
+                 * Do not allow no accounting for OVERCOMMIT_NEVER, even
+                 * if it's asked for.
+                 */
+                if  ((shmflg & SHM_NORESERVE) &&
+                                sysctl_overcommit_memory != OVERCOMMIT_NEVER)
+                        acctflag = 0;
                 sprintf (name, "SYSV%08x", key);
-                file = shmem_file_setup(name, size, VM_ACCOUNT);
+                file = shmem_file_setup(name, size, acctflag);
         }
         error = PTR_ERR(file);
         if (IS_ERR(file))