| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <CAJfpegu=0QtzqSOGi_yd48eL3hgG1Hqf_YO2prWeiHBwwMHZyA@mail.gmail.com>
Date: Wed, 30 Sep 2020 20:50:46 +0200
From: Miklos Szeredi <miklos@...redi.hu>
To: Alessio Balsini <balsini@...roid.com>
Cc: Akilesh Kailash <akailash@...gle.com>,
Amir Goldstein <amir73il@...il.com>,
Antonio SJ Musumeci <trapexit@...wn.link>,
David Anderson <dvander@...gle.com>,
Giuseppe Scrivano <gscrivan@...hat.com>,
Jann Horn <jannh@...gle.com>, Jens Axboe <axboe@...nel.dk>,
Martijn Coenen <maco@...roid.com>,
Palmer Dabbelt <palmer@...belt.com>,
Paul Lawrence <paullawrence@...gle.com>,
Stefano Duo <stefanoduo@...gle.com>,
Zimuzo Ezeozue <zezeozue@...gle.com>,
fuse-devel <fuse-devel@...ts.sourceforge.net>,
kernel-team <kernel-team@...roid.com>,
linux-fsdevel@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH V9 3/4] fuse: Introduce synchronous read and write for passthrough
On Thu, Sep 24, 2020 at 3:13 PM Alessio Balsini <balsini@...roid.com> wrote:
>
> All the read and write operations performed on fuse_files which have the
> passthrough feature enabled are forwarded to the associated lower file
> system file via VFS.
>
> Sending the request directly to the lower file system avoids the userspace
> round-trip that, because of possible context switches and additional
> operations might reduce the overall performance, especially in those cases
> where caching doesn't help, for example in reads at random offsets.
>
> Verifying if a fuse_file has a lower file system file associated for
> passthrough can be done by checking the validity of its passthrough_filp
> pointer. This pointer is not NULL only if passthrough has been successfully
> enabled via the appropriate ioctl().
> When a read/write operation is requested for a FUSE file with passthrough
> enabled, a new equivalent VFS request is generated, which instead targets
> the lower file system file.
> The VFS layer performs additional checks that allows for safer operations,
> but may cause the operation to fail if the process accessing the FUSE file
> system does not have access to the lower file system. This often happens in
> passthrough file systems, where the FUSE daemon is responsible for the
> enforcement of the lower file system access policies. In order to preserve
> this behavior, the current process accessing the FUSE file with passthrough
> enabled receives the privileges of the FUSE daemon while performing the
> read/write operation, emulating a behavior used in overlayfs. These
> privileges will be reverted as soon as the IO operation completes. This
> feature does not provide any higher security privileges to those processes
> accessing the FUSE file system with passthrough enabled. This because it is
> still the FUSE daemon responsible for enabling or not the passthrough
> feature at file open time, and should enable the feature only after
> appropriate access policy checks.
>
> This change only implements synchronous requests in passthrough, returning
> an error in the case of ansynchronous operations, yet covering the majority
> of the use cases.
>
> Signed-off-by: Alessio Balsini <balsini@...roid.com>
> ---
> fs/fuse/file.c | 8 +++-
> fs/fuse/fuse_i.h | 2 +
> fs/fuse/passthrough.c | 93 +++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 101 insertions(+), 2 deletions(-)
>
> diff --git a/fs/fuse/file.c b/fs/fuse/file.c
> index 6c0ec742ce74..c3289ff0cd33 100644
> --- a/fs/fuse/file.c
> +++ b/fs/fuse/file.c
> @@ -1552,7 +1552,9 @@ static ssize_t fuse_file_read_iter(struct kiocb *iocb, struct iov_iter *to)
> if (is_bad_inode(file_inode(file)))
> return -EIO;
>
> - if (!(ff->open_flags & FOPEN_DIRECT_IO))
> + if (ff->passthrough_filp)
> + return fuse_passthrough_read_iter(iocb, to);
> + else if (!(ff->open_flags & FOPEN_DIRECT_IO))
> return fuse_cache_read_iter(iocb, to);
> else
> return fuse_direct_read_iter(iocb, to);
> @@ -1566,7 +1568,9 @@ static ssize_t fuse_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
> if (is_bad_inode(file_inode(file)))
> return -EIO;
>
> - if (!(ff->open_flags & FOPEN_DIRECT_IO))
> + if (ff->passthrough_filp)
> + return fuse_passthrough_write_iter(iocb, from);
> + else if (!(ff->open_flags & FOPEN_DIRECT_IO))
> return fuse_cache_write_iter(iocb, from);
> else
> return fuse_direct_write_iter(iocb, from);
> diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
> index 67bf5919f8d6..b0764ca4c4fd 100644
> --- a/fs/fuse/fuse_i.h
> +++ b/fs/fuse/fuse_i.h
> @@ -1109,5 +1109,7 @@ void fuse_free_conn(struct fuse_conn *fc);
>
> int fuse_passthrough_setup(struct fuse_req *req, unsigned int fd);
> void fuse_passthrough_release(struct fuse_file *ff);
> +ssize_t fuse_passthrough_read_iter(struct kiocb *iocb, struct iov_iter *to);
> +ssize_t fuse_passthrough_write_iter(struct kiocb *iocb, struct iov_iter *from);
>
> #endif /* _FS_FUSE_I_H */
> diff --git a/fs/fuse/passthrough.c b/fs/fuse/passthrough.c
> index 86ab4eafa7bf..f70c0ef6945b 100644
> --- a/fs/fuse/passthrough.c
> +++ b/fs/fuse/passthrough.c
> @@ -2,6 +2,99 @@
>
> #include "fuse_i.h"
>
> +#include <linux/uio.h>
> +
> +static void fuse_copyattr(struct file *dst_file, struct file *src_file)
> +{
> + struct inode *dst = file_inode(dst_file);
> + struct inode *src = file_inode(src_file);
> +
> + i_size_write(dst, i_size_read(src));
> +}
> +
> +static rwf_t iocbflags_to_rwf(int ifl)
> +{
> + rwf_t flags = 0;
> +
> + if (ifl & IOCB_APPEND)
> + flags |= RWF_APPEND;
> + if (ifl & IOCB_DSYNC)
> + flags |= RWF_DSYNC;
> + if (ifl & IOCB_HIPRI)
> + flags |= RWF_HIPRI;
> + if (ifl & IOCB_NOWAIT)
> + flags |= RWF_NOWAIT;
> + if (ifl & IOCB_SYNC)
> + flags |= RWF_SYNC;
> +
> + return flags;
> +}
> +
> +static const struct cred *
> +fuse_passthrough_override_creds(const struct file *fuse_filp)
> +{
> + struct inode *fuse_inode = file_inode(fuse_filp);
> + struct fuse_conn *fc = fuse_inode->i_sb->s_fs_info;
> +
> + return override_creds(fc->creator_cred);
> +}
> +
> +ssize_t fuse_passthrough_read_iter(struct kiocb *iocb_fuse,
> + struct iov_iter *iter)
> +{
> + ssize_t ret;
> + const struct cred *old_cred;
> + struct file *fuse_filp = iocb_fuse->ki_filp;
> + struct fuse_file *ff = fuse_filp->private_data;
> + struct file *passthrough_filp = ff->passthrough_filp;
> +
> + if (!iov_iter_count(iter))
> + return 0;
> +
> + old_cred = fuse_passthrough_override_creds(fuse_filp);
> + if (is_sync_kiocb(iocb_fuse)) {
> + ret = vfs_iter_read(passthrough_filp, iter, &iocb_fuse->ki_pos,
> + iocbflags_to_rwf(iocb_fuse->ki_flags));
> + } else {
> + ret = -EIO;
> + }
Just do vfs_iter_read() unconditionally, instead of returning EIO.
It will work fine, except it won't be async.
Yeah, I know next patch is going to fix this, but still, lets not make
this patch return silly errors.
> + revert_creds(old_cred);
> +
> + return ret;
> +}
> +
> +ssize_t fuse_passthrough_write_iter(struct kiocb *iocb_fuse,
> + struct iov_iter *iter)
> +{
> + ssize_t ret;
> + const struct cred *old_cred;
> + struct file *fuse_filp = iocb_fuse->ki_filp;
> + struct fuse_file *ff = fuse_filp->private_data;
> + struct inode *fuse_inode = file_inode(fuse_filp);
> + struct file *passthrough_filp = ff->passthrough_filp;
> +
> + if (!iov_iter_count(iter))
> + return 0;
> +
> + inode_lock(fuse_inode);
> +
> + old_cred = fuse_passthrough_override_creds(fuse_filp);
> + if (is_sync_kiocb(iocb_fuse)) {
> + file_start_write(passthrough_filp);
> + ret = vfs_iter_write(passthrough_filp, iter, &iocb_fuse->ki_pos,
> + iocbflags_to_rwf(iocb_fuse->ki_flags));
> + file_end_write(passthrough_filp);
> + if (ret > 0)
> + fuse_copyattr(fuse_filp, passthrough_filp);
> + } else {
> + ret = -EIO;
> + }
And the same here.
> + revert_creds(old_cred);
> + inode_unlock(fuse_inode);
> +
> + return ret;
> +}
> +
> int fuse_passthrough_setup(struct fuse_req *req, unsigned int fd)
> {
> int ret;
> --
> 2.28.0.681.g6f77f65b4e-goog
>
Powered by blists - more mailing lists