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

* login/utmp_file.c (setutent_file): Use O_CLOEXEC if possible.

This commit is contained in:
Ulrich Drepper 2007-07-22 19:02:23 +00:00
parent cc7837639d
commit c942388dad
2 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
2007-07-22 Ulrich Drepper <drepper@redhat.com> 2007-07-22 Ulrich Drepper <drepper@redhat.com>
* login/utmp_file.c (setutent_file): Use O_CLOEXEC if possible.
* libio/fileops.c (_IO_new_file_fopen): Recognize 'e' flag and set * libio/fileops.c (_IO_new_file_fopen): Recognize 'e' flag and set
O_CLOEXEC is needed. O_CLOEXEC is needed.
* nis/nss_compat/compat-grp.c: Use 'e' flag when opening file. * nis/nss_compat/compat-grp.c: Use 'e' flag when opening file.

30
login/utmp_file.c
View File

@ -27,6 +27,7 @@
#include <unistd.h> #include <unistd.h>
#include <utmp.h> #include <utmp.h>
#include <not-cancel.h> #include <not-cancel.h>
#include <kernel-features.h>
#include "utmp-private.h" #include "utmp-private.h"
#include "utmp-equal.h" #include "utmp-equal.h"
@ -140,25 +141,48 @@ setutent_file (void)
file_name = TRANSFORM_UTMP_FILE_NAME (__libc_utmp_file_name); file_name = TRANSFORM_UTMP_FILE_NAME (__libc_utmp_file_name);
file_fd = open_not_cancel_2 (file_name, O_RDWR | O_LARGEFILE); #ifdef O_CLOEXEC
# define O_flags O_LARGEFILE | O_CLOEXEC
#else
# define O_flags O_LARGEFILE
#endif
file_fd = open_not_cancel_2 (file_name, O_RDWR | O_flags);
if (file_fd == -1) if (file_fd == -1)
{ {
/* Hhm, read-write access did not work. Try read-only. */ /* Hhm, read-write access did not work. Try read-only. */
file_fd = open_not_cancel_2 (file_name, O_RDONLY | O_LARGEFILE); file_fd = open_not_cancel_2 (file_name, O_RDONLY | O_flags);
if (file_fd == -1) if (file_fd == -1)
return 0; return 0;
} }
#ifndef __ASSUME_O_CLOEXEC
# ifdef O_CLOEXEC
static int have_o_cloexec;
if (have_o_cloexec <= 0)
# endif
{
/* We have to make sure the file is `closed on exec'. */ /* We have to make sure the file is `closed on exec'. */
result = fcntl_not_cancel (file_fd, F_GETFD, 0); result = fcntl_not_cancel (file_fd, F_GETFD, 0);
if (result >= 0) if (result >= 0)
result = fcntl_not_cancel (file_fd, F_SETFD, result | FD_CLOEXEC); {
# ifdef O_CLOEXEC
if (have_o_cloexec == 0)
have_o_cloexec = (result & FD_CLOEXEC) ? 1 : -1;
# endif
result = fcntl_not_cancel (file_fd, F_SETFD,
result | FD_CLOEXEC);
}
if (result == -1) if (result == -1)
{ {
close_not_cancel_no_status (file_fd); close_not_cancel_no_status (file_fd);
return 0; return 0;
} }
} }
#endif
}
__lseek64 (file_fd, 0, SEEK_SET); __lseek64 (file_fd, 0, SEEK_SET);
file_offset = 0; file_offset = 0;