diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-04-11 16:27:38 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-04-11 16:27:38 +0000 |
| commit | e7c036b39ef12abc7ff131982df75e3ec35c0f31 (patch) | |
| tree | 0f5115adbee001941fd8fdf8dac6ea2200f35d60 /elf/readlib.c | |
| parent | 094f72c6a57bf36e70726c1827d93d1d85ed0154 (diff) | |
Update.
2000-04-11 Ulrich Drepper <drepper@redhat.com>
* posix/globtest.sh: Fix last change.
2000-04-10 Philip Blundell <philb@gnu.org>
* sysdeps/unix/sysv/linux/bits/in.h (IPV6_JOIN_GROUP,
IPV6_LEAVE_GROUP): New names for IPV6_ADD_MEMBERSHIP,
IPV6_DROP_MEMBERSHIP.
* sysdeps/generic/bits/in.h (IPV6_JOIN_GROUP, IPV6_LEAVE_GROUP):
Likewise.
2000-04-11 Ulrich Drepper <drepper@redhat.com>
* elf/readlib (process_file): Close streams in case of an error.
2000-04-09 Andreas Jaeger <aj@suse.de>
* elf/readlib.c (process_file): Check if file is big enough to
contain aout and ELF headers.
Reported by Reinhard Moosauer <RMoosauer@steinecker.com>.
2000-04-10 Jes Sorensen <Jes.Sorensen@cern.ch>
* elf/dl-fini.c: Include alloca.h to get proper prototype for alloca().
2000-04-11 Ulrich Drepper <drepper@redhat.com>
* test-skeleton.c (main): If STDOUT_UNBUFFERED is defined, make stdout
stream unbuffered.
* rt/Makefile (tests): Add tst-clock.
Add rules to build tst-clock.
* rt/tst-clock.c: New file.
* sysdeps/unix/i386/i586/clock_getres.c: Correct expression to decide
about initialization of nsec.
* sysdeps/unix/i386/i586/clock_gettime.c: Correct expression to decide
about initialization of freq. Set retval to zero if successful.
* sysdeps/unix/sysv/linux/i386/get_clockfreq.c: Cache result.
Diffstat (limited to 'elf/readlib.c')
| -rw-r--r-- | elf/readlib.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/elf/readlib.c b/elf/readlib.c index abd380b9b7..580d802301 100644 --- a/elf/readlib.c +++ b/elf/readlib.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999 Free Software Foundation, Inc. +/* Copyright (C) 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Andreas Jaeger <aj@suse.de>, 1999 and Jakub Jelinek <jakub@redhat.com>, 1999. @@ -92,10 +92,22 @@ process_file (const char *file_name, const char *lib, int *flag, char **soname, if (fstat (fileno (file), &statbuf) < 0) { error (0, 0, _("Cannot fstat file %s.\n"), file_name); + fclose (file); + return 1; + } + + /* Check that the file is large enough so that we can access the + information. We're only checking the size of the headers here. */ + if (statbuf.st_size < sizeof (struct exec) + || statbuf.st_size < sizeof (ElfW(Ehdr))) + { + error (0, 0, _("File %s is too small, not checked."), file_name); + fclose (file); return 1; } - file_contents = mmap (0, statbuf.st_size, PROT_READ, MAP_SHARED, fileno (file), 0); + file_contents = mmap (0, statbuf.st_size, PROT_READ, MAP_SHARED, + fileno (file), 0); if (file_contents == MAP_FAILED) { error (0, 0, _("Cannot mmap file %s.\n"), file_name); @@ -108,7 +120,7 @@ process_file (const char *file_name, const char *lib, int *flag, char **soname, if (N_MAGIC (*aout_header) == ZMAGIC || N_MAGIC (*aout_header) == QMAGIC) { - /* Aout files don't have a soname, just return the the name + /* Aout files don't have a soname, just return the name including the major number. */ char *copy, *major, *dot; copy = xstrdup (lib); |