summaryrefslogtreecommitdiff
path: root/fs/fcntl.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2008-07-25 22:32:13 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2008-07-26 20:53:39 -0400
commit3c333937ee3be114b181c4861188cfe8f6a59697 (patch)
treefda3bb122bb4c9c180ef41e5d142ac315dc7a576 /fs/fcntl.c
parent58ec42b061bf5dad8fa0370a19966cfd96eaf80c (diff)
downloadlinux-3.10-3c333937ee3be114b181c4861188cfe8f6a59697.tar.gz
linux-3.10-3c333937ee3be114b181c4861188cfe8f6a59697.tar.bz2
linux-3.10-3c333937ee3be114b181c4861188cfe8f6a59697.zip
[PATCH] dup3 fix
Al Viro notice one cornercase that the new dup3() code. The dup2() function, as a special case, handles dup-ing to the same file descriptor. In this case the current dup3() code does nothing at all. I.e., it ingnores the flags parameter. This shouldn't happen, the close-on-exec flag should be set if requested. In case the O_CLOEXEC bit in the flags parameter is not set the dup3() function should behave in this respect identical to dup2(). This means dup3(fd, fd, 0) should not actively reset the c-o-e flag. The patch below implements this minor change. [AV: credits to Artur Grabowski for bringing that up as potential subtle point in dup2() behaviour] Signed-off-by: Ulrich Drepper <drepper@redhat.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/fcntl.c')
-rw-r--r--fs/fcntl.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/fcntl.c b/fs/fcntl.c
index 9679fcbdeaa..ce12a688511 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -139,8 +139,13 @@ asmlinkage long sys_dup3(unsigned int oldfd, unsigned int newfd, int flags)
if (!(file = fcheck(oldfd)))
goto out_unlock;
err = newfd;
- if (newfd == oldfd)
+ if (unlikely(newfd == oldfd)) {
+ if (flags & O_CLOEXEC) {
+ fdt = files_fdtable(files);
+ FD_SET(newfd, fdt->close_on_exec);
+ }
goto out_unlock;
+ }
err = -EBADF;
if (newfd >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
goto out_unlock;