---

yaml --- r: 372859 b: refs/heads/master c: 941b030 h: refs/heads/master i: 372857: 12e4a42 372855: d25c835 v: v3
git-mirror · May 5, 2013 · a8e7e19 · a8e7e19
1 parent e59a6a3
commit a8e7e19
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c728b9c87b59fb943c4cba0552d38152787a4ab6
+refs/heads/master: 941b0304a74b240c607ff098401fd4ef70c9d1cc
diff --git a/trunk/ipc/sem.c b/trunk/ipc/sem.c
@@ -948,16 +948,15 @@ static int semctl_nolock(struct ipc_namespace *ns, int semid,
 
 		memset(&tbuf, 0, sizeof(tbuf));
 
+		rcu_read_lock();
 		if (cmd == SEM_STAT) {
-			rcu_read_lock();
 			sma = sem_obtain_object(ns, semid);
 			if (IS_ERR(sma)) {
 				err = PTR_ERR(sma);
 				goto out_unlock;
 			}
 			id = sma->sem_perm.id;
 		} else {
-			rcu_read_lock();
 			sma = sem_obtain_object_check(ns, semid);
 			if (IS_ERR(sma)) {
 				err = PTR_ERR(sma);