aboutsummaryrefslogtreecommitdiff
path: root/ipc/msg.c
diff options
context:
space:
mode:
authorPierre Peiffer <Pierre.Peiffer@bull.net>2007-10-18 23:40:57 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-19 11:53:49 -0700
commit283bb7fada7e33a759d8fc9bd7a44532e4ad420e (patch)
treec6704baf10edd10ca64310f2d168969434bb7dcf /ipc/msg.c
parent3ac88a41ff747b8c2f290f86b5243b2f8fce2cc0 (diff)
downloadlinux-2.6.38-lt-ux500-283bb7fada7e33a759d8fc9bd7a44532e4ad420e.tar.gz
IPC: fix error case when idr-cache is empty in ipcget()
With the use of idr to store the ipc, the case where the idr cache is empty, when idr_get_new is called (this may happen even if we call idr_pre_get() before), is not well handled: it lets semget()/shmget()/msgget() return ENOSPC when this cache is empty, what 1. does not reflect the facts and 2. does not conform to the man(s). This patch fixes this by retrying the whole process of allocation in this case. Signed-off-by: Pierre Peiffer <pierre.peiffer@bull.net> Cc: Nadia Derbey <Nadia.Derbey@bull.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'ipc/msg.c')
-rw-r--r--ipc/msg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ipc/msg.c b/ipc/msg.c
index ccf5f495db7..fdf3db5731c 100644
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -203,10 +203,10 @@ static int newque(struct ipc_namespace *ns, struct ipc_params *params)
* ipc_addid() locks msq
*/
id = ipc_addid(&msg_ids(ns), &msq->q_perm, ns->msg_ctlmni);
- if (id == -1) {
+ if (id < 0) {
security_msg_queue_free(msq);
ipc_rcu_putref(msq);
- return -ENOSPC;
+ return id;
}
msq->q_perm.id = msg_buildid(id, msq->q_perm.seq);