From: josef@toxicpanda.com
To: linux-btrfs@vger.kernel.org, kernel-team@fb.com
Cc: Josef Bacik <jbacik@fb.com>
Subject: [PATCH 1/3] btrfs: don't allow trans ioctl on a directory
Date: Fri, 21 Jul 2017 13:29:07 -0400 [thread overview]
Message-ID: <1500658149-20410-1-git-send-email-jbacik@fb.com> (raw)
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;
+
ret = -EPERM;
if (!capable(CAP_SYS_ADMIN))
goto out;
--
2.7.4
next reply other threads:[~2017-07-21 17:29 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-21 17:29 josef [this message]
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
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=1500658149-20410-1-git-send-email-jbacik@fb.com \
--to=josef@toxicpanda.com \
--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).