niansa-misc/glibc
1
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-03-06 20:58:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use O_CLOEXEC in more places (BZ #15722)

Browse source 
When opening a temporary file without O_CLOEXEC we risk leaking the
file descriptor if another thread calls (fork and then) exec while we
have the fd open. Fix this by consistently passing O_CLOEXEC everywhere
where we open a file for internal use (and not to return it to the user,
in which case the API defines whether or not the close-on-exec flag
shall be set on the returned fd).

Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Signed-off-by: Sergey Bugaev <bugaevc@gmail.com>
Message-Id: <20230419160207.65988-4-bugaevc@gmail.com>
This commit is contained in:
Sergey Bugaev 2023-04-19 19:02:03 +03:00 • committed by Samuel Thibault
parent 28a441cc57
commit 533deafbdf
6 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
catgets/open_catalog.c
View file

@ -49,7 +49,7 @@ __open_catalog (const char *cat_name, const char *nlspath, const char *env_var,
char *buf = NULL; char *buf = NULL;
if (strchr (cat_name, '/') != NULL || nlspath == NULL) if (strchr (cat_name, '/') != NULL || nlspath == NULL)
fd = __open_nocancel (cat_name, O_RDONLY); fd = __open_nocancel (cat_name, O_RDONLY | O_CLOEXEC);
else else
{ {
const char *run_nlspath = nlspath; const char *run_nlspath = nlspath;
@ -177,7 +177,7 @@ __open_catalog (const char *cat_name, const char *nlspath, const char *env_var,
if (bufact != 0) if (bufact != 0)
{ {
fd = __open_nocancel (buf, O_RDONLY); fd = __open_nocancel (buf, O_RDONLY | O_CLOEXEC);
if (fd >= 0) if (fd >= 0)
break; break;
} }

3
elf/dl-profile.c
View file

@ -324,7 +324,8 @@ _dl_start_profile (void)
*cp++ = '/'; *cp++ = '/';
__stpcpy (__stpcpy (cp, GLRO(dl_profile)), ".profile"); __stpcpy (__stpcpy (cp, GLRO(dl_profile)), ".profile");
fd = __open64_nocancel (filename, O_RDWR|O_CREAT|O_NOFOLLOW, DEFFILEMODE); fd = __open64_nocancel (filename, O_RDWR | O_CREAT | O_NOFOLLOW
| O_CLOEXEC, DEFFILEMODE);
if (fd == -1) if (fd == -1)
{ {
char buf[400]; char buf[400];

7
gmon/gmon.c
View file

@ -384,13 +384,14 @@ write_gmon (void)
size_t len = strlen (env); size_t len = strlen (env);
char buf[len + 20]; char buf[len + 20];
__snprintf (buf, sizeof (buf), "%s.%u", env, __getpid ()); __snprintf (buf, sizeof (buf), "%s.%u", env, __getpid ());
fd = __open_nocancel (buf, O_CREAT|O_TRUNC|O_WRONLY|O_NOFOLLOW, 0666); fd = __open_nocancel (buf, O_CREAT | O_TRUNC | O_WRONLY | O_NOFOLLOW
| O_CLOEXEC, 0666);
} }
if (fd == -1) if (fd == -1)
{ {
fd = __open_nocancel ("gmon.out", O_CREAT|O_TRUNC|O_WRONLY|O_NOFOLLOW, fd = __open_nocancel ("gmon.out", O_CREAT | O_TRUNC | O_WRONLY
0666); | O_NOFOLLOW | O_CLOEXEC, 0666);
if (fd < 0) if (fd < 0)
{ {
char buf[300]; char buf[300];

2
iconv/gconv_cache.c
View file

@ -58,7 +58,7 @@ __gconv_load_cache (void)
return -1; return -1;
/* See whether the cache file exists. */ /* See whether the cache file exists. */
fd = __open_nocancel (GCONV_MODULES_CACHE, O_RDONLY, 0); fd = __open_nocancel (GCONV_MODULES_CACHE, O_RDONLY | O_CLOEXEC, 0);
if (__builtin_expect (fd, 0) == -1) if (__builtin_expect (fd, 0) == -1)
/* Not available. */ /* Not available. */
return -1; return -1;

2
login/utmp_file.c
View file

@ -463,7 +463,7 @@ __libc_updwtmp (const char *file, const struct utmp *utmp)
int fd; int fd;
/* Open WTMP file. */ /* Open WTMP file. */
fd = __open_nocancel (file, O_WRONLY | O_LARGEFILE); fd = __open_nocancel (file, O_WRONLY | O_LARGEFILE | O_CLOEXEC);
if (fd < 0) if (fd < 0)
return -1; return -1;

9
sysdeps/pthread/sem_open.c
View file

@ -36,6 +36,7 @@ sem_t *
__sem_open (const char *name, int oflag, ...) __sem_open (const char *name, int oflag, ...)
{ {
int fd; int fd;
int open_flags;
sem_t *result; sem_t *result;
/* Check that shared futexes are supported. */ /* Check that shared futexes are supported. */
@ -64,9 +65,10 @@ __sem_open (const char *name, int oflag, ...)
/* If the semaphore object has to exist simply open it. */ /* If the semaphore object has to exist simply open it. */
if ((oflag & O_CREAT) == 0 || (oflag & O_EXCL) == 0) if ((oflag & O_CREAT) == 0 || (oflag & O_EXCL) == 0)
{ {
open_flags = O_RDWR | O_NOFOLLOW | O_CLOEXEC;
open_flags |= (oflag & ~(O_CREAT|O_ACCMODE));
try_again: try_again:
fd = __open (dirname.name, fd = __open (dirname.name, open_flags);
(oflag & ~(O_CREAT|O_ACCMODE)) | O_NOFOLLOW | O_RDWR);
if (fd == -1) if (fd == -1)
{ {
@ -133,7 +135,8 @@ __sem_open (const char *name, int oflag, ...)
} }
/* Open the file. Make sure we do not overwrite anything. */ /* Open the file. Make sure we do not overwrite anything. */
fd = __open (tmpfname, O_RDWR | O_CREAT | O_EXCL, mode); open_flags = O_RDWR | O_CREAT | O_EXCL | O_CLOEXEC;
fd = __open (tmpfname, open_flags, mode);
if (fd == -1) if (fd == -1)
{ {
if (errno == EEXIST) if (errno == EEXIST)