From: Theodore Ts'o <tytso@mit.edu>
To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
viro@ZenIV.linux.org.uk
Cc: Theodore Ts'o <tytso@mit.edu>
Subject: [PATCH] vfs: make unlink() return ENOENT in preference to EROFS
Date: Mon, 6 Jun 2011 16:36:50 -0400 [thread overview]
Message-ID: <1307392610-27911-1-git-send-email-tytso@mit.edu> (raw)
If user space attempts to unlink a non-existent file, and the file
system is mounted read-only, return ENOENT instead of EROFS. Either
error code is arguably valid/correct, but ENOENT is a more specific
error message.
Reported-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---
fs/namei.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/namei.c b/fs/namei.c
index 1ab641f..a9edbe0 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2708,9 +2708,9 @@ static long do_unlinkat(int dfd, const char __user *pathname)
error = PTR_ERR(dentry);
if (!IS_ERR(dentry)) {
/* Why not before? Because we want correct error value */
- if (nd.last.name[nd.last.len])
- goto slashes;
inode = dentry->d_inode;
+ if (nd.last.name[nd.last.len] || !inode)
+ goto slashes;
if (inode)
ihold(inode);
error = mnt_want_write(nd.path.mnt);
--
1.7.4.1.22.gec8e1.dirty
next reply other threads:[~2011-06-06 20:36 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-06 20:36 Theodore Ts'o [this message]
2011-06-06 20:45 ` [PATCH] vfs: make unlink() return ENOENT in preference to EROFS Arnaud Lacombe
2011-06-06 20:58 ` [PATCH -v2] " Theodore Ts'o
2011-06-06 22:30 ` Al Viro
2011-06-06 22:48 ` Michael Tokarev
2011-06-06 23:19 ` [PATCH -v3] vfs: make unlink() and rmdir() " Theodore Ts'o
2011-06-07 0:05 ` Al Viro
2011-06-07 14:16 ` Michael Tokarev
2011-07-02 0:50 ` [-v3] " Michael Tokarev
-- strict thread matches above, loose matches on Subject: below --
2011-06-06 19:55 unlink(nonexistent): EROFS or ENOENT? Ted Ts'o
2011-06-06 20:37 ` [PATCH] vfs: make unlink() return ENOENT in preference to EROFS Theodore Ts'o
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=1307392610-27911-1-git-send-email-tytso@mit.edu \
--to=tytso@mit.edu \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.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).