2005-04-16 15:20:36 -07:00
|
|
|
/*
|
|
|
|
* linux/fs/readdir.c
|
|
|
|
*
|
|
|
|
* Copyright (C) 1995 Linus Torvalds
|
|
|
|
*/
|
|
|
|
|
2010-08-09 17:20:22 -07:00
|
|
|
#include <linux/stddef.h>
|
2007-05-08 00:29:02 -07:00
|
|
|
#include <linux/kernel.h>
|
2011-11-16 23:57:37 -05:00
|
|
|
#include <linux/export.h>
|
2005-04-16 15:20:36 -07:00
|
|
|
#include <linux/time.h>
|
|
|
|
#include <linux/mm.h>
|
|
|
|
#include <linux/errno.h>
|
|
|
|
#include <linux/stat.h>
|
|
|
|
#include <linux/file.h>
|
|
|
|
#include <linux/fs.h>
|
2014-06-04 16:05:41 -07:00
|
|
|
#include <linux/fsnotify.h>
|
2005-04-16 15:20:36 -07:00
|
|
|
#include <linux/dirent.h>
|
|
|
|
#include <linux/security.h>
|
|
|
|
#include <linux/syscalls.h>
|
|
|
|
#include <linux/unistd.h>
|
2025-01-14 00:49:01 +07:00
|
|
|
#ifdef CONFIG_KSU_SUSFS_SUS_PATH
|
|
|
|
#include <linux/susfs_def.h>
|
|
|
|
#endif
|
2005-04-16 15:20:36 -07:00
|
|
|
|
|
|
|
#include <asm/uaccess.h>
|
|
|
|
|
2025-01-14 00:49:01 +07:00
|
|
|
#ifdef CONFIG_KSU_SUSFS_SUS_PATH
|
|
|
|
extern int susfs_sus_ino_for_filldir64(unsigned long ino);
|
|
|
|
#endif
|
|
|
|
|
2013-05-15 13:52:59 -04:00
|
|
|
int iterate_dir(struct file *file, struct dir_context *ctx)
|
2005-04-16 15:20:36 -07:00
|
|
|
{
|
2013-01-23 17:07:38 -05:00
|
|
|
struct inode *inode = file_inode(file);
|
2016-04-20 23:08:32 -04:00
|
|
|
bool shared = false;
|
2005-04-16 15:20:36 -07:00
|
|
|
int res = -ENOTDIR;
|
2016-04-20 23:08:32 -04:00
|
|
|
if (file->f_op->iterate_shared)
|
|
|
|
shared = true;
|
|
|
|
else if (!file->f_op->iterate)
|
2005-04-16 15:20:36 -07:00
|
|
|
goto out;
|
|
|
|
|
|
|
|
res = security_file_permission(file, MAY_READ);
|
|
|
|
if (res)
|
|
|
|
goto out;
|
|
|
|
|
2016-05-26 00:05:12 -04:00
|
|
|
if (shared) {
|
2016-04-20 23:08:32 -04:00
|
|
|
inode_lock_shared(inode);
|
2016-05-26 00:05:12 -04:00
|
|
|
} else {
|
|
|
|
res = down_write_killable(&inode->i_rwsem);
|
|
|
|
if (res)
|
|
|
|
goto out;
|
|
|
|
}
|
2007-12-06 17:39:54 -05:00
|
|
|
|
2005-04-16 15:20:36 -07:00
|
|
|
res = -ENOENT;
|
|
|
|
if (!IS_DEADDIR(inode)) {
|
2013-05-22 21:44:23 -04:00
|
|
|
ctx->pos = file->f_pos;
|
2016-04-20 23:08:32 -04:00
|
|
|
if (shared)
|
|
|
|
res = file->f_op->iterate_shared(file, ctx);
|
|
|
|
else
|
|
|
|
res = file->f_op->iterate(file, ctx);
|
2013-05-22 21:44:23 -04:00
|
|
|
file->f_pos = ctx->pos;
|
2014-06-04 16:05:41 -07:00
|
|
|
fsnotify_access(file);
|
2005-04-16 15:20:36 -07:00
|
|
|
file_accessed(file);
|
|
|
|
}
|
2016-04-20 23:08:32 -04:00
|
|
|
if (shared)
|
|
|
|
inode_unlock_shared(inode);
|
|
|
|
else
|
|
|
|
inode_unlock(inode);
|
2005-04-16 15:20:36 -07:00
|
|
|
out:
|
|
|
|
return res;
|
|
|
|
}
|
2013-05-15 13:52:59 -04:00
|
|
|
EXPORT_SYMBOL(iterate_dir);
|
2005-04-16 15:20:36 -07:00
|
|
|
|
Make filldir[64]() verify the directory entry filename is valid
commit 8a23eb804ca4f2be909e372cf5a9e7b30ae476cd upstream.
This has been discussed several times, and now filesystem people are
talking about doing it individually at the filesystem layer, so head
that off at the pass and just do it in getdents{64}().
This is partially based on a patch by Jann Horn, but checks for NUL
bytes as well, and somewhat simplified.
There's also commentary about how it might be better if invalid names
due to filesystem corruption don't cause an immediate failure, but only
an error at the end of the readdir(), so that people can still see the
filenames that are ok.
There's also been discussion about just how much POSIX strictly speaking
requires this since it's about filesystem corruption. It's really more
"protect user space from bad behavior" as pointed out by Jann. But
since Eric Biederman looked up the POSIX wording, here it is for context:
"From readdir:
The readdir() function shall return a pointer to a structure
representing the directory entry at the current position in the
directory stream specified by the argument dirp, and position the
directory stream at the next entry. It shall return a null pointer
upon reaching the end of the directory stream. The structure dirent
defined in the <dirent.h> header describes a directory entry.
From definitions:
3.129 Directory Entry (or Link)
An object that associates a filename with a file. Several directory
entries can associate names with the same file.
...
3.169 Filename
A name consisting of 1 to {NAME_MAX} bytes used to name a file. The
characters composing the name may be selected from the set of all
character values excluding the slash character and the null byte. The
filenames dot and dot-dot have special meaning. A filename is
sometimes referred to as a 'pathname component'."
Note that I didn't bother adding the checks to any legacy interfaces
that nobody uses.
Also note that if this ends up being noticeable as a performance
regression, we can fix that to do a much more optimized model that
checks for both NUL and '/' at the same time one word at a time.
We haven't really tended to optimize 'memchr()', and it only checks for
one pattern at a time anyway, and we really _should_ check for NUL too
(but see the comment about "soft errors" in the code about why it
currently only checks for '/')
See the CONFIG_DCACHE_WORD_ACCESS case of hash_name() for how the name
lookup code looks for pathname terminating characters in parallel.
Link: https://lore.kernel.org/lkml/20190118161440.220134-2-jannh@google.com/
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Jann Horn <jannh@google.com>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Siddharth Chandrasekaran <csiddharth@vmware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2019-10-05 11:32:52 -07:00
|
|
|
/*
|
|
|
|
* POSIX says that a dirent name cannot contain NULL or a '/'.
|
|
|
|
*
|
|
|
|
* It's not 100% clear what we should really do in this case.
|
|
|
|
* The filesystem is clearly corrupted, but returning a hard
|
|
|
|
* error means that you now don't see any of the other names
|
|
|
|
* either, so that isn't a perfect alternative.
|
|
|
|
*
|
|
|
|
* And if you return an error, what error do you use? Several
|
|
|
|
* filesystems seem to have decided on EUCLEAN being the error
|
|
|
|
* code for EFSCORRUPTED, and that may be the error to use. Or
|
|
|
|
* just EIO, which is perhaps more obvious to users.
|
|
|
|
*
|
|
|
|
* In order to see the other file names in the directory, the
|
|
|
|
* caller might want to make this a "soft" error: skip the
|
|
|
|
* entry, and return the error at the end instead.
|
|
|
|
*
|
|
|
|
* Note that this should likely do a "memchr(name, 0, len)"
|
|
|
|
* check too, since that would be filesystem corruption as
|
|
|
|
* well. However, that case can't actually confuse user space,
|
|
|
|
* which has to do a strlen() on the name anyway to find the
|
|
|
|
* filename length, and the above "soft error" worry means
|
|
|
|
* that it's probably better left alone until we have that
|
|
|
|
* issue clarified.
|
|
|
|
*/
|
|
|
|
static int verify_dirent_name(const char *name, int len)
|
|
|
|
{
|
2019-10-18 18:41:16 -04:00
|
|
|
if (!len)
|
Make filldir[64]() verify the directory entry filename is valid
commit 8a23eb804ca4f2be909e372cf5a9e7b30ae476cd upstream.
This has been discussed several times, and now filesystem people are
talking about doing it individually at the filesystem layer, so head
that off at the pass and just do it in getdents{64}().
This is partially based on a patch by Jann Horn, but checks for NUL
bytes as well, and somewhat simplified.
There's also commentary about how it might be better if invalid names
due to filesystem corruption don't cause an immediate failure, but only
an error at the end of the readdir(), so that people can still see the
filenames that are ok.
There's also been discussion about just how much POSIX strictly speaking
requires this since it's about filesystem corruption. It's really more
"protect user space from bad behavior" as pointed out by Jann. But
since Eric Biederman looked up the POSIX wording, here it is for context:
"From readdir:
The readdir() function shall return a pointer to a structure
representing the directory entry at the current position in the
directory stream specified by the argument dirp, and position the
directory stream at the next entry. It shall return a null pointer
upon reaching the end of the directory stream. The structure dirent
defined in the <dirent.h> header describes a directory entry.
From definitions:
3.129 Directory Entry (or Link)
An object that associates a filename with a file. Several directory
entries can associate names with the same file.
...
3.169 Filename
A name consisting of 1 to {NAME_MAX} bytes used to name a file. The
characters composing the name may be selected from the set of all
character values excluding the slash character and the null byte. The
filenames dot and dot-dot have special meaning. A filename is
sometimes referred to as a 'pathname component'."
Note that I didn't bother adding the checks to any legacy interfaces
that nobody uses.
Also note that if this ends up being noticeable as a performance
regression, we can fix that to do a much more optimized model that
checks for both NUL and '/' at the same time one word at a time.
We haven't really tended to optimize 'memchr()', and it only checks for
one pattern at a time anyway, and we really _should_ check for NUL too
(but see the comment about "soft errors" in the code about why it
currently only checks for '/')
See the CONFIG_DCACHE_WORD_ACCESS case of hash_name() for how the name
lookup code looks for pathname terminating characters in parallel.
Link: https://lore.kernel.org/lkml/20190118161440.220134-2-jannh@google.com/
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Jann Horn <jannh@google.com>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Siddharth Chandrasekaran <csiddharth@vmware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2019-10-05 11:32:52 -07:00
|
|
|
return -EIO;
|
2019-10-18 18:41:16 -04:00
|
|
|
if (memchr(name, '/', len))
|
Make filldir[64]() verify the directory entry filename is valid
commit 8a23eb804ca4f2be909e372cf5a9e7b30ae476cd upstream.
This has been discussed several times, and now filesystem people are
talking about doing it individually at the filesystem layer, so head
that off at the pass and just do it in getdents{64}().
This is partially based on a patch by Jann Horn, but checks for NUL
bytes as well, and somewhat simplified.
There's also commentary about how it might be better if invalid names
due to filesystem corruption don't cause an immediate failure, but only
an error at the end of the readdir(), so that people can still see the
filenames that are ok.
There's also been discussion about just how much POSIX strictly speaking
requires this since it's about filesystem corruption. It's really more
"protect user space from bad behavior" as pointed out by Jann. But
since Eric Biederman looked up the POSIX wording, here it is for context:
"From readdir:
The readdir() function shall return a pointer to a structure
representing the directory entry at the current position in the
directory stream specified by the argument dirp, and position the
directory stream at the next entry. It shall return a null pointer
upon reaching the end of the directory stream. The structure dirent
defined in the <dirent.h> header describes a directory entry.
From definitions:
3.129 Directory Entry (or Link)
An object that associates a filename with a file. Several directory
entries can associate names with the same file.
...
3.169 Filename
A name consisting of 1 to {NAME_MAX} bytes used to name a file. The
characters composing the name may be selected from the set of all
character values excluding the slash character and the null byte. The
filenames dot and dot-dot have special meaning. A filename is
sometimes referred to as a 'pathname component'."
Note that I didn't bother adding the checks to any legacy interfaces
that nobody uses.
Also note that if this ends up being noticeable as a performance
regression, we can fix that to do a much more optimized model that
checks for both NUL and '/' at the same time one word at a time.
We haven't really tended to optimize 'memchr()', and it only checks for
one pattern at a time anyway, and we really _should_ check for NUL too
(but see the comment about "soft errors" in the code about why it
currently only checks for '/')
See the CONFIG_DCACHE_WORD_ACCESS case of hash_name() for how the name
lookup code looks for pathname terminating characters in parallel.
Link: https://lore.kernel.org/lkml/20190118161440.220134-2-jannh@google.com/
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Jann Horn <jannh@google.com>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Siddharth Chandrasekaran <csiddharth@vmware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2019-10-05 11:32:52 -07:00
|
|
|
return -EIO;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-04-16 15:20:36 -07:00
|
|
|
/*
|
|
|
|
* Traditional linux readdir() handling..
|
|
|
|
*
|
|
|
|
* "count=1" is a special case, meaning that the buffer is one
|
|
|
|
* dirent-structure in size and that the code can't handle more
|
|
|
|
* anyway. Thus the special "fillonedir()" function for that
|
|
|
|
* case (the low-level handlers don't need to care about this).
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifdef __ARCH_WANT_OLD_READDIR
|
|
|
|
|
|
|
|
struct old_linux_dirent {
|
|
|
|
unsigned long d_ino;
|
|
|
|
unsigned long d_offset;
|
|
|
|
unsigned short d_namlen;
|
|
|
|
char d_name[1];
|
|
|
|
};
|
|
|
|
|
|
|
|
struct readdir_callback {
|
2013-05-15 13:52:59 -04:00
|
|
|
struct dir_context ctx;
|
2005-04-16 15:20:36 -07:00
|
|
|
struct old_linux_dirent __user * dirent;
|
|
|
|
int result;
|
|
|
|
};
|
|
|
|
|
2014-10-30 17:37:34 +01:00
|
|
|
static int fillonedir(struct dir_context *ctx, const char *name, int namlen,
|
|
|
|
loff_t offset, u64 ino, unsigned int d_type)
|
2005-04-16 15:20:36 -07:00
|
|
|
{
|
2014-10-30 17:37:34 +01:00
|
|
|
struct readdir_callback *buf =
|
|
|
|
container_of(ctx, struct readdir_callback, ctx);
|
2005-04-16 15:20:36 -07:00
|
|
|
struct old_linux_dirent __user * dirent;
|
2006-10-03 01:13:46 -07:00
|
|
|
unsigned long d_ino;
|
2005-04-16 15:20:36 -07:00
|
|
|
|
|
|
|
if (buf->result)
|
|
|
|
return -EINVAL;
|
2006-10-03 01:13:46 -07:00
|
|
|
d_ino = ino;
|
2008-08-12 00:28:24 -04:00
|
|
|
if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) {
|
|
|
|
buf->result = -EOVERFLOW;
|
2006-10-03 01:13:46 -07:00
|
|
|
return -EOVERFLOW;
|
2008-08-12 00:28:24 -04:00
|
|
|
}
|
2005-04-16 15:20:36 -07:00
|
|
|
buf->result++;
|
|
|
|
dirent = buf->dirent;
|
|
|
|
if (!access_ok(VERIFY_WRITE, dirent,
|
|
|
|
(unsigned long)(dirent->d_name + namlen + 1) -
|
|
|
|
(unsigned long)dirent))
|
|
|
|
goto efault;
|
2006-10-03 01:13:46 -07:00
|
|
|
if ( __put_user(d_ino, &dirent->d_ino) ||
|
2005-04-16 15:20:36 -07:00
|
|
|
__put_user(offset, &dirent->d_offset) ||
|
|
|
|
__put_user(namlen, &dirent->d_namlen) ||
|
|
|
|
__copy_to_user(dirent->d_name, name, namlen) ||
|
|
|
|
__put_user(0, dirent->d_name + namlen))
|
|
|
|
goto efault;
|
|
|
|
return 0;
|
|
|
|
efault:
|
|
|
|
buf->result = -EFAULT;
|
|
|
|
return -EFAULT;
|
|
|
|
}
|
|
|
|
|
2009-01-14 14:14:34 +01:00
|
|
|
SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
|
|
|
|
struct old_linux_dirent __user *, dirent, unsigned int, count)
|
2005-04-16 15:20:36 -07:00
|
|
|
{
|
|
|
|
int error;
|
2016-04-20 17:08:21 -04:00
|
|
|
struct fd f = fdget_pos(fd);
|
2013-05-22 22:22:04 -04:00
|
|
|
struct readdir_callback buf = {
|
|
|
|
.ctx.actor = fillonedir,
|
|
|
|
.dirent = dirent
|
|
|
|
};
|
2005-04-16 15:20:36 -07:00
|
|
|
|
2012-08-28 12:52:22 -04:00
|
|
|
if (!f.file)
|
2012-04-21 18:40:32 -04:00
|
|
|
return -EBADF;
|
2005-04-16 15:20:36 -07:00
|
|
|
|
2013-05-15 13:52:59 -04:00
|
|
|
error = iterate_dir(f.file, &buf.ctx);
|
2008-08-24 07:29:52 -04:00
|
|
|
if (buf.result)
|
2005-04-16 15:20:36 -07:00
|
|
|
error = buf.result;
|
|
|
|
|
2016-04-20 17:08:21 -04:00
|
|
|
fdput_pos(f);
|
2005-04-16 15:20:36 -07:00
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* __ARCH_WANT_OLD_READDIR */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* New, all-improved, singing, dancing, iBCS2-compliant getdents()
|
|
|
|
* interface.
|
|
|
|
*/
|
|
|
|
struct linux_dirent {
|
|
|
|
unsigned long d_ino;
|
|
|
|
unsigned long d_off;
|
|
|
|
unsigned short d_reclen;
|
|
|
|
char d_name[1];
|
|
|
|
};
|
|
|
|
|
|
|
|
struct getdents_callback {
|
2013-05-15 13:52:59 -04:00
|
|
|
struct dir_context ctx;
|
2005-04-16 15:20:36 -07:00
|
|
|
struct linux_dirent __user * current_dir;
|
|
|
|
struct linux_dirent __user * previous;
|
|
|
|
int count;
|
|
|
|
int error;
|
|
|
|
};
|
|
|
|
|
2014-10-30 17:37:34 +01:00
|
|
|
static int filldir(struct dir_context *ctx, const char *name, int namlen,
|
|
|
|
loff_t offset, u64 ino, unsigned int d_type)
|
2005-04-16 15:20:36 -07:00
|
|
|
{
|
|
|
|
struct linux_dirent __user * dirent;
|
2014-10-30 17:37:34 +01:00
|
|
|
struct getdents_callback *buf =
|
|
|
|
container_of(ctx, struct getdents_callback, ctx);
|
2006-10-03 01:13:46 -07:00
|
|
|
unsigned long d_ino;
|
2010-08-09 17:20:22 -07:00
|
|
|
int reclen = ALIGN(offsetof(struct linux_dirent, d_name) + namlen + 2,
|
|
|
|
sizeof(long));
|
2005-04-16 15:20:36 -07:00
|
|
|
|
2025-01-14 00:49:01 +07:00
|
|
|
#ifdef CONFIG_KSU_SUSFS_SUS_PATH
|
|
|
|
if (likely(current->susfs_task_state & TASK_STRUCT_NON_ROOT_USER_APP_PROC) && susfs_sus_ino_for_filldir64(ino)) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif
|
Make filldir[64]() verify the directory entry filename is valid
commit 8a23eb804ca4f2be909e372cf5a9e7b30ae476cd upstream.
This has been discussed several times, and now filesystem people are
talking about doing it individually at the filesystem layer, so head
that off at the pass and just do it in getdents{64}().
This is partially based on a patch by Jann Horn, but checks for NUL
bytes as well, and somewhat simplified.
There's also commentary about how it might be better if invalid names
due to filesystem corruption don't cause an immediate failure, but only
an error at the end of the readdir(), so that people can still see the
filenames that are ok.
There's also been discussion about just how much POSIX strictly speaking
requires this since it's about filesystem corruption. It's really more
"protect user space from bad behavior" as pointed out by Jann. But
since Eric Biederman looked up the POSIX wording, here it is for context:
"From readdir:
The readdir() function shall return a pointer to a structure
representing the directory entry at the current position in the
directory stream specified by the argument dirp, and position the
directory stream at the next entry. It shall return a null pointer
upon reaching the end of the directory stream. The structure dirent
defined in the <dirent.h> header describes a directory entry.
From definitions:
3.129 Directory Entry (or Link)
An object that associates a filename with a file. Several directory
entries can associate names with the same file.
...
3.169 Filename
A name consisting of 1 to {NAME_MAX} bytes used to name a file. The
characters composing the name may be selected from the set of all
character values excluding the slash character and the null byte. The
filenames dot and dot-dot have special meaning. A filename is
sometimes referred to as a 'pathname component'."
Note that I didn't bother adding the checks to any legacy interfaces
that nobody uses.
Also note that if this ends up being noticeable as a performance
regression, we can fix that to do a much more optimized model that
checks for both NUL and '/' at the same time one word at a time.
We haven't really tended to optimize 'memchr()', and it only checks for
one pattern at a time anyway, and we really _should_ check for NUL too
(but see the comment about "soft errors" in the code about why it
currently only checks for '/')
See the CONFIG_DCACHE_WORD_ACCESS case of hash_name() for how the name
lookup code looks for pathname terminating characters in parallel.
Link: https://lore.kernel.org/lkml/20190118161440.220134-2-jannh@google.com/
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Jann Horn <jannh@google.com>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Siddharth Chandrasekaran <csiddharth@vmware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2019-10-05 11:32:52 -07:00
|
|
|
buf->error = verify_dirent_name(name, namlen);
|
|
|
|
if (unlikely(buf->error))
|
|
|
|
return buf->error;
|
2005-04-16 15:20:36 -07:00
|
|
|
buf->error = -EINVAL; /* only used if we fail.. */
|
|
|
|
if (reclen > buf->count)
|
|
|
|
return -EINVAL;
|
2006-10-03 01:13:46 -07:00
|
|
|
d_ino = ino;
|
2008-08-12 00:28:24 -04:00
|
|
|
if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) {
|
|
|
|
buf->error = -EOVERFLOW;
|
2006-10-03 01:13:46 -07:00
|
|
|
return -EOVERFLOW;
|
2008-08-12 00:28:24 -04:00
|
|
|
}
|
2005-04-16 15:20:36 -07:00
|
|
|
dirent = buf->previous;
|
|
|
|
if (dirent) {
|
2016-04-23 22:50:07 -04:00
|
|
|
if (signal_pending(current))
|
|
|
|
return -EINTR;
|
2005-04-16 15:20:36 -07:00
|
|
|
if (__put_user(offset, &dirent->d_off))
|
|
|
|
goto efault;
|
|
|
|
}
|
|
|
|
dirent = buf->current_dir;
|
2006-10-03 01:13:46 -07:00
|
|
|
if (__put_user(d_ino, &dirent->d_ino))
|
2005-04-16 15:20:36 -07:00
|
|
|
goto efault;
|
|
|
|
if (__put_user(reclen, &dirent->d_reclen))
|
|
|
|
goto efault;
|
|
|
|
if (copy_to_user(dirent->d_name, name, namlen))
|
|
|
|
goto efault;
|
|
|
|
if (__put_user(0, dirent->d_name + namlen))
|
|
|
|
goto efault;
|
|
|
|
if (__put_user(d_type, (char __user *) dirent + reclen - 1))
|
|
|
|
goto efault;
|
|
|
|
buf->previous = dirent;
|
|
|
|
dirent = (void __user *)dirent + reclen;
|
|
|
|
buf->current_dir = dirent;
|
|
|
|
buf->count -= reclen;
|
|
|
|
return 0;
|
|
|
|
efault:
|
|
|
|
buf->error = -EFAULT;
|
|
|
|
return -EFAULT;
|
|
|
|
}
|
|
|
|
|
2009-01-14 14:14:23 +01:00
|
|
|
SYSCALL_DEFINE3(getdents, unsigned int, fd,
|
|
|
|
struct linux_dirent __user *, dirent, unsigned int, count)
|
2005-04-16 15:20:36 -07:00
|
|
|
{
|
2012-08-28 12:52:22 -04:00
|
|
|
struct fd f;
|
2005-04-16 15:20:36 -07:00
|
|
|
struct linux_dirent __user * lastdirent;
|
2013-05-22 22:22:04 -04:00
|
|
|
struct getdents_callback buf = {
|
|
|
|
.ctx.actor = filldir,
|
|
|
|
.count = count,
|
|
|
|
.current_dir = dirent
|
|
|
|
};
|
2005-04-16 15:20:36 -07:00
|
|
|
int error;
|
|
|
|
|
|
|
|
if (!access_ok(VERIFY_WRITE, dirent, count))
|
2012-04-21 18:40:32 -04:00
|
|
|
return -EFAULT;
|
2005-04-16 15:20:36 -07:00
|
|
|
|
2016-04-20 17:08:21 -04:00
|
|
|
f = fdget_pos(fd);
|
2012-08-28 12:52:22 -04:00
|
|
|
if (!f.file)
|
2012-04-21 18:40:32 -04:00
|
|
|
return -EBADF;
|
2005-04-16 15:20:36 -07:00
|
|
|
|
2013-05-15 13:52:59 -04:00
|
|
|
error = iterate_dir(f.file, &buf.ctx);
|
2008-08-24 07:29:52 -04:00
|
|
|
if (error >= 0)
|
|
|
|
error = buf.error;
|
2005-04-16 15:20:36 -07:00
|
|
|
lastdirent = buf.previous;
|
|
|
|
if (lastdirent) {
|
2013-05-15 18:49:12 -04:00
|
|
|
if (put_user(buf.ctx.pos, &lastdirent->d_off))
|
2005-04-16 15:20:36 -07:00
|
|
|
error = -EFAULT;
|
|
|
|
else
|
|
|
|
error = count - buf.count;
|
|
|
|
}
|
2016-04-20 17:08:21 -04:00
|
|
|
fdput_pos(f);
|
2005-04-16 15:20:36 -07:00
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct getdents_callback64 {
|
2013-05-15 13:52:59 -04:00
|
|
|
struct dir_context ctx;
|
2005-04-16 15:20:36 -07:00
|
|
|
struct linux_dirent64 __user * current_dir;
|
|
|
|
struct linux_dirent64 __user * previous;
|
|
|
|
int count;
|
|
|
|
int error;
|
|
|
|
};
|
|
|
|
|
2014-10-30 17:37:34 +01:00
|
|
|
static int filldir64(struct dir_context *ctx, const char *name, int namlen,
|
|
|
|
loff_t offset, u64 ino, unsigned int d_type)
|
2005-04-16 15:20:36 -07:00
|
|
|
{
|
|
|
|
struct linux_dirent64 __user *dirent;
|
2014-10-30 17:37:34 +01:00
|
|
|
struct getdents_callback64 *buf =
|
|
|
|
container_of(ctx, struct getdents_callback64, ctx);
|
2010-08-09 17:20:22 -07:00
|
|
|
int reclen = ALIGN(offsetof(struct linux_dirent64, d_name) + namlen + 1,
|
|
|
|
sizeof(u64));
|
2005-04-16 15:20:36 -07:00
|
|
|
|
2025-01-14 00:49:01 +07:00
|
|
|
#ifdef CONFIG_KSU_SUSFS_SUS_PATH
|
|
|
|
if (likely(current->susfs_task_state & TASK_STRUCT_NON_ROOT_USER_APP_PROC) && susfs_sus_ino_for_filldir64(ino)) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif
|
Make filldir[64]() verify the directory entry filename is valid
commit 8a23eb804ca4f2be909e372cf5a9e7b30ae476cd upstream.
This has been discussed several times, and now filesystem people are
talking about doing it individually at the filesystem layer, so head
that off at the pass and just do it in getdents{64}().
This is partially based on a patch by Jann Horn, but checks for NUL
bytes as well, and somewhat simplified.
There's also commentary about how it might be better if invalid names
due to filesystem corruption don't cause an immediate failure, but only
an error at the end of the readdir(), so that people can still see the
filenames that are ok.
There's also been discussion about just how much POSIX strictly speaking
requires this since it's about filesystem corruption. It's really more
"protect user space from bad behavior" as pointed out by Jann. But
since Eric Biederman looked up the POSIX wording, here it is for context:
"From readdir:
The readdir() function shall return a pointer to a structure
representing the directory entry at the current position in the
directory stream specified by the argument dirp, and position the
directory stream at the next entry. It shall return a null pointer
upon reaching the end of the directory stream. The structure dirent
defined in the <dirent.h> header describes a directory entry.
From definitions:
3.129 Directory Entry (or Link)
An object that associates a filename with a file. Several directory
entries can associate names with the same file.
...
3.169 Filename
A name consisting of 1 to {NAME_MAX} bytes used to name a file. The
characters composing the name may be selected from the set of all
character values excluding the slash character and the null byte. The
filenames dot and dot-dot have special meaning. A filename is
sometimes referred to as a 'pathname component'."
Note that I didn't bother adding the checks to any legacy interfaces
that nobody uses.
Also note that if this ends up being noticeable as a performance
regression, we can fix that to do a much more optimized model that
checks for both NUL and '/' at the same time one word at a time.
We haven't really tended to optimize 'memchr()', and it only checks for
one pattern at a time anyway, and we really _should_ check for NUL too
(but see the comment about "soft errors" in the code about why it
currently only checks for '/')
See the CONFIG_DCACHE_WORD_ACCESS case of hash_name() for how the name
lookup code looks for pathname terminating characters in parallel.
Link: https://lore.kernel.org/lkml/20190118161440.220134-2-jannh@google.com/
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Jann Horn <jannh@google.com>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Siddharth Chandrasekaran <csiddharth@vmware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2019-10-05 11:32:52 -07:00
|
|
|
buf->error = verify_dirent_name(name, namlen);
|
|
|
|
if (unlikely(buf->error))
|
|
|
|
return buf->error;
|
2005-04-16 15:20:36 -07:00
|
|
|
buf->error = -EINVAL; /* only used if we fail.. */
|
|
|
|
if (reclen > buf->count)
|
|
|
|
return -EINVAL;
|
|
|
|
dirent = buf->previous;
|
|
|
|
if (dirent) {
|
2016-04-23 22:50:07 -04:00
|
|
|
if (signal_pending(current))
|
|
|
|
return -EINTR;
|
2005-04-16 15:20:36 -07:00
|
|
|
if (__put_user(offset, &dirent->d_off))
|
|
|
|
goto efault;
|
|
|
|
}
|
|
|
|
dirent = buf->current_dir;
|
|
|
|
if (__put_user(ino, &dirent->d_ino))
|
|
|
|
goto efault;
|
|
|
|
if (__put_user(0, &dirent->d_off))
|
|
|
|
goto efault;
|
|
|
|
if (__put_user(reclen, &dirent->d_reclen))
|
|
|
|
goto efault;
|
|
|
|
if (__put_user(d_type, &dirent->d_type))
|
|
|
|
goto efault;
|
|
|
|
if (copy_to_user(dirent->d_name, name, namlen))
|
|
|
|
goto efault;
|
|
|
|
if (__put_user(0, dirent->d_name + namlen))
|
|
|
|
goto efault;
|
|
|
|
buf->previous = dirent;
|
|
|
|
dirent = (void __user *)dirent + reclen;
|
|
|
|
buf->current_dir = dirent;
|
|
|
|
buf->count -= reclen;
|
|
|
|
return 0;
|
|
|
|
efault:
|
|
|
|
buf->error = -EFAULT;
|
|
|
|
return -EFAULT;
|
|
|
|
}
|
|
|
|
|
2009-01-14 14:14:23 +01:00
|
|
|
SYSCALL_DEFINE3(getdents64, unsigned int, fd,
|
|
|
|
struct linux_dirent64 __user *, dirent, unsigned int, count)
|
2005-04-16 15:20:36 -07:00
|
|
|
{
|
2012-08-28 12:52:22 -04:00
|
|
|
struct fd f;
|
2005-04-16 15:20:36 -07:00
|
|
|
struct linux_dirent64 __user * lastdirent;
|
2013-05-22 22:22:04 -04:00
|
|
|
struct getdents_callback64 buf = {
|
|
|
|
.ctx.actor = filldir64,
|
|
|
|
.count = count,
|
|
|
|
.current_dir = dirent
|
|
|
|
};
|
2005-04-16 15:20:36 -07:00
|
|
|
int error;
|
|
|
|
|
|
|
|
if (!access_ok(VERIFY_WRITE, dirent, count))
|
2012-04-21 18:40:32 -04:00
|
|
|
return -EFAULT;
|
2005-04-16 15:20:36 -07:00
|
|
|
|
2016-04-20 17:08:21 -04:00
|
|
|
f = fdget_pos(fd);
|
2012-08-28 12:52:22 -04:00
|
|
|
if (!f.file)
|
2012-04-21 18:40:32 -04:00
|
|
|
return -EBADF;
|
2005-04-16 15:20:36 -07:00
|
|
|
|
2013-05-15 13:52:59 -04:00
|
|
|
error = iterate_dir(f.file, &buf.ctx);
|
2008-08-24 07:29:52 -04:00
|
|
|
if (error >= 0)
|
|
|
|
error = buf.error;
|
2005-04-16 15:20:36 -07:00
|
|
|
lastdirent = buf.previous;
|
|
|
|
if (lastdirent) {
|
2013-05-15 18:49:12 -04:00
|
|
|
typeof(lastdirent->d_off) d_off = buf.ctx.pos;
|
2005-04-16 15:20:36 -07:00
|
|
|
if (__put_user(d_off, &lastdirent->d_off))
|
2008-08-24 07:29:52 -04:00
|
|
|
error = -EFAULT;
|
|
|
|
else
|
|
|
|
error = count - buf.count;
|
2005-04-16 15:20:36 -07:00
|
|
|
}
|
2016-04-20 17:08:21 -04:00
|
|
|
fdput_pos(f);
|
2005-04-16 15:20:36 -07:00
|
|
|
return error;
|
|
|
|
}
|