Skip to contentSkip to conversation

kernel/exit.c : Fix missing read_unlock

PATCH Maninder Singh 2 participants 2 messages May 21, 2015

lore
Share & tools
lore
#0 lore raw

EP-F6AA0618C49C4AEDA73BFF1B39950BAB

Quoted 6 lines
Quoted 6 lines

Hi,

From: Maninder Singh <[email protected]>

Subject: [PATCH 1/1] kernel/exit.c : Fix missing task_unlock

Subject: [PATCH 1/1] kernel/exit.c : Fix missing read_unlock

Quoted 2 lines
Quoted 2 lines

This patch adds missing read_unlock if do_wait_thread or ptrace_do_wait returns non zero.

Reported By Prevent Under Missing unlock category(program hangs):-
missing_unlock: returning without unlocking tasklist_lock

Quoted 42 lines
Quoted 21 lines
---
 kernel/exit.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
kernel/exit.c +3 -1
index 22fcc05..31a061f 100644
@@ -1486,12 +1486,16 @@ repeat:
 	tsk = current;
 	do {
 		retval = do_wait_thread(wo, tsk);
-		if (retval)
+		if (retval) {
+			read_unlock(&tasklist_lock);
 			goto end;
+		}

kernel/exit.c repeat: · line 1501

Quoted 10 lines
kernel/exit.c +3 -1
 
 		retval = ptrace_do_wait(wo, tsk);
-		if (retval)
+		if (retval) {
+			read_unlock(&tasklist_lock);
 			goto end;
+		}
 
 		if (wo->wo_flags & __WNOTHREAD)
 			break;

That's surprising and the changelog is lacking.

So the last time that code was touched upstream was 7 years ago:

commit 64a16caf5e3417ee32f670debcb5857b02a9e08e

Author: Oleg Nesterov <[email protected]>
Date:   Wed Jun 17 16:27:40 2009 -0700

do_wait: simplify retval/tsk_result/notask_error mess

Quoted 8 lines

please explain whether what you fix is:

1) an ancient bug that somehow nobody ever triggered (plus analysis of why it wasn't triggered)

2) a new bug introduced by commit XYZ (plus analysis)

3) something else

This issue is reported by Prevent Under category Missing Unlock, So we think it should be reported to maintainers.

Quoted 2 lines

Thanks,
Ingo

Thanks.ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ¥Šwÿº{.nÇ+‰·¥Š{±þG«�éÿŠ{ayºʇڙë,j­¢f£¢·hš�ï�êÿ‘êçz_è®(­éšŽŠÝ¢j"�ú¶m§ÿÿ¾«þG«�éÿ¢¸?™¨è­Ú&£ø§~�á¶iO•æ¬z·švØ^¶m§ÿÿà ÿ¶ìÿ¢¸?–I¥

#1 lore raw
Quoted 61 lines · Maninder Singh

EP-F6AA0618C49C4AEDA73BFF1B39950BAB

Quoted 6 lines
Quoted 6 lines

Hi,

From: Maninder Singh <[email protected]>

Subject: [PATCH 1/1] kernel/exit.c : Fix missing task_unlock

Subject: [PATCH 1/1] kernel/exit.c : Fix missing read_unlock

Quoted 2 lines
Quoted 2 lines

This patch adds missing read_unlock if do_wait_thread or ptrace_do_wait returns non zero.

Reported By Prevent Under Missing unlock category(program hangs):-
missing_unlock: returning without unlocking tasklist_lock

Quoted 46 lines
Quoted 21 lines
---
 kernel/exit.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
kernel/exit.c +3 -1
index 22fcc05..31a061f 100644
@@ -1486,12 +1486,16 @@ repeat:
 	tsk = current;
 	do {
 		retval = do_wait_thread(wo, tsk);
-		if (retval)
+		if (retval) {
+			read_unlock(&tasklist_lock);
 			goto end;
+		}

kernel/exit.c repeat: · line 1501

Quoted 10 lines
kernel/exit.c +3 -1
 
 		retval = ptrace_do_wait(wo, tsk);
-		if (retval)
+		if (retval) {
+			read_unlock(&tasklist_lock);
 			goto end;
+		}
 
 		if (wo->wo_flags & __WNOTHREAD)
 			break;

That's surprising and the changelog is lacking.

So the last time that code was touched upstream was 7 years ago:

commit 64a16caf5e3417ee32f670debcb5857b02a9e08e

Author: Oleg Nesterov <[email protected]>
Date:   Wed Jun 17 16:27:40 2009 -0700

do_wait: simplify retval/tsk_result/notask_error mess

please explain whether what you fix is:

1) an ancient bug that somehow nobody ever triggered (plus analysis of why it wasn't triggered)

Quoted 6 lines
Quoted 3 lines

2) a new bug introduced by commit XYZ (plus analysis)

3) something else

This issue is reported by Prevent Under category Missing Unlock, So we think it should be reported to maintainers.

Huh? In what way does your reply answer my questions?

Your patch is breaking the kernel, and badly so.

Thanks,

Ingo