diff options
author | Andy Whitcroft <apw@canonical.com> | 2011-11-02 04:44:39 -0400 |
---|---|---|
committer | Christoph Hellwig <hch@serles.lst.de> | 2011-11-02 07:53:42 -0400 |
commit | 1fa1e7f615f4d3ae436fa319af6e4eebdd4026a8 (patch) | |
tree | aa3521aaa762424cc7fb38dbf924a34dac1b03c2 /fs/stat.c | |
parent | 32096ea1aac14e6f29d4744924092eca52b937b0 (diff) |
readlinkat: ensure we return ENOENT for the empty pathname for normal lookups
Since the commit below which added O_PATH support to the *at() calls, the
error return for readlink/readlinkat for the empty pathname has switched
from ENOENT to EINVAL:
commit 65cfc6722361570bfe255698d9cd4dccaf47570d
Author: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun Mar 13 15:56:26 2011 -0400
readlinkat(), fchownat() and fstatat() with empty relative pathnames
This is both unexpected for userspace and makes readlink/readlinkat
inconsistant with all other interfaces; and inconsistant with our stated
return for these pathnames.
As the readlinkat call does not have a flags parameter we cannot use the
AT_EMPTY_PATH approach used in the other calls. Therefore expose whether
the original path is infact entry via a new user_path_at_empty() path
lookup function. Use this to determine whether to default to EINVAL or
ENOENT for failures.
Addresses http://bugs.launchpad.net/bugs/817187
[akpm@linux-foundation.org: remove unused getname_flags()]
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: <stable@kernel.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'fs/stat.c')
-rw-r--r-- | fs/stat.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -294,15 +294,16 @@ SYSCALL_DEFINE4(readlinkat, int, dfd, const char __user *, pathname, | |||
294 | { | 294 | { |
295 | struct path path; | 295 | struct path path; |
296 | int error; | 296 | int error; |
297 | int empty = 0; | ||
297 | 298 | ||
298 | if (bufsiz <= 0) | 299 | if (bufsiz <= 0) |
299 | return -EINVAL; | 300 | return -EINVAL; |
300 | 301 | ||
301 | error = user_path_at(dfd, pathname, LOOKUP_EMPTY, &path); | 302 | error = user_path_at_empty(dfd, pathname, LOOKUP_EMPTY, &path, &empty); |
302 | if (!error) { | 303 | if (!error) { |
303 | struct inode *inode = path.dentry->d_inode; | 304 | struct inode *inode = path.dentry->d_inode; |
304 | 305 | ||
305 | error = -EINVAL; | 306 | error = empty ? -ENOENT : -EINVAL; |
306 | if (inode->i_op->readlink) { | 307 | if (inode->i_op->readlink) { |
307 | error = security_inode_readlink(path.dentry); | 308 | error = security_inode_readlink(path.dentry); |
308 | if (!error) { | 309 | if (!error) { |