BZ #12310: pthread_exit in static app. segfaults

Static applications that call pthread_exit on the main
thread segfault. This is because after a thread terminates
__libc_start_main decrements __nptl_nthreads which is only
defined in pthread_create. Therefore the right solution is
to add a requirement to pthread_create from pthread_exit.

~~~
nptl/

2013-06-24  Vladimir Nikulichev  <v.nikulichev@gmail.com>

	[BZ #12310]
	* pthread_exit.c: Add reference to pthread_create.

diff --git a/NEWS b/NEWS
index ea4a465..b238255 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,18 +10,18 @@ Version 2.18
 * The following bugs are resolved with this release:
 
   2546, 2560, 5159, 6809, 7006, 10060, 10062, 10357, 10686, 11120, 11561,
-  12387, 12515, 12723, 13550, 13889, 13951, 13988, 14142, 14176, 14200,
-  14256, 14280, 14293, 14317, 14327, 14478, 14496, 14582, 14686, 14812,
-  14888, 14894, 14907, 14908, 14909, 14920, 14952, 14964, 14981, 14982,
-  14985, 14991, 14994, 14996, 15000, 15003, 15006, 15007, 15014, 15020,
-  15023, 15036, 15054, 15055, 15062, 15078, 15084, 15085, 15086, 15100,
-  15160, 15214, 15221, 15232, 15234, 15283, 15285, 15287, 15304, 15305,
-  15307, 15309, 15327, 15330, 15335, 15336, 15337, 15339, 15342, 15346,
-  15359, 15361, 15366, 15380, 15381, 15394, 15395, 15405, 15406, 15409,
-  15416, 15418, 15419, 15423, 15424, 15426, 15429, 15431, 15432, 15441,
-  15442, 15448, 15465, 15480, 15485, 15488, 15490, 15492, 15493, 15497,
-  15506, 15529, 15536, 15553, 15577, 15583, 15618, 15627, 15631, 15654,
-  15655, 15667.
+  12310, 12387, 12515, 12723, 13550, 13889, 13951, 13988, 14142, 14176,
+  14200, 14256, 14280, 14293, 14317, 14327, 14478, 14496, 14582, 14686,
+  14812, 14888, 14894, 14907, 14908, 14909, 14920, 14952, 14964, 14981,
+  14982, 14985, 14991, 14994, 14996, 15000, 15003, 15006, 15007, 15014,
+  15020, 15023, 15036, 15054, 15055, 15062, 15078, 15084, 15085, 15086,
+  15100, 15160, 15214, 15221, 15232, 15234, 15283, 15285, 15287, 15304,
+  15305, 15307, 15309, 15327, 15330, 15335, 15336, 15337, 15339, 15342,
+  15346, 15359, 15361, 15366, 15380, 15381, 15394, 15395, 15405, 15406,
+  15409, 15416, 15418, 15419, 15423, 15424, 15426, 15429, 15431, 15432,
+  15441, 15442, 15448, 15465, 15480, 15485, 15488, 15490, 15492, 15493,
+  15497, 15506, 15529, 15536, 15553, 15577, 15583, 15618, 15627, 15631,
+  15654, 15655, 15667.
 
 * CVE-2013-0242 Buffer overrun in regexp matcher has been fixed (Bugzilla
   #15078).

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 875bdbd..7c03548 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-24  Vladimir Nikulichev  <v.nikulichev@gmail.com>
+
+       [BZ #12310]
+       * pthread_exit.c: Add reference to pthread_create.
+
 2013-06-22  Joseph Myers  <joseph@codesourcery.com>
 
        * pthread_getattr_default_np.c: Include <string.h>.

diff --git a/nptl/pthread_exit.c b/nptl/pthread_exit.c
index 3718081..263e792 100644 (file)
--- a/nptl/pthread_exit.c
+++ b/nptl/pthread_exit.c
@@ -29,3 +29,7 @@ __pthread_exit (value)
   __do_cancel ();
 }
 strong_alias (__pthread_exit, pthread_exit)
+
+/* After a thread terminates, __libc_start_main decrements
+   __nptl_nthreads defined in pthread_create.c.  */
+PTHREAD_STATIC_FN_REQUIRE (pthread_create)