|
@@ -680,16 +680,18 @@ long do_msgsnd(int msqid, long mtype, void __user *mtext,
|
|
|
goto out_unlock1;
|
|
|
}
|
|
|
|
|
|
+ ipc_lock_object(&msq->q_perm);
|
|
|
+
|
|
|
for (;;) {
|
|
|
struct msg_sender s;
|
|
|
|
|
|
err = -EACCES;
|
|
|
if (ipcperms(ns, &msq->q_perm, S_IWUGO))
|
|
|
- goto out_unlock1;
|
|
|
+ goto out_unlock0;
|
|
|
|
|
|
err = security_msg_queue_msgsnd(msq, msg, msgflg);
|
|
|
if (err)
|
|
|
- goto out_unlock1;
|
|
|
+ goto out_unlock0;
|
|
|
|
|
|
if (msgsz + msq->q_cbytes <= msq->q_qbytes &&
|
|
|
1 + msq->q_qnum <= msq->q_qbytes) {
|
|
@@ -699,10 +701,9 @@ long do_msgsnd(int msqid, long mtype, void __user *mtext,
|
|
|
/* queue full, wait: */
|
|
|
if (msgflg & IPC_NOWAIT) {
|
|
|
err = -EAGAIN;
|
|
|
- goto out_unlock1;
|
|
|
+ goto out_unlock0;
|
|
|
}
|
|
|
|
|
|
- ipc_lock_object(&msq->q_perm);
|
|
|
ss_add(msq, &s);
|
|
|
|
|
|
if (!ipc_rcu_getref(msq)) {
|
|
@@ -730,10 +731,7 @@ long do_msgsnd(int msqid, long mtype, void __user *mtext,
|
|
|
goto out_unlock0;
|
|
|
}
|
|
|
|
|
|
- ipc_unlock_object(&msq->q_perm);
|
|
|
}
|
|
|
-
|
|
|
- ipc_lock_object(&msq->q_perm);
|
|
|
msq->q_lspid = task_tgid_vnr(current);
|
|
|
msq->q_stime = get_seconds();
|
|
|
|