Commit 7ca7e564 authored by Nadia Derbey's avatar Nadia Derbey Committed by Linus Torvalds

ipc: store ipcs into IDRs

This patch introduces ipcs storage into IDRs. The main changes are:
  . This ipc_ids structure is changed: the entries array is changed into a
    root idr structure.
  . The grow_ary() routine is removed: it is not needed anymore when adding
    an ipc structure, since we are now using the IDR facility.
  . The ipc_rmid() routine interface is changed:
       . there is no need for this routine to return the pointer passed in as
         argument: it is now declared as a void
       . since the id is now part of the kern_ipc_perm structure, no need to
         have it as an argument to the routine
Signed-off-by: default avatarNadia Derbey <Nadia.Derbey@bull.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d2b20b11
...@@ -89,6 +89,7 @@ struct kern_ipc_perm ...@@ -89,6 +89,7 @@ struct kern_ipc_perm
{ {
spinlock_t lock; spinlock_t lock;
int deleted; int deleted;
int id;
key_t key; key_t key;
uid_t uid; uid_t uid;
gid_t gid; gid_t gid;
......
...@@ -77,7 +77,6 @@ struct msg_msg { ...@@ -77,7 +77,6 @@ struct msg_msg {
/* one msq_queue structure for each present queue on the system */ /* one msq_queue structure for each present queue on the system */
struct msg_queue { struct msg_queue {
struct kern_ipc_perm q_perm; struct kern_ipc_perm q_perm;
int q_id;
time_t q_stime; /* last msgsnd time */ time_t q_stime; /* last msgsnd time */
time_t q_rtime; /* last msgrcv time */ time_t q_rtime; /* last msgrcv time */
time_t q_ctime; /* last change time */ time_t q_ctime; /* last change time */
......
...@@ -90,7 +90,6 @@ struct sem { ...@@ -90,7 +90,6 @@ struct sem {
/* One sem_array data structure for each set of semaphores in the system. */ /* One sem_array data structure for each set of semaphores in the system. */
struct sem_array { struct sem_array {
struct kern_ipc_perm sem_perm; /* permissions .. see ipc.h */ struct kern_ipc_perm sem_perm; /* permissions .. see ipc.h */
int sem_id;
time_t sem_otime; /* last semop time */ time_t sem_otime; /* last semop time */
time_t sem_ctime; /* last change time */ time_t sem_ctime; /* last change time */
struct sem *sem_base; /* ptr to first semaphore in array */ struct sem *sem_base; /* ptr to first semaphore in array */
......
...@@ -79,7 +79,6 @@ struct shmid_kernel /* private to the kernel */ ...@@ -79,7 +79,6 @@ struct shmid_kernel /* private to the kernel */
{ {
struct kern_ipc_perm shm_perm; struct kern_ipc_perm shm_perm;
struct file * shm_file; struct file * shm_file;
int id;
unsigned long shm_nattch; unsigned long shm_nattch;
unsigned long shm_segsz; unsigned long shm_segsz;
time_t shm_atim; time_t shm_atim;
......
...@@ -75,13 +75,12 @@ static struct ipc_ids init_msg_ids; ...@@ -75,13 +75,12 @@ static struct ipc_ids init_msg_ids;
#define msg_lock(ns, id) ((struct msg_queue*)ipc_lock(&msg_ids(ns), id)) #define msg_lock(ns, id) ((struct msg_queue*)ipc_lock(&msg_ids(ns), id))
#define msg_unlock(msq) ipc_unlock(&(msq)->q_perm) #define msg_unlock(msq) ipc_unlock(&(msq)->q_perm)
#define msg_rmid(ns, id) ((struct msg_queue*)ipc_rmid(&msg_ids(ns), id))
#define msg_checkid(ns, msq, msgid) \ #define msg_checkid(ns, msq, msgid) \
ipc_checkid(&msg_ids(ns), &msq->q_perm, msgid) ipc_checkid(&msg_ids(ns), &msq->q_perm, msgid)
#define msg_buildid(ns, id, seq) \ #define msg_buildid(ns, id, seq) \
ipc_buildid(&msg_ids(ns), id, seq) ipc_buildid(&msg_ids(ns), id, seq)
static void freeque (struct ipc_namespace *ns, struct msg_queue *msq, int id); static void freeque(struct ipc_namespace *, struct msg_queue *);
static int newque (struct ipc_namespace *ns, key_t key, int msgflg); static int newque (struct ipc_namespace *ns, key_t key, int msgflg);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
static int sysvipc_msg_proc_show(struct seq_file *s, void *it); static int sysvipc_msg_proc_show(struct seq_file *s, void *it);
...@@ -93,7 +92,7 @@ static void __msg_init_ns(struct ipc_namespace *ns, struct ipc_ids *ids) ...@@ -93,7 +92,7 @@ static void __msg_init_ns(struct ipc_namespace *ns, struct ipc_ids *ids)
ns->msg_ctlmax = MSGMAX; ns->msg_ctlmax = MSGMAX;
ns->msg_ctlmnb = MSGMNB; ns->msg_ctlmnb = MSGMNB;
ns->msg_ctlmni = MSGMNI; ns->msg_ctlmni = MSGMNI;
ipc_init_ids(ids, ns->msg_ctlmni); ipc_init_ids(ids);
} }
int msg_init_ns(struct ipc_namespace *ns) int msg_init_ns(struct ipc_namespace *ns)
...@@ -110,20 +109,24 @@ int msg_init_ns(struct ipc_namespace *ns) ...@@ -110,20 +109,24 @@ int msg_init_ns(struct ipc_namespace *ns)
void msg_exit_ns(struct ipc_namespace *ns) void msg_exit_ns(struct ipc_namespace *ns)
{ {
int i;
struct msg_queue *msq; struct msg_queue *msq;
int next_id;
int total, in_use;
mutex_lock(&msg_ids(ns).mutex); mutex_lock(&msg_ids(ns).mutex);
for (i = 0; i <= msg_ids(ns).max_id; i++) {
msq = msg_lock(ns, i); in_use = msg_ids(ns).in_use;
for (total = 0, next_id = 0; total < in_use; next_id++) {
msq = idr_find(&msg_ids(ns).ipcs_idr, next_id);
if (msq == NULL) if (msq == NULL)
continue; continue;
ipc_lock_by_ptr(&msq->q_perm);
freeque(ns, msq, i); freeque(ns, msq);
total++;
} }
mutex_unlock(&msg_ids(ns).mutex); mutex_unlock(&msg_ids(ns).mutex);
ipc_fini_ids(ns->ids[IPC_MSG_IDS]);
kfree(ns->ids[IPC_MSG_IDS]); kfree(ns->ids[IPC_MSG_IDS]);
ns->ids[IPC_MSG_IDS] = NULL; ns->ids[IPC_MSG_IDS] = NULL;
} }
...@@ -136,6 +139,11 @@ void __init msg_init(void) ...@@ -136,6 +139,11 @@ void __init msg_init(void)
IPC_MSG_IDS, sysvipc_msg_proc_show); IPC_MSG_IDS, sysvipc_msg_proc_show);
} }
static inline void msg_rmid(struct ipc_namespace *ns, struct msg_queue *s)
{
ipc_rmid(&msg_ids(ns), &s->q_perm);
}
static int newque (struct ipc_namespace *ns, key_t key, int msgflg) static int newque (struct ipc_namespace *ns, key_t key, int msgflg)
{ {
struct msg_queue *msq; struct msg_queue *msq;
...@@ -155,6 +163,9 @@ static int newque (struct ipc_namespace *ns, key_t key, int msgflg) ...@@ -155,6 +163,9 @@ static int newque (struct ipc_namespace *ns, key_t key, int msgflg)
return retval; return retval;
} }
/*
* ipc_addid() locks msq
*/
id = ipc_addid(&msg_ids(ns), &msq->q_perm, ns->msg_ctlmni); id = ipc_addid(&msg_ids(ns), &msq->q_perm, ns->msg_ctlmni);
if (id == -1) { if (id == -1) {
security_msg_queue_free(msq); security_msg_queue_free(msq);
...@@ -162,7 +173,7 @@ static int newque (struct ipc_namespace *ns, key_t key, int msgflg) ...@@ -162,7 +173,7 @@ static int newque (struct ipc_namespace *ns, key_t key, int msgflg)
return -ENOSPC; return -ENOSPC;
} }
msq->q_id = msg_buildid(ns, id, msq->q_perm.seq); msq->q_perm.id = msg_buildid(ns, id, msq->q_perm.seq);
msq->q_stime = msq->q_rtime = 0; msq->q_stime = msq->q_rtime = 0;
msq->q_ctime = get_seconds(); msq->q_ctime = get_seconds();
msq->q_cbytes = msq->q_qnum = 0; msq->q_cbytes = msq->q_qnum = 0;
...@@ -171,9 +182,10 @@ static int newque (struct ipc_namespace *ns, key_t key, int msgflg) ...@@ -171,9 +182,10 @@ static int newque (struct ipc_namespace *ns, key_t key, int msgflg)
INIT_LIST_HEAD(&msq->q_messages); INIT_LIST_HEAD(&msq->q_messages);
INIT_LIST_HEAD(&msq->q_receivers); INIT_LIST_HEAD(&msq->q_receivers);
INIT_LIST_HEAD(&msq->q_senders); INIT_LIST_HEAD(&msq->q_senders);
msg_unlock(msq); msg_unlock(msq);
return msq->q_id; return msq->q_perm.id;
} }
static inline void ss_add(struct msg_queue *msq, struct msg_sender *mss) static inline void ss_add(struct msg_queue *msq, struct msg_sender *mss)
...@@ -225,18 +237,18 @@ static void expunge_all(struct msg_queue *msq, int res) ...@@ -225,18 +237,18 @@ static void expunge_all(struct msg_queue *msq, int res)
/* /*
* freeque() wakes up waiters on the sender and receiver waiting queue, * freeque() wakes up waiters on the sender and receiver waiting queue,
* removes the message queue from message queue ID * removes the message queue from message queue ID
* array, and cleans up all the messages associated with this queue. * IDR, and cleans up all the messages associated with this queue.
* *
* msg_ids.mutex and the spinlock for this message queue is hold * msg_ids.mutex and the spinlock for this message queue are held
* before freeque() is called. msg_ids.mutex remains locked on exit. * before freeque() is called. msg_ids.mutex remains locked on exit.
*/ */
static void freeque(struct ipc_namespace *ns, struct msg_queue *msq, int id) static void freeque(struct ipc_namespace *ns, struct msg_queue *msq)
{ {
struct list_head *tmp; struct list_head *tmp;
expunge_all(msq, -EIDRM); expunge_all(msq, -EIDRM);
ss_wakeup(&msq->q_senders, 1); ss_wakeup(&msq->q_senders, 1);
msq = msg_rmid(ns, id); msg_rmid(ns, msq);
msg_unlock(msq); msg_unlock(msq);
tmp = msq->q_messages.next; tmp = msq->q_messages.next;
...@@ -255,36 +267,51 @@ static void freeque(struct ipc_namespace *ns, struct msg_queue *msq, int id) ...@@ -255,36 +267,51 @@ static void freeque(struct ipc_namespace *ns, struct msg_queue *msq, int id)
asmlinkage long sys_msgget(key_t key, int msgflg) asmlinkage long sys_msgget(key_t key, int msgflg)
{ {
struct msg_queue *msq; struct msg_queue *msq;
int id, ret = -EPERM; int ret;
struct ipc_namespace *ns; struct ipc_namespace *ns;
ns = current->nsproxy->ipc_ns; ns = current->nsproxy->ipc_ns;
mutex_lock(&msg_ids(ns).mutex); ret = idr_pre_get(&msg_ids(ns).ipcs_idr, GFP_KERNEL);
if (key == IPC_PRIVATE)
ret = newque(ns, key, msgflg); if (key == IPC_PRIVATE) {
else if ((id = ipc_findkey(&msg_ids(ns), key)) == -1) { /* key not used */ if (!ret)
if (!(msgflg & IPC_CREAT)) ret = -ENOMEM;
ret = -ENOENT; else {
else mutex_lock(&msg_ids(ns).mutex);
ret = newque(ns, key, msgflg); ret = newque(ns, key, msgflg);
} else if (msgflg & IPC_CREAT && msgflg & IPC_EXCL) { mutex_unlock(&msg_ids(ns).mutex);
ret = -EEXIST; }
} else { } else {
msq = msg_lock(ns, id); mutex_lock(&msg_ids(ns).mutex);
BUG_ON(msq == NULL); msq = (struct msg_queue *) ipc_findkey(&msg_ids(ns), key);
if (ipcperms(&msq->q_perm, msgflg)) if (msq == NULL) {
ret = -EACCES; /* key not used */
else { if (!(msgflg & IPC_CREAT))
int qid = msg_buildid(ns, id, msq->q_perm.seq); ret = -ENOENT;
else if (!ret)
ret = security_msg_queue_associate(msq, msgflg); ret = -ENOMEM;
if (!ret) else
ret = qid; ret = newque(ns, key, msgflg);
} else {
/* msq has been locked by ipc_findkey() */
if (msgflg & IPC_CREAT && msgflg & IPC_EXCL)
ret = -EEXIST;
else {
if (ipcperms(&msq->q_perm, msgflg))
ret = -EACCES;
else {
ret = security_msg_queue_associate(
msq, msgflg);
if (!ret)
ret = msq->q_perm.id;
}
}
msg_unlock(msq);
} }
msg_unlock(msq); mutex_unlock(&msg_ids(ns).mutex);
} }
mutex_unlock(&msg_ids(ns).mutex);
return ret; return ret;
} }
...@@ -430,13 +457,13 @@ asmlinkage long sys_msgctl(int msqid, int cmd, struct msqid_ds __user *buf) ...@@ -430,13 +457,13 @@ asmlinkage long sys_msgctl(int msqid, int cmd, struct msqid_ds __user *buf)
msginfo.msgpool = MSGPOOL; msginfo.msgpool = MSGPOOL;
msginfo.msgtql = MSGTQL; msginfo.msgtql = MSGTQL;
} }
max_id = msg_ids(ns).max_id; max_id = ipc_get_maxid(&msg_ids(ns));
mutex_unlock(&msg_ids(ns).mutex); mutex_unlock(&msg_ids(ns).mutex);
if (copy_to_user(buf, &msginfo, sizeof(struct msginfo))) if (copy_to_user(buf, &msginfo, sizeof(struct msginfo)))
return -EFAULT; return -EFAULT;
return (max_id < 0) ? 0 : max_id; return (max_id < 0) ? 0 : max_id;
} }
case MSG_STAT: case MSG_STAT: /* msqid is an index rather than a msg queue id */
case IPC_STAT: case IPC_STAT:
{ {
struct msqid64_ds tbuf; struct msqid64_ds tbuf;
...@@ -444,8 +471,6 @@ asmlinkage long sys_msgctl(int msqid, int cmd, struct msqid_ds __user *buf) ...@@ -444,8 +471,6 @@ asmlinkage long sys_msgctl(int msqid, int cmd, struct msqid_ds __user *buf)
if (!buf) if (!buf)
return -EFAULT; return -EFAULT;
if (cmd == MSG_STAT && msqid >= msg_ids(ns).entries->size)
return -EINVAL;
memset(&tbuf, 0, sizeof(tbuf)); memset(&tbuf, 0, sizeof(tbuf));
...@@ -454,7 +479,7 @@ asmlinkage long sys_msgctl(int msqid, int cmd, struct msqid_ds __user *buf) ...@@ -454,7 +479,7 @@ asmlinkage long sys_msgctl(int msqid, int cmd, struct msqid_ds __user *buf)
return -EINVAL; return -EINVAL;
if (cmd == MSG_STAT) { if (cmd == MSG_STAT) {
success_return = msg_buildid(ns, msqid, msq->q_perm.seq); success_return = msq->q_perm.id;
} else { } else {
err = -EIDRM; err = -EIDRM;
if (msg_checkid(ns, msq, msqid)) if (msg_checkid(ns, msq, msqid))
...@@ -552,7 +577,7 @@ asmlinkage long sys_msgctl(int msqid, int cmd, struct msqid_ds __user *buf) ...@@ -552,7 +577,7 @@ asmlinkage long sys_msgctl(int msqid, int cmd, struct msqid_ds __user *buf)
break; break;
} }
case IPC_RMID: case IPC_RMID:
freeque(ns, msq, msqid); freeque(ns, msq);
break; break;
} }
err = 0; err = 0;
...@@ -926,7 +951,7 @@ static int sysvipc_msg_proc_show(struct seq_file *s, void *it) ...@@ -926,7 +951,7 @@ static int sysvipc_msg_proc_show(struct seq_file *s, void *it)
return seq_printf(s, return seq_printf(s,
"%10d %10d %4o %10lu %10lu %5u %5u %5u %5u %5u %5u %10lu %10lu %10lu\n", "%10d %10d %4o %10lu %10lu %5u %5u %5u %5u %5u %5u %10lu %10lu %10lu\n",
msq->q_perm.key, msq->q_perm.key,
msq->q_id, msq->q_perm.id,
msq->q_perm.mode, msq->q_perm.mode,
msq->q_cbytes, msq->q_cbytes,
msq->q_qnum, msq->q_qnum,
......
...@@ -90,7 +90,6 @@ ...@@ -90,7 +90,6 @@
#define sem_lock(ns, id) ((struct sem_array*)ipc_lock(&sem_ids(ns), id)) #define sem_lock(ns, id) ((struct sem_array*)ipc_lock(&sem_ids(ns), id))
#define sem_unlock(sma) ipc_unlock(&(sma)->sem_perm) #define sem_unlock(sma) ipc_unlock(&(sma)->sem_perm)
#define sem_rmid(ns, id) ((struct sem_array*)ipc_rmid(&sem_ids(ns), id))
#define sem_checkid(ns, sma, semid) \ #define sem_checkid(ns, sma, semid) \
ipc_checkid(&sem_ids(ns),&sma->sem_perm,semid) ipc_checkid(&sem_ids(ns),&sma->sem_perm,semid)
#define sem_buildid(ns, id, seq) \ #define sem_buildid(ns, id, seq) \
...@@ -99,7 +98,7 @@ ...@@ -99,7 +98,7 @@
static struct ipc_ids init_sem_ids; static struct ipc_ids init_sem_ids;
static int newary(struct ipc_namespace *, key_t, int, int); static int newary(struct ipc_namespace *, key_t, int, int);
static void freeary(struct ipc_namespace *ns, struct sem_array *sma, int id); static void freeary(struct ipc_namespace *, struct sem_array *);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
static int sysvipc_sem_proc_show(struct seq_file *s, void *it); static int sysvipc_sem_proc_show(struct seq_file *s, void *it);
#endif #endif
...@@ -129,7 +128,7 @@ static void __sem_init_ns(struct ipc_namespace *ns, struct ipc_ids *ids) ...@@ -129,7 +128,7 @@ static void __sem_init_ns(struct ipc_namespace *ns, struct ipc_ids *ids)
ns->sc_semopm = SEMOPM; ns->sc_semopm = SEMOPM;
ns->sc_semmni = SEMMNI; ns->sc_semmni = SEMMNI;
ns->used_sems = 0; ns->used_sems = 0;
ipc_init_ids(ids, ns->sc_semmni); ipc_init_ids(ids);
} }
int sem_init_ns(struct ipc_namespace *ns) int sem_init_ns(struct ipc_namespace *ns)
...@@ -146,20 +145,24 @@ int sem_init_ns(struct ipc_namespace *ns) ...@@ -146,20 +145,24 @@ int sem_init_ns(struct ipc_namespace *ns)
void sem_exit_ns(struct ipc_namespace *ns) void sem_exit_ns(struct ipc_namespace *ns)
{ {
int i;
struct sem_array *sma; struct sem_array *sma;
int next_id;
int total, in_use;
mutex_lock(&sem_ids(ns).mutex); mutex_lock(&sem_ids(ns).mutex);
for (i = 0; i <= sem_ids(ns).max_id; i++) {
sma = sem_lock(ns, i); in_use = sem_ids(ns).in_use;
for (total = 0, next_id = 0; total < in_use; next_id++) {
sma = idr_find(&sem_ids(ns).ipcs_idr, next_id);
if (sma == NULL) if (sma == NULL)
continue; continue;
ipc_lock_by_ptr(&sma->sem_perm);
freeary(ns, sma, i); freeary(ns, sma);
total++;
} }
mutex_unlock(&sem_ids(ns).mutex); mutex_unlock(&sem_ids(ns).mutex);
ipc_fini_ids(ns->ids[IPC_SEM_IDS]);
kfree(ns->ids[IPC_SEM_IDS]); kfree(ns->ids[IPC_SEM_IDS]);
ns->ids[IPC_SEM_IDS] = NULL; ns->ids[IPC_SEM_IDS] = NULL;
} }
...@@ -172,6 +175,11 @@ void __init sem_init (void) ...@@ -172,6 +175,11 @@ void __init sem_init (void)
IPC_SEM_IDS, sysvipc_sem_proc_show); IPC_SEM_IDS, sysvipc_sem_proc_show);
} }
static inline void sem_rmid(struct ipc_namespace *ns, struct sem_array *s)
{
ipc_rmid(&sem_ids(ns), &s->sem_perm);
}
/* /*
* Lockless wakeup algorithm: * Lockless wakeup algorithm:
* Without the check/retry algorithm a lockless wakeup is possible: * Without the check/retry algorithm a lockless wakeup is possible:
...@@ -243,7 +251,7 @@ static int newary (struct ipc_namespace *ns, key_t key, int nsems, int semflg) ...@@ -243,7 +251,7 @@ static int newary (struct ipc_namespace *ns, key_t key, int nsems, int semflg)
} }
ns->used_sems += nsems; ns->used_sems += nsems;
sma->sem_id = sem_buildid(ns, id, sma->sem_perm.seq); sma->sem_perm.id = sem_buildid(ns, id, sma->sem_perm.seq);
sma->sem_base = (struct sem *) &sma[1]; sma->sem_base = (struct sem *) &sma[1];
/* sma->sem_pending = NULL; */ /* sma->sem_pending = NULL; */
sma->sem_pending_last = &sma->sem_pending; sma->sem_pending_last = &sma->sem_pending;
...@@ -252,12 +260,12 @@ static int newary (struct ipc_namespace *ns, key_t key, int nsems, int semflg) ...@@ -252,12 +260,12 @@ static int newary (struct ipc_namespace *ns, key_t key, int nsems, int semflg)
sma->sem_ctime = get_seconds(); sma->sem_ctime = get_seconds();
sem_unlock(sma); sem_unlock(sma);
return sma->sem_id; return sma->sem_perm.id;
} }
asmlinkage long sys_semget (key_t key, int nsems, int semflg) asmlinkage long sys_semget (key_t key, int nsems, int semflg)
{ {
int id, err = -EINVAL; int err;
struct sem_array *sma; struct sem_array *sma;
struct ipc_namespace *ns; struct ipc_namespace *ns;
...@@ -265,34 +273,50 @@ asmlinkage long sys_semget (key_t key, int nsems, int semflg) ...@@ -265,34 +273,50 @@ asmlinkage long sys_semget (key_t key, int nsems, int semflg)
if (nsems < 0 || nsems > ns->sc_semmsl) if (nsems < 0 || nsems > ns->sc_semmsl)
return -EINVAL; return -EINVAL;
mutex_lock(&sem_ids(ns).mutex);
err = idr_pre_get(&sem_ids(ns).ipcs_idr, GFP_KERNEL);
if (key == IPC_PRIVATE) { if (key == IPC_PRIVATE) {
err = newary(ns, key, nsems, semflg); if (!err)
} else if ((id = ipc_findkey(&sem_ids(ns), key)) == -1) { /* key not used */ err = -ENOMEM;
if (!(semflg & IPC_CREAT)) else {
err = -ENOENT; mutex_lock(&sem_ids(ns).mutex);
else
err = newary(ns, key, nsems, semflg); err = newary(ns, key, nsems, semflg);
} else if (semflg & IPC_CREAT && semflg & IPC_EXCL) { mutex_unlock(&sem_ids(ns).mutex);
err = -EEXIST; }
} else { } else {
sma = sem_lock(ns, id); mutex_lock(&sem_ids(ns).mutex);
BUG_ON(sma==NULL); sma = (struct sem_array *) ipc_findkey(&sem_ids(ns), key);
if (nsems > sma->sem_nsems) if (sma == NULL) {
err = -EINVAL; /* key not used */
else if (ipcperms(&sma->sem_perm, semflg)) if (!(semflg & IPC_CREAT))
err = -EACCES; err = -ENOENT;
else { else if (!err)
int semid = sem_buildid(ns, id, sma->sem_perm.seq); err = -ENOMEM;
err = security_sem_associate(sma, semflg); else
if (!err) err = newary(ns, key, nsems, semflg);
err = semid; } else {
/* sma has been locked by ipc_findkey() */
if (semflg & IPC_CREAT && semflg & IPC_EXCL)
err = -EEXIST;
else {
if (nsems > sma->sem_nsems)
err = -EINVAL;
else if (ipcperms(&sma->sem_perm, semflg))
err = -EACCES;
else {
err = security_sem_associate(sma,
semflg);
if (!err)
err = sma->sem_perm.id;
}
}
sem_unlock(sma);
} }
sem_unlock(sma); mutex_unlock(&sem_ids(ns).mutex);
} }
mutex_unlock(&sem_ids(ns).mutex);
return err; return err;
} }
...@@ -491,11 +515,10 @@ static int count_semzcnt (struct sem_array * sma, ushort semnum) ...@@ -491,11 +515,10 @@ static int count_semzcnt (struct sem_array * sma, ushort semnum)
* the spinlock for this semaphore set hold. sem_ids.mutex remains locked * the spinlock for this semaphore set hold. sem_ids.mutex remains locked
* on exit. * on exit.
*/ */
static void freeary (struct ipc_namespace *ns, struct sem_array *sma, int id) static void freeary(struct ipc_namespace *ns, struct sem_array *sma)
{ {
struct sem_undo *un; struct sem_undo *un;
struct sem_queue *q; struct sem_queue *q;
int size;
/* Invalidate the existing undo structures for this semaphore set. /* Invalidate the existing undo structures for this semaphore set.
* (They will be freed without any further action in exit_sem() * (They will be freed without any further action in exit_sem()
...@@ -518,12 +541,11 @@ static void freeary (struct ipc_namespace *ns, struct sem_array *sma, int id) ...@@ -518,12 +541,11 @@ static void freeary (struct ipc_namespace *ns, struct sem_array *sma, int id)
q = n; q = n;
} }
/* Remove the semaphore set from the ID array*/ /* Remove the semaphore set from the IDR */
sma = sem_rmid(ns, id); sem_rmid(ns, sma);
sem_unlock(sma); sem_unlock(sma);
ns->used_sems -= sma->sem_nsems; ns->used_sems -= sma->sem_nsems;
size = sizeof (*sma) + sma->sem_nsems * sizeof (struct sem);
security_sem_free(sma); security_sem_free(sma);
ipc_rcu_putref(sma); ipc_rcu_putref(sma);
} }
...@@ -584,7 +606,7 @@ static int semctl_nolock(struct ipc_namespace *ns, int semid, int semnum, ...@@ -584,7 +606,7 @@ static int semctl_nolock(struct ipc_namespace *ns, int semid, int semnum,
seminfo.semusz = SEMUSZ; seminfo.semusz = SEMUSZ;
seminfo.semaem = SEMAEM; seminfo.semaem = SEMAEM;
} }
max_id = sem_ids(ns).max_id; max_id = ipc_get_maxid(&sem_ids(ns));
mutex_unlock(&sem_ids(ns).mutex); mutex_unlock(&sem_ids(ns).mutex);
if (copy_to_user (arg.__buf, &seminfo, sizeof(struct seminfo))) if (copy_to_user (arg.__buf, &seminfo, sizeof(struct seminfo)))
return -EFAULT; return -EFAULT;
...@@ -595,9 +617,6 @@ static int semctl_nolock(struct ipc_namespace *ns, int semid, int semnum, ...@@ -595,9 +617,6 @@ static int semctl_nolock(struct ipc_namespace *ns, int semid, int semnum,
struct semid64_ds tbuf; struct semid64_ds tbuf;
int id; int id;
if(semid >= sem_ids(ns).entries->size)
return -EINVAL;
memset(&tbuf,0,sizeof(tbuf)); memset(&tbuf,0,sizeof(tbuf));
sma = sem_lock(ns, semid); sma = sem_lock(ns, semid);
...@@ -612,7 +631,7 @@ static int semctl_nolock(struct ipc_namespace *ns, int semid, int semnum, ...@@ -612,7 +631,7 @@ static int semctl_nolock(struct ipc_namespace *ns, int semid, int semnum,
if (err) if (err)
goto out_unlock; goto out_unlock;
id = sem_buildid(ns, semid, sma->sem_perm.seq); id = sma->sem_perm.id;
kernel_to_ipc64_perm(&sma->sem_perm, &tbuf.sem_perm); kernel_to_ipc64_perm(&sma->sem_perm, &tbuf.sem_perm);
tbuf.sem_otime = sma->sem_otime; tbuf.sem_otime = sma->sem_otime;
...@@ -894,7 +913,7 @@ static int semctl_down(struct ipc_namespace *ns, int semid, int semnum, ...@@ -894,7 +913,7 @@ static int semctl_down(struct ipc_namespace *ns, int semid, int semnum,
switch(cmd){ switch(cmd){
case IPC_RMID: case IPC_RMID:
freeary(ns, sma, semid); freeary(ns, sma);
err = 0; err = 0;
break; break;
case IPC_SET: case IPC_SET:
...@@ -1402,7 +1421,7 @@ static int sysvipc_sem_proc_show(struct seq_file *s, void *it) ...@@ -1402,7 +1421,7 @@ static int sysvipc_sem_proc_show(struct seq_file *s, void *it)
return seq_printf(s, return seq_printf(s,
"%10d %10d %4o %10lu %5u %5u %5u %5u %10lu %10lu\n", "%10d %10d %4o %10lu %5u %5u %5u %5u %10lu %10lu\n",
sma->sem_perm.key,