about summary refs log tree commit diff
path: root/nptl/allocatestack.c
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@redhat.com>2010-06-25 10:41:17 +0200
committerAndreas Schwab <schwab@redhat.com>2011-08-31 11:21:13 +0200
commit523df511514331a7fa0668b37a917b52f71684af (patch)
treeec00cd983d6d41308351d396004b460df057269a /nptl/allocatestack.c
parent2bc174332ba6ddbd1b855dced33889bef56e8ba3 (diff)
downloadglibc-523df511514331a7fa0668b37a917b52f71684af.tar.gz
glibc-523df511514331a7fa0668b37a917b52f71684af.tar.xz
glibc-523df511514331a7fa0668b37a917b52f71684af.zip
Fix setxid race handling exiting threads
Diffstat (limited to 'nptl/allocatestack.c')
-rw-r--r--nptl/allocatestack.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c
index 9b8b0ceb40..23d2ce559c 100644
--- a/nptl/allocatestack.c
+++ b/nptl/allocatestack.c
@@ -999,7 +999,16 @@ setxid_mark_thread (struct xid_command *cmdp, struct pthread *t)
 
       /* If the thread is exiting right now, ignore it.  */
       if ((ch & EXITING_BITMASK) != 0)
-	return;
+	{
+	  /* Release the futex if there is no other setxid in
+	     progress.  */
+	  if ((ch & SETXID_BITMASK) == 0)
+	    {
+	      t->setxid_futex = 1;
+	      lll_futex_wake (&t->setxid_futex, 1, LLL_PRIVATE);
+	    }
+	  return;
+	}
     }
   while (atomic_compare_and_exchange_bool_acq (&t->cancelhandling,
 					       ch | SETXID_BITMASK, ch));