aboutsummaryrefslogtreecommitdiff
path: root/io/open.c
diff options
context:
space:
mode:
authorEric Rannaud <e@nanocritical.com>2015-02-24 13:12:26 +0530
committerSiddhesh Poyarekar <siddhesh@redhat.com>2015-02-24 13:19:22 +0530
commit65f6f938cd562a614a68e15d0581a34b177ec29d (patch)
treec33b9da9e6b00195e90e87b811a3d7def6529425 /io/open.c
parent3e3002ffead0526d088c353f97475400367087da (diff)
downloadglibc-65f6f938cd562a614a68e15d0581a34b177ec29d.zip
glibc-65f6f938cd562a614a68e15d0581a34b177ec29d.tar.gz
glibc-65f6f938cd562a614a68e15d0581a34b177ec29d.tar.bz2
linux: open and openat ignore 'mode' with O_TMPFILE in flags
Both open and openat load their last argument 'mode' lazily, using va_arg() only if O_CREAT is found in oflag. This is wrong, mode is also necessary if O_TMPFILE is in oflag. By chance on x86_64, the problem wasn't evident when using O_TMPFILE with open, as the 3rd argument of open, even when not loaded with va_arg, is left untouched in RDX, where the syscall expects it. However, openat was not so lucky, and O_TMPFILE couldn't be used: mode is the 4th argument, in RCX, but the syscall expects its 4th argument in a different register than the glibc wrapper, in R10. Introduce a macro __OPEN_NEEDS_MODE (oflag) to test if either O_CREAT or O_TMPFILE is set in oflag. Tested on Linux x86_64. [BZ #17523] * io/fcntl.h (__OPEN_NEEDS_MODE): New macro. * io/bits/fcntl2.h (open): Use it. (openat): Likewise. * io/open.c (__libc_open): Likewise. * io/open64.c (__libc_open64): Likewise. * io/open64_2.c (__open64_2): Likewise. * io/open_2.c (__open_2): Likewise. * io/openat.c (__openat): Likewise. * io/openat64.c (__openat64): Likewise. * io/openat64_2.c (__openat64_2): Likewise. * io/openat_2.c (__openat_2): Likewise. * sysdeps/mach/hurd/open.c (__libc_open): Likewise. * sysdeps/mach/hurd/openat.c (__openat): Likewise. * sysdeps/posix/open64.c (__libc_open64): Likewise. * sysdeps/unix/sysv/linux/dl-openat64.c (openat64): Likewise. * sysdeps/unix/sysv/linux/generic/open.c (__libc_open): Likewise. (__open_nocancel): Likewise. * sysdeps/unix/sysv/linux/generic/open64.c (__libc_open64): Likewise. * sysdeps/unix/sysv/linux/open64.c (__libc_open64): Likewise. * sysdeps/unix/sysv/linux/openat.c (__OPENAT): Likewise.
Diffstat (limited to 'io/open.c')
-rw-r--r--io/open.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/io/open.c b/io/open.c
index cf1245b..c0000ba 100644
--- a/io/open.c
+++ b/io/open.c
@@ -23,7 +23,7 @@
#include <stdio.h>
-/* Open FILE with access OFLAG. If OFLAG includes O_CREAT,
+/* Open FILE with access OFLAG. If O_CREAT or O_TMPFILE is in OFLAG,
a third argument is the file protection. */
int
__libc_open (file, oflag)
@@ -38,7 +38,7 @@ __libc_open (file, oflag)
return -1;
}
- if (oflag & O_CREAT)
+ if (__OPEN_NEEDS_MODE (oflag))
{
va_list arg;
va_start(arg, oflag);