mirrors/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-27 03:33:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Assume that O_NOFOLLOW is always defined

Browse Source
This commit is contained in:
Florian Weimer 2017-04-13 21:28:18 +02:00
parent 44500cbb25
commit a12ae89f86
6 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2017-04-13 Florian Weimer <fweimer@redhat.com>
* csu/check_fds.c (__libc_check_standard_fds): Assume O_NOFOLLOW
is defined.
* elf/rtld.c (process_envvars): Likewise.
* sysdeps/posix/shm_open.c (shm_open): Likewise.
* elf/dl-profile.c (EXTRA_FLAGS): Remove definition. Use
O_NOFOLLOW directly.
* gmon/gmon.c (O_NOFOLLOW): Remove definition.
2017-04-13 Florian Weimer <fweimer@redhat.com>
[BZ #21369]

12
csu/check_fds.c
View File

@ -87,14 +87,10 @@ check_one_fd (int fd, int mode)
void
__libc_check_standard_fds (void)
{
/* This is really paranoid but some people actually are. If /dev/null
should happen to be a symlink to somewhere else and not the device
commonly known as "/dev/null" we bail out. We can detect this with
the O_NOFOLLOW flag for open() but only on some system. */
#ifndef O_NOFOLLOW
# define O_NOFOLLOW 0
#endif
/* Check all three standard file descriptors. */
/* Check all three standard file descriptors. The O_NOFOLLOW flag
is really paranoid but some people actually are. If /dev/null
should happen to be a symlink to somewhere else and not the
device commonly known as "/dev/null" we bail out. */
check_one_fd (STDIN_FILENO, O_WRONLY | O_NOFOLLOW);
check_one_fd (STDOUT_FILENO, O_RDONLY | O_NOFOLLOW);
check_one_fd (STDERR_FILENO, O_RDONLY | O_NOFOLLOW);

7
elf/dl-profile.c
View File

@ -325,12 +325,7 @@ _dl_start_profile (void)
*cp++ = '/';
__stpcpy (__stpcpy (cp, GLRO(dl_profile)), ".profile");
#ifdef O_NOFOLLOW
# define EXTRA_FLAGS | O_NOFOLLOW
#else
# define EXTRA_FLAGS
#endif
fd = __open (filename, O_RDWR | O_CREAT EXTRA_FLAGS, DEFFILEMODE);
fd = __open (filename, O_RDWR | O_CREAT | O_NOFOLLOW, DEFFILEMODE);
if (fd == -1)
{
char buf[400];

4
elf/rtld.c
View File

@ -2525,11 +2525,7 @@ process_envvars (enum mode *modep)
messages to this file. */
else if (any_debug && debug_output != NULL)
{
#ifdef O_NOFOLLOW
const int flags = O_WRONLY | O_APPEND | O_CREAT | O_NOFOLLOW;
#else
const int flags = O_WRONLY | O_APPEND | O_CREAT;
#endif
size_t name_len = strlen (debug_output);
char buf[name_len + 12];
char *startp;

4
gmon/gmon.c
View File

@ -336,10 +336,6 @@ write_gmon (void)
int fd = -1;
char *env;
#ifndef O_NOFOLLOW
# define O_NOFOLLOW 0
#endif
env = getenv ("GMON_OUT_PREFIX");
if (env != NULL && !__libc_enable_secure)
{

2
sysdeps/posix/shm_open.c
View File

@ -34,9 +34,7 @@ shm_open (const char *name, int oflag, mode_t mode)
{
SHM_GET_NAME (EINVAL, -1, "");
# ifdef O_NOFOLLOW
oflag |= O_NOFOLLOW;
# endif
# ifdef O_CLOEXEC
oflag |= O_CLOEXEC;
# endif