qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid confusing compiler with dynamically impossible statically invalid dereference in _dl_close_worker.

This commit is contained in:
Roland McGrath 2015-04-17 14:29:40 -07:00
parent 328c44c367
commit 2bd2cad9e8
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,5 +1,10 @@
2015-04-17 Roland McGrath <roland@hack.frob.com> 2015-04-17 Roland McGrath <roland@hack.frob.com>
* elf/dl-close.c (_dl_close_worker) [DL_NNS == 1]: Just assert that
IMAP->l_prev cannot be null, and #if out the code for the contrary
case, avoiding 'assert (nsid != LM_ID_BASE)' making the compiler
believe that NS (&_dl_ns[NSID]) could point outside the array.
* elf/dl-open.c (_dl_open): Use __glibc_unlikely in invalid namespace * elf/dl-open.c (_dl_open): Use __glibc_unlikely in invalid namespace
check. Reject NSID < 0 and NSID >= dl_nns, and check for DL_NNS==1, check. Reject NSID < 0 and NSID >= dl_nns, and check for DL_NNS==1,
before using NSID as an index. before using NSID as an index.

16
elf/dl-close.c
View File

@ -641,9 +641,16 @@ _dl_close_worker (struct link_map *map)
DL_UNMAP (imap); DL_UNMAP (imap);
/* Finally, unlink the data structure and free it. */ /* Finally, unlink the data structure and free it. */
if (imap->l_prev != NULL) #if DL_NNS == 1
imap->l_prev->l_next = imap->l_next; /* The assert in the (imap->l_prev == NULL) case gives
else the compiler license to warn that NS points outside
the dl_ns array bounds in that case (as nsid != LM_ID_BASE
is tantamount to nsid >= DL_NNS). That should be impossible
in this configuration, so just assert about it instead. */
assert (nsid == LM_ID_BASE);
assert (imap->l_prev != NULL);
#else
if (imap->l_prev == NULL)
{ {
assert (nsid != LM_ID_BASE); assert (nsid != LM_ID_BASE);
ns->_ns_loaded = imap->l_next; ns->_ns_loaded = imap->l_next;
@ -652,6 +659,9 @@ _dl_close_worker (struct link_map *map)
we leave for debuggers to examine. */ we leave for debuggers to examine. */
r->r_map = (void *) ns->_ns_loaded; r->r_map = (void *) ns->_ns_loaded;
} }
else
#endif
imap->l_prev->l_next = imap->l_next;
--ns->_ns_nloaded; --ns->_ns_nloaded;
if (imap->l_next != NULL) if (imap->l_next != NULL)