public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] kernel/exit.c: call read_unlock() when failure occurs after already called read_lock() in do_wait().
@ 2013-10-05  5:53 Chen Gang
  2013-10-05  6:34 ` Al Viro
  0 siblings, 1 reply; 5+ messages in thread
From: Chen Gang @ 2013-10-05  5:53 UTC (permalink / raw)
  To: Al Viro, Frederic Weisbecker, Oleg Nesterov, Eric W. Biederman
  Cc: Andrew Morton, linux-kernel@vger.kernel.org

If failure occurs after called read_lock(), need call read_unlock() too.

It can fail in multiple position, so add new tag 'fail_lock' for it
(also can let 'if' only content one jump statement).


Signed-off-by: Chen Gang <gang.chen@asianux.com>
---
 kernel/exit.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/kernel/exit.c b/kernel/exit.c
index a949819..3da5476 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -1527,11 +1527,11 @@ repeat:
 	do {
 		retval = do_wait_thread(wo, tsk);
 		if (retval)
-			goto end;
+			goto fail_lock;
 
 		retval = ptrace_do_wait(wo, tsk);
 		if (retval)
-			goto end;
+			goto fail_lock;
 
 		if (wo->wo_flags & __WNOTHREAD)
 			break;
@@ -1551,6 +1551,10 @@ end:
 	__set_current_state(TASK_RUNNING);
 	remove_wait_queue(&current->signal->wait_chldexit, &wo->child_wait);
 	return retval;
+
+fail_lock:
+	read_unlock(&tasklist_lock);
+	goto end;
 }
 
 SYSCALL_DEFINE5(waitid, int, which, pid_t, upid, struct siginfo __user *,
-- 
1.7.7.6

^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2013-10-05 16:49 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-05  5:53 [PATCH] kernel/exit.c: call read_unlock() when failure occurs after already called read_lock() in do_wait() Chen Gang
2013-10-05  6:34 ` Al Viro
2013-10-05  7:33   ` Chen Gang
2013-10-05 15:48     ` Al Viro
2013-10-05 16:48       ` Chen Gang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox