summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2014-10-30 20:08:40 -0400
committerRich Felker <dalias@aerifal.cx>2015-03-30 01:41:32 -0400
commit4ab6544a418ad56d42c2eb05940918a948075a3f (patch)
tree1779e2ea3ea38157de02b644130f803140a490a2 /src
parente3fa4300bf17d2b051bf21f451656af841404c2b (diff)
downloadmusl-4ab6544a418ad56d42c2eb05940918a948075a3f.tar.gz
fix invalid access by openat to possibly-missing variadic mode argument
the mode argument is only required to be present when the O_CREAT or O_TMPFILE flag is used. (cherry picked from commit 2da3ab1382ca8e39eb1e4428103764a81fba73d3)
Diffstat (limited to 'src')
-rw-r--r--src/fcntl/openat.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/fcntl/openat.c b/src/fcntl/openat.c
index 634c4bf3..4faeb296 100644
--- a/src/fcntl/openat.c
+++ b/src/fcntl/openat.c
@@ -6,10 +6,14 @@
int openat(int fd, const char *filename, int flags, ...)
{
mode_t mode;
- va_list ap;
- va_start(ap, flags);
- mode = va_arg(ap, mode_t);
- va_end(ap);
+
+ if ((flags & O_CREAT) || (flags & O_TMPFILE) == O_TMPFILE) {
+ va_list ap;
+ va_start(ap, flags);
+ mode = va_arg(ap, mode_t);
+ va_end(ap);
+ }
+
return syscall_cp(SYS_openat, fd, filename, flags|O_LARGEFILE, mode);
}