Use O_CLOEXEC when loading ld.so cache

This commit is contained in:
Ulrich Drepper 2011-09-05 17:18:38 -04:00
parent b0fc1ff04e
commit 554881ef20
3 changed files with 14 additions and 5 deletions

View File

@ -1,3 +1,8 @@
2011-09-05 Ulrich Drepper <drepper@gmail.com>
[BZ #13068]
* elf/dl-misc.c (_dl_sysdep_read_whole_file): Use O_CLOEXEC.
2011-07-20 Liubov Dmitrieva <liubov.dmitrieva@intel.com> 2011-07-20 Liubov Dmitrieva <liubov.dmitrieva@intel.com>
* sysdeps/i386/i686/multiarch/Makefile (sysdep_routines): Add * sysdeps/i386/i686/multiarch/Makefile (sysdep_routines): Add

4
NEWS
View File

@ -9,8 +9,8 @@ Version 2.15
* The following bugs are resolved with this release: * The following bugs are resolved with this release:
9696, 12868, 12852, 12874, 12885, 12907, 12922, 12935, 13007, 13021, 13114, 9696, 12868, 12852, 12874, 12885, 12907, 12922, 12935, 13007, 13021,
13144 13068, 13114, 13144
* New program pldd to list loaded object of a process * New program pldd to list loaded object of a process
Implemented by Ulrich Drepper. Implemented by Ulrich Drepper.

View File

@ -1,5 +1,5 @@
/* Miscellaneous support functions for dynamic linker /* Miscellaneous support functions for dynamic linker
Copyright (C) 1997-2004, 2006, 2009 Free Software Foundation, Inc. Copyright (C) 1997-2004, 2006, 2009, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -44,7 +44,11 @@ _dl_sysdep_read_whole_file (const char *file, size_t *sizep, int prot)
{ {
void *result = MAP_FAILED; void *result = MAP_FAILED;
struct stat64 st; struct stat64 st;
int fd = __open (file, O_RDONLY); int flags = O_RDONLY;
#ifdef O_CLOEXEC
flags |= O_CLOEXEC;
#endif
int fd = __open (file, flags);
if (fd >= 0) if (fd >= 0)
{ {
if (__fxstat64 (_STAT_VER, fd, &st) >= 0) if (__fxstat64 (_STAT_VER, fd, &st) >= 0)