diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-08-15 08:06:15 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-08-15 08:06:15 +0000 |
| commit | fc7f617d300f075fe28567391b10b4c5d64be46f (patch) | |
| tree | b0a8765937d52ccdb09a796e4e0c322dae9b804b /elf/dl-load.c | |
| parent | 07a3d63e524f13dd09e14adb0ac2623f6600401d (diff) | |
| download | glibc-fc7f617d300f075fe28567391b10b4c5d64be46f.zip glibc-fc7f617d300f075fe28567391b10b4c5d64be46f.tar.gz glibc-fc7f617d300f075fe28567391b10b4c5d64be46f.tar.bz2 | |
Update.
* include/link.h: Include sysd-link.h.
* sysdeps/generic/sysd-link.h: New file.
* sysdeps/unix/sysv/linux/sysd-link.h: New file.
* elf/Makefile (distribute): Add sysd-link.h.
* elf/dl-load.c: Use definitions from sysd-link.h instead of stat
types and functions directly.
* elf/dl-misc.c: Likewise.
* elf/dl-profile.c: Likewise.
* elf/loadfail.c (main): Close all successfully loaded objects.
Diffstat (limited to 'elf/dl-load.c')
| -rw-r--r-- | elf/dl-load.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/elf/dl-load.c b/elf/dl-load.c index ebe4c80..e0c9a61 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -730,10 +730,10 @@ _dl_map_object_from_fd (const char *name, int fd, char *realname, int type; char *readbuf; ssize_t readlength; - struct stat st; + struct elf_stat st; /* Get file information. */ - if (__fxstat (_STAT_VER, fd, &st) < 0) + if (elf_fxstat (_STAT_VER, fd, &st) < 0) LOSE (errno, N_("cannot stat shared object")); /* Look again to see if the real name matched another already loaded. */ @@ -1260,11 +1260,11 @@ open_path (const char *name, size_t namelen, int preloaded, { /* We failed to open machine dependent library. Let's test whether there is any directory at all. */ - struct stat st; + struct elf_stat st; buf[buflen - namelen - 1] = '\0'; - if (__xstat (_STAT_VER, buf, &st) != 0 + if (elf_xstat (_STAT_VER, buf, &st) != 0 || ! S_ISDIR (st.st_mode)) /* The directory does not exist or it is no directory. */ this_dir->status[cnt] = nonexisting; @@ -1281,9 +1281,9 @@ open_path (const char *name, size_t namelen, int preloaded, /* This is an extra security effort to make sure nobody can preload broken shared objects which are in the trusted directories and so exploit the bugs. */ - struct stat st; + struct elf_stat st; - if (__fxstat (_STAT_VER, fd, &st) != 0 + if (elf_fxstat (_STAT_VER, fd, &st) != 0 || (st.st_mode & S_ISUID) == 0) { /* The shared object cannot be tested for being SUID |