aboutsummaryrefslogtreecommitdiff
path: root/ipc
diff options
context:
space:
mode:
authorGuy Streeter <guy.streeter@gmail.com>2007-01-23 12:20:04 -0600
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-23 11:18:50 -0800
commitf66d45e99eb7ca91822c3e3f6d7a98843c9626cb (patch)
treece796ff749980d7c3d08c0d42f63d25d42416e49 /ipc
parent821836e5baa69b8bc80605f25ad963e721609bc0 (diff)
downloadvexpress-lsk-f66d45e99eb7ca91822c3e3f6d7a98843c9626cb.tar.gz
[PATCH] correct sys_shmget allocation check
As written, sys_shmget will return ENOSPC when one page is still available for allocation. This patch corrects the test. Signed-off-by: Guy Streeter <guy.streeter+lkml@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> --
Diffstat (limited to 'ipc')
-rw-r--r--ipc/shm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipc/shm.c b/ipc/shm.c
index 6d16bb6de7d..f8e10a25ad7 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -279,7 +279,7 @@ static int newseg (struct ipc_namespace *ns, key_t key, int shmflg, size_t size)
if (size < SHMMIN || size > ns->shm_ctlmax)
return -EINVAL;
- if (ns->shm_tot + numpages >= ns->shm_ctlall)
+ if (ns->shm_tot + numpages > ns->shm_ctlall)
return -ENOSPC;
shp = ipc_rcu_alloc(sizeof(*shp));