From: "Richard W.M. Jones" <rjones@redhat.com>
To: Al Viro <viro@ZenIV.linux.org.uk>,
linux-fsdevel@vger.kernel.org, Jim Meyering <jim@meyering.net>,
Linus Torvalds <torvalds@linux-foundation.org>
Subject: [PATCH regression] dup3: Return an error when oldfd == newfd.
Date: Tue, 9 Oct 2012 15:27:43 +0100 [thread overview]
Message-ID: <20121009142743.GA20047@rhmail.home.annexia.org> (raw)
In-Reply-To: <20121009092549.GA19680@rhmail.home.annexia.org>
I have tested the attached patch to fix the dup3 regression.
Rich.
>From 0944e30e12dec6544b3602626b60ff412375c78f Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 9 Oct 2012 14:42:45 +0100
Subject: [PATCH] dup3: Return an error when oldfd == newfd.
The following commit:
commit fe17f22d7fd0e344ef6447238f799bb49f670c6f
Author: Al Viro <viro@zeniv.linux.org.uk>
Date: Tue Aug 21 11:48:11 2012 -0400
take purely descriptor-related stuff from fcntl.c to file.c
was supposed to be just code motion, but it dropped the following two
lines:
if (unlikely(oldfd == newfd))
return -EINVAL;
from the dup3 system call. dup3 is not specified by POSIX, so Linux
can do what it likes. However the POSIX proposal for dup3 [1] states
that it should return an error if oldfd == newfd.
[1] http://austingroupbugs.net/view.php?id=411
Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
Tested-by: Richard W.M. Jones <rjones@redhat.com>
---
fs/file.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/fs/file.c b/fs/file.c
index 0f1bda4..d3b5fa8 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -922,6 +922,9 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags)
if ((flags & ~O_CLOEXEC) != 0)
return -EINVAL;
+ if (unlikely(oldfd == newfd))
+ return -EINVAL;
+
if (newfd >= rlimit(RLIMIT_NOFILE))
return -EMFILE;
--
1.7.10.4
next prev parent reply other threads:[~2012-10-09 14:27 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-09 9:15 Another bug, in dup3 Richard W.M. Jones
2012-10-09 9:25 ` Richard W.M. Jones
2012-10-09 14:27 ` Richard W.M. Jones [this message]
2012-10-09 14:52 ` [PATCH regression] dup3: Return an error when oldfd == newfd Al Viro
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121009142743.GA20047@rhmail.home.annexia.org \
--to=rjones@redhat.com \
--cc=jim@meyering.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=viro@ZenIV.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).