From b209e34ad62446d73e5b83ef3cf3a874d2da57d3 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Sat, 16 Feb 2002 00:21:33 +0000
Subject: Update.

2002-02-15  Ulrich Drepper  <drepper@redhat.com>

	* elf/dl-open.c (dl_open_worker): Catch wrap-around of TLS
	generation counter.
	* elf/dl-close.c (_dl_close): Likewise.
---
 elf/dl-close.c | 4 +++-
 elf/dl-open.c  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'elf')

diff --git a/elf/dl-close.c b/elf/dl-close.c
index a5941268b9..65992d5c80 100644
--- a/elf/dl-close.c
+++ b/elf/dl-close.c
@@ -20,6 +20,7 @@
 #include <assert.h>
 #include <dlfcn.h>
 #include <libintl.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <bits/libc-lock.h>
@@ -352,7 +353,8 @@ _dl_close (void *_map)
   /* If we removed any object which uses TLS bumnp the generation
      counter.  */
   if (any_tls)
-    ++GL(dl_tls_generation);
+    if (__builtin_expect (++GL(dl_tls_generation) == 0, 0))
+      __libc_fatal (gettext ("TLS generation counter wrapped!  Please send report with the 'glibcbug' script."));
 #endif
 
   /* Notify the debugger those objects are finalized and gone.  */
diff --git a/elf/dl-open.c b/elf/dl-open.c
index 6fcfcce3ce..5710ffb40f 100644
--- a/elf/dl-open.c
+++ b/elf/dl-open.c
@@ -21,6 +21,7 @@
 #include <dlfcn.h>
 #include <errno.h>
 #include <libintl.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -431,7 +432,8 @@ dl_open_worker (void *a)
 
   /* Bump the generation number if necessary.  */
   if (any_tls)
-    ++GL(dl_tls_generation);
+    if (__builtin_expect (++GL(dl_tls_generation) == 0, 0))
+      __libc_fatal (gettext ("TLS generation counter wrapped!  Please send report with the 'glibcbug' script."));
 #endif
 
   /* Run the initializer functions of new objects.  */
-- 
cgit 1.4.1