Revert to original version of setxid race fix

3 files changed, 15 insertions, 3 deletions

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index e0e1a5392f..fa4c8f2f9f 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-08  Andreas Schwab  <schwab@redhat.com>
+
+	* pthread_create.c (__pthread_create_2_1): Don't set setxid_futex.
+	* allocatestack.c (get_cached_stack): Set setxid_futex.
+	(allocate_stack): Likewise.
+
 2010-03-05  Andreas Schwab  <schwab@redhat.com>
 	    Ulrich Drepper  <drepper@redhat.com>
 
diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c
index 899c0e8eee..831e98e4ce 100644
--- a/nptl/allocatestack.c
+++ b/nptl/allocatestack.c
@@ -213,6 +213,9 @@ get_cached_stack (size_t *sizep, void **memp)
       return NULL;
     }
 
+  /* Don't allow setxid until cloned.  */
+  result->setxid_futex = -1;
+
   /* Dequeue the entry.  */
   stack_list_del (&result->list);
 
@@ -418,6 +421,9 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp,
       /* The process ID is also the same as that of the caller.  */
       pd->pid = THREAD_GETMEM (THREAD_SELF, pid);
 
+      /* Don't allow setxid until cloned.  */
+      pd->setxid_futex = -1;
+
       /* Allocate the DTV for this thread.  */
       if (_dl_allocate_tls (TLS_TPADJ (pd)) == NULL)
 	{
@@ -554,6 +560,9 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp,
 	  THREAD_SYSINFO(pd) = THREAD_SELF_SYSINFO;
 #endif
 
+	  /* Don't allow setxid until cloned.  */
+	  pd->setxid_futex = -1;
+
 	  /* The process ID is also the same as that of the caller.  */
 	  pd->pid = THREAD_GETMEM (THREAD_SELF, pid);
 
diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c
index 194a8ba0ab..14e3cf784b 100644
--- a/nptl/pthread_create.c
+++ b/nptl/pthread_create.c
@@ -542,9 +542,6 @@ __pthread_create_2_1 (newthread, attr, start_routine, arg)
 	}
     }
 
-  /* Don't allow setxid until cloned. */
-  pd->setxid_futex = -1;
-
   /* Pass the descriptor to the caller.  */
   *newthread = (pthread_t) pd;