diff options
| author | Miklos Szeredi <mszeredi@suse.cz> | 2013-09-03 14:28:38 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-10-26 21:06:02 +0100 |
| commit | b5f9e3533584d2fb6c90c63da767b85421b07def (patch) | |
| tree | 8e44ceac9056c2ad838650d6e372cb2fbcd08f1a | |
| parent | 9eb9bfa030d8a49d54f0e4ae671e33f406bbbeff (diff) | |
fuse: readdir: check for slash in names
commit efeb9e60d48f7778fdcad4a0f3ad9ea9b19e5dfd upstream.
Userspace can add names containing a slash character to the directory
listing. Don't allow this as it could cause all sorts of trouble.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
[bwh: Backported to 3.2: drop changes to parse_dirplusfile() which we
don't have]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | fs/fuse/dir.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index 2747103f76e..06e2f73e64a 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c @@ -1063,6 +1063,8 @@ static int parse_dirfile(char *buf, size_t nbytes, struct file *file, return -EIO; if (reclen > nbytes) break; + if (memchr(dirent->name, '/', dirent->namelen) != NULL) + return -EIO; over = filldir(dstbuf, dirent->name, dirent->namelen, file->f_pos, dirent->ino, dirent->type); |