diff options
| author | Jeff Law <law@redhat.com> | 2012-06-21 09:26:41 -0600 |
|---|---|---|
| committer | Jeff Law <law@redhat.com> | 2012-06-21 09:26:41 -0600 |
| commit | 28363bbf705830cb35791af679401559376eaa75 (patch) | |
| tree | d04ba0e96581b43edcfe7eaaea5e4bdce8870886 /elf/dl-open.c | |
| parent | 09615db4a954a51014bb75e6def15ec05d4f0da9 (diff) | |
| download | glibc-28363bbf705830cb35791af679401559376eaa75.zip glibc-28363bbf705830cb35791af679401559376eaa75.tar.gz glibc-28363bbf705830cb35791af679401559376eaa75.tar.bz2 | |
2012-06-21 Jeff Law <law@redhat.com>
[BZ #13882]
* elf/dl-deps.c (_dl_map_object_deps): Fix cycle detection. Use
uint16_t for elements in the "seen" array to avoid char overflows.
* elf/dl-fini.c (_dl_sort_fini): Likewise.
* elf/dl-open.c (dl_open_worker): Likewise.
Diffstat (limited to 'elf/dl-open.c')
| -rw-r--r-- | elf/dl-open.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/elf/dl-open.c b/elf/dl-open.c index 570c5f8..9fe0a7f 100644 --- a/elf/dl-open.c +++ b/elf/dl-open.c @@ -1,5 +1,5 @@ /* Load a shared object at runtime, relocate it, and run its initializer. - Copyright (C) 1996-2007, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. + Copyright (C) 1996-2007, 2009-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -325,7 +325,7 @@ dl_open_worker (void *a) while (l != NULL); if (nmaps > 1) { - char seen[nmaps]; + uint16_t seen[nmaps]; memset (seen, '\0', nmaps); size_t i = 0; while (1) @@ -351,13 +351,13 @@ dl_open_worker (void *a) (k - i) * sizeof (maps[0])); maps[k] = thisp; - if (seen[i + 1] > 1) + if (seen[i + 1] > nmaps - i) { ++i; goto next_clear; } - char this_seen = seen[i]; + uint16_t this_seen = seen[i]; memmove (&seen[i], &seen[i + 1], (k - i) * sizeof (seen[0])); seen[k] = this_seen; |