lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

* nss/nss_files/files-XXX.c (internal_setent): Use O_CLOEXEC if

Browse Source 
possible.
	* nss/nss_files/files-alias.c (internal_setent): Likewise.
	* nss/Makefile (libnss_files-routines): Add files-have_o_cloexec.
	* nss/nss_files/files-have_o_cloexec.c: New file.
This commit is contained in:
Ulrich Drepper
2007-08-10 23:41:40 +00:00
parent 916ee8bcba
commit aa132749c8
5 changed files with 101 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -7,6 +7,12 @@
2007-08-10 Ulrich Drepper <drepper@redhat.com> 2007-08-10 Ulrich Drepper <drepper@redhat.com>
* nss/nss_files/files-XXX.c (internal_setent): Use O_CLOEXEC if
possible.
* nss/nss_files/files-alias.c (internal_setent): Likewise.
* nss/Makefile (libnss_files-routines): Add files-have_o_cloexec.
* nss/nss_files/files-have_o_cloexec.c: New file.
* sysdeps/unix/sysv/linux/shm_open.c (shm_open): Use O_CLOEXEC if * sysdeps/unix/sysv/linux/shm_open.c (shm_open): Use O_CLOEXEC if
available. available.

5
nss/Makefile
View File

@ -1,4 +1,4 @@
# Copyright (C) 1996,1997,1998,2000,2001,2002 Free Software Foundation, Inc. # Copyright (C) 1996-1998,2000,2001,2002,2007 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
@ -62,7 +62,8 @@ subdir-dirs = $(services:%=nss_%)
vpath %.c $(subdir-dirs) vpath %.c $(subdir-dirs)
libnss_files-routines := $(addprefix files-,$(databases)) libnss_files-routines := $(addprefix files-,$(databases)) \
files-have_o_cloexec
distribute += files-XXX.c files-parse.c distribute += files-XXX.c files-parse.c

51
nss/nss_files/files-XXX.c
View File

@ -1,5 +1,5 @@
/* Common code for file-based databases in nss_files module. /* Common code for file-based databases in nss_files module.
Copyright (C) 1996-1999,2001,2002,2004 Free Software Foundation, Inc. Copyright (C) 1996-1999,2001,2002,2004,2007 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
@ -24,6 +24,8 @@
#include <bits/libc-lock.h> #include <bits/libc-lock.h>
#include "nsswitch.h" #include "nsswitch.h"
#include <kernel-features.h>
/* These symbols are defined by the including source file: /* These symbols are defined by the including source file:
ENTNAME -- database name of the structure and functions (hostent, pwent). ENTNAME -- database name of the structure and functions (hostent, pwent).
@ -74,29 +76,44 @@ internal_setent (int stayopen)
if (stream == NULL) if (stream == NULL)
{ {
stream = fopen (DATAFILE, "r"); stream = fopen (DATAFILE, "re");
if (stream == NULL) if (stream == NULL)
status = errno == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL; status = errno == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL;
else else
{ {
/* We have to make sure the file is `closed on exec'. */ #if !defined O_CLOEXEC || !defined __ASSUME_O_CLOEXEC
int result, flags; # ifdef O_CLOEXEC
if (__have_o_cloexec <= 0)
# endif
{
/* We have to make sure the file is `closed on exec'. */
int result;
int flags;
result = flags = fcntl (fileno (stream), F_GETFD, 0); result = flags = fcntl (fileno (stream), F_GETFD, 0);
if (result >= 0) if (result >= 0)
{ {
flags |= FD_CLOEXEC; # ifdef O_CLOEXEC
result = fcntl (fileno (stream), F_SETFD, flags); if (__have_o_cloexec == 0)
} __have_o_cloexec = (flags & FD_CLOEXEC) == 0 ? -1 : 1;
if (result < 0) if (__have_o_cloexec < 0)
{ # endif
/* Something went wrong. Close the stream and return a {
failure. */ flags |= FD_CLOEXEC;
fclose (stream); result = fcntl (fileno (stream), F_SETFD, flags);
stream = NULL; }
status = NSS_STATUS_UNAVAIL; }
if (result < 0)
{
/* Something went wrong. Close the stream and return a
failure. */
fclose (stream);
stream = NULL;
status = NSS_STATUS_UNAVAIL;
}
} }
#endif
} }
} }
else else

51
nss/nss_files/files-alias.c
View File

@ -1,5 +1,5 @@
/* Mail alias file parser in nss_files module. /* Mail alias file parser in nss_files module.
Copyright (C) 1996,97,98,99,2002,2006 Free Software Foundation, Inc. Copyright (C) 1996,97,98,99,2002,2006,2007 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@ -27,6 +27,8 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <kernel-features.h>
#include "nsswitch.h" #include "nsswitch.h"
/* Locks the static variables in this file. */ /* Locks the static variables in this file. */
@ -46,29 +48,44 @@ internal_setent (void)
if (stream == NULL) if (stream == NULL)
{ {
stream = fopen ("/etc/aliases", "r"); stream = fopen ("/etc/aliases", "re");
if (stream == NULL) if (stream == NULL)
status = errno == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL; status = errno == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL;
else else
{ {
/* We have to make sure the file is `closed on exec'. */ #if !defined O_CLOEXEC || !defined __ASSUME_O_CLOEXEC
int result, flags; # ifdef O_CLOEXEC
if (__have_o_cloexec <= 0)
# endif
{
/* We have to make sure the file is `closed on exec'. */
int result;
int flags;
result = flags = fcntl (fileno (stream), F_GETFD, 0); result = flags = fcntl (fileno (stream), F_GETFD, 0);
if (result >= 0) if (result >= 0)
{ {
flags |= FD_CLOEXEC; # ifdef O_CLOEXEC
result = fcntl (fileno (stream), F_SETFD, flags); if (__have_o_cloexec == 0)
} __have_o_cloexec = (flags & FD_CLOEXEC) == 0 ? -1 : 1;
if (result < 0) if (__have_o_cloexec < 0)
{ # endif
/* Something went wrong. Close the stream and return a {
failure. */ flags |= FD_CLOEXEC;
fclose (stream); result = fcntl (fileno (stream), F_SETFD, flags);
stream = NULL; }
status = NSS_STATUS_UNAVAIL; }
if (result < 0)
{
/* Something went wrong. Close the stream and return a
failure. */
fclose (stream);
stream = NULL;
status = NSS_STATUS_UNAVAIL;
}
} }
#endif
} }
} }
else else

24
nss/nss_files/files-have_o_cloexec.c Normal file
View File

@ -0,0 +1,24 @@
/* Copyright (C) 2007 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
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include <fcntl.h>
#include <kernel-features.h>
#if defined O_CLOEXEC && !defined __ASSUME_O_CLOEXEC
int __have_o_cloexec;
#endif