diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2016-01-02 00:24:17 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2016-01-02 00:24:17 +0000 |
| commit | d94de2451bd5c0a9b1852a7b322e5e772f3c8f7d (patch) | |
| tree | efc03ecffaf4adc6f1fc378e2ac98ec749d86783 /sys | |
| parent | 2e770197060f3f917ddd021a103bc29de9e93beb (diff) | |
mmcc noticed that nd.ni_pledge was uninitialized in doopenat() for the
oflags & 3 == 3 case. Therefore this depends on vn_open() blocking the
operation later. Probably this meant the ni_pledge request would be too
high, causing transient operation failure, rather than transient operation
passage). Instead of initializing based on the oflags value use the
result of FFLAGS(). I should have done this from the start.
ok semarie
[oflags & 3 == 3 is major dejavu for me]
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/vfs_syscalls.c | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 3e356990aa9..9702186c573 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_syscalls.c,v 1.249 2015/12/16 15:52:51 semarie Exp $ */ +/* $OpenBSD: vfs_syscalls.c,v 1.250 2016/01/02 00:24:16 deraadt Exp $ */ /* $NetBSD: vfs_syscalls.c,v 1.71 1996/04/23 10:29:02 mycroft Exp $ */ /* @@ -840,21 +840,7 @@ doopenat(struct proc *p, int fd, const char *path, int oflags, mode_t mode, int type, indx, error, localtrunc = 0; struct flock lf; struct nameidata nd; - int ni_pledge; - - switch (oflags & O_ACCMODE) { - case O_RDONLY: - ni_pledge = PLEDGE_RPATH; - break; - case O_WRONLY: - ni_pledge = PLEDGE_WPATH; - break; - case O_RDWR: - ni_pledge = PLEDGE_RPATH | PLEDGE_WPATH; - break; - } - if (oflags & O_CREAT) - ni_pledge |= PLEDGE_CPATH; + int ni_pledge = 0; if (oflags & (O_EXLOCK | O_SHLOCK)) { error = pledge_flock(p); @@ -867,6 +853,13 @@ doopenat(struct proc *p, int fd, const char *path, int oflags, mode_t mode, if ((error = falloc(p, &fp, &indx)) != 0) goto out; flags = FFLAGS(oflags); + if (flags & FREAD) + ni_pledge |= PLEDGE_RPATH; + if (flags & FWRITE) + ni_pledge |= PLEDGE_WPATH; + if (oflags & O_CREAT) + ni_pledge |= PLEDGE_CPATH; + if (flags & O_CLOEXEC) fdp->fd_ofileflags[indx] |= UF_EXCLOSE; |