[PATCH] c/r: prctl: Move PR_GET_TID_ADDRESS to a proper place

* [PATCH] c/r: prctl: Move PR_GET_TID_ADDRESS to a proper place
@ 2012-06-15 13:56 Cyrill Gorcunov
  2012-06-15 15:25 ` Kees Cook
  0 siblings, 1 reply; 2+ messages in thread
From: Cyrill Gorcunov @ 2012-06-15 13:56 UTC (permalink / raw)
  To: Andrew Morton
  Cc: LKML, Kees Cook, Oleg Nesterov, Pavel Emelyanov, Serge Hallyn,
	KAMEZAWA Hiroyuki, Andrey Vagin

During merging of PR_GET_TID_ADDRESS patch the code
has been misplaced (it happened to appear under PR_MCE_KILL)
in result noone can use this option.

Fix it by moving code snippet to a proper place.

Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Pavel Emelyanov <xemul@parallels.com>
Cc: Andrey Vagin <avagin@openvz.org>
Cc: Serge Hallyn <serge.hallyn@canonical.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
---

Andrew, I think it get misplaced during merging (the former
patch I sent has this snippet at the proper place). I noticed
this problem only when found that our test suite swears at me
with futex test case.

Anyway, there is nothing critical in this issue, it behaves like
someone has disabled PR_GET_TID_ADDRESS.

The patch is on top of v3.5-rc2

 kernel/sys.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: linux-2.6.git/kernel/sys.c
===================================================================

--- linux-2.6.git.orig/kernel/sys.c
+++ linux-2.6.git/kernel/sys.c
@@ -2127,9 +2127,6 @@ SYSCALL_DEFINE5(prctl, int, option, unsi
 				else
 					return -EINVAL;
 				break;
-		case PR_GET_TID_ADDRESS:
-			error = prctl_get_tid_address(me, (int __user **)arg2);
-			break;
 			default:
 				return -EINVAL;
 			}
@@ -2147,6 +2144,9 @@ SYSCALL_DEFINE5(prctl, int, option, unsi
 		case PR_SET_MM:
 			error = prctl_set_mm(arg2, arg3, arg4, arg5);
 			break;
+		case PR_GET_TID_ADDRESS:
+			error = prctl_get_tid_address(me, (int __user **)arg2);
+			break;
 		case PR_SET_CHILD_SUBREAPER:
 			me->signal->is_child_subreaper = !!arg2;
 			error = 0;

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