Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[pandora-kernel.git] / ipc / sem.c

diff --git a/ipc/sem.c b/ipc/sem.c
index 8b929e6..c8e00f8 100644 (file)
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -1450,15 +1450,24 @@ SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops,
        }
 
        sma = sem_lock(ns, semid);
+
+       /*
+        * Wait until it's guaranteed that no wakeup_sem_queue_do() is ongoing.
+        */
+       error = get_queue_result(&queue);
+
+       /*
+        * Array removed? If yes, leave without sem_unlock().
+        */
        if (IS_ERR(sma)) {
                error = -EIDRM;
                goto out_free;
        }
 
-       error = get_queue_result(&queue);
 
        /*
-        * If queue.status != -EINTR we are woken up by another process
+        * If queue.status != -EINTR we are woken up by another process.
+        * Leave without unlink_queue(), but with sem_unlock().
         */
 
        if (error != -EINTR) {