From: Josef Bacik <josef@toxicpanda.com>
To: dsterba@suse.cz, josef@toxicpanda.com,
linux-btrfs@vger.kernel.org, kernel-team@fb.com,
Josef Bacik <jbacik@fb.com>
Subject: Re: [PATCH 1/3] btrfs: don't allow trans ioctl on a directory
Date: Mon, 24 Jul 2017 10:02:30 -0400 [thread overview]
Message-ID: <20170724140229.GC9406@destiny> (raw)
In-Reply-To: <20170724124229.GQ2866@twin.jikos.cz>
On Mon, Jul 24, 2017 at 02:42:29PM +0200, David Sterba wrote:
> On Fri, Jul 21, 2017 at 01:29:07PM -0400, josef@toxicpanda.com wrote:
> > From: Josef Bacik <jbacik@fb.com>
> >
> > We need to use file->private_data for readdir on directories, so just
> > don't allow user space transactions on directories.
> >
> > Signed-off-by: Josef Bacik <jbacik@fb.com>
> > ---
> > fs/btrfs/ioctl.c | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
> > index bedeec6..ddb3811 100644
> > --- a/fs/btrfs/ioctl.c
> > +++ b/fs/btrfs/ioctl.c
> > @@ -3968,6 +3968,9 @@ static long btrfs_ioctl_trans_start(struct file *file)
> > struct btrfs_trans_handle *trans;
> > int ret;
> >
> > + if (S_ISDIR(inode->i_mode))
> > + return -EINVAL;
>
> You can't do this, starting a transaction on a directory needs to work.
> The most natural way to run the ioctl is on the mount point.
>
> The file private data would need to be able to hold multipe values, so
> you can add
>
> struct btrfs_inode {
> ...
> struct priv_data {
> void *for_readdir;
> void *for_tranc_ioctl;
> };
> ...
> };
>
> then set file->file_private = &btrfs_inode->priv_data; and update all
> uses to check for the embedded pointers.
>
Blah I really want to just jetison the user space transaction stuff altogether
so I was hoping this would be a first step. But yeah we can do it your way too.
Thanks,
Josef
next prev parent reply other threads:[~2017-07-24 14:02 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-21 17:29 [PATCH 1/3] btrfs: don't allow trans ioctl on a directory josef
2017-07-21 17:29 ` [PATCH 2/3] btrfs: fix readdir deadlock with pagefault josef
2017-07-21 19:10 ` Josef Bacik
2017-07-24 8:26 ` Nikolay Borisov
2017-07-24 13:59 ` Josef Bacik
2017-07-24 12:50 ` David Sterba
2017-07-24 13:14 ` David Sterba
2017-07-24 14:01 ` Josef Bacik
2017-07-21 17:29 ` [PATCH 3/3] btrfs: increase ctx->pos for delayed dir index josef
2017-07-24 12:42 ` [PATCH 1/3] btrfs: don't allow trans ioctl on a directory David Sterba
2017-07-24 12:58 ` David Sterba
2017-07-24 14:02 ` Josef Bacik [this message]
2017-07-24 16:02 ` David Sterba
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=20170724140229.GC9406@destiny \
--to=josef@toxicpanda.com \
--cc=dsterba@suse.cz \
--cc=jbacik@fb.com \
--cc=kernel-team@fb.com \
--cc=linux-btrfs@vger.kernel.org \
/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).