diff options
author | Andreas Schwab <schwab@redhat.com> | 2009-07-30 14:18:37 +0200 |
---|---|---|
committer | Andreas Schwab <schwab@redhat.com> | 2009-07-30 14:18:37 +0200 |
commit | b870de510d54108c7c839abc17ea1559085e55a3 (patch) | |
tree | d59aca63c9713ac51b929e388187f6ec0bb1273e /elf/dl-reloc.c | |
parent | ca2a37b64e0347b400e58da9ca238c9320a55edb (diff) | |
parent | 78c4ef475d47a2289635f74b726f52defedb4651 (diff) |
Merge commit 'origin/master' into fedora/master
Diffstat (limited to 'elf/dl-reloc.c')
-rw-r--r-- | elf/dl-reloc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c index 28f08de3e7..680caadd65 100644 --- a/elf/dl-reloc.c +++ b/elf/dl-reloc.c @@ -61,7 +61,10 @@ _dl_try_allocate_static_tls (struct link_map *map) size_t n; size_t blsize; - freebytes = GL(dl_tls_static_size) - GL(dl_tls_static_used) - TLS_TCB_SIZE; + freebytes = GL(dl_tls_static_size) - GL(dl_tls_static_used); + if (freebytes < TLS_TCB_SIZE) + goto fail; + freebytes -= TLS_TCB_SIZE; blsize = map->l_tls_blocksize + map->l_tls_firstbyte_offset; if (freebytes < blsize) |