aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-02-16 00:21:33 +0000
committerUlrich Drepper <drepper@redhat.com>2002-02-16 00:21:33 +0000
commitb209e34ad62446d73e5b83ef3cf3a874d2da57d3 (patch)
tree5812cb8f92795a12343a187882e225bbc09196d3
parentebda6173fc0fa6b91fa30f1ea83ddb89baec66b9 (diff)
downloadglibc-b209e34ad62446d73e5b83ef3cf3a874d2da57d3.tar
glibc-b209e34ad62446d73e5b83ef3cf3a874d2da57d3.tar.gz
glibc-b209e34ad62446d73e5b83ef3cf3a874d2da57d3.tar.bz2
glibc-b209e34ad62446d73e5b83ef3cf3a874d2da57d3.zip
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.
-rw-r--r--ChangeLog6
-rw-r--r--elf/dl-close.c4
-rw-r--r--elf/dl-open.c4
3 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2b20e9a81f..38c51ec841 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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.
+
2002-02-14 Ulrich Drepper <drepper@redhat.com>
* elf/Makefile: Add rules to build and run tst-tls8.
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. */