From: Qu Wenruo <quwenruo@cn.fujitsu.com>
To: "Austin S. Hemmelgarn" <ahferroin7@gmail.com>,
<linux-btrfs@vger.kernel.org>
Subject: Re: [PATCH] btrfs-progs: add stat check in open_ctree_fs_info
Date: Thu, 17 Mar 2016 17:04:20 +0800 [thread overview]
Message-ID: <56EA7314.2080104@cn.fujitsu.com> (raw)
In-Reply-To: <1458141971-56355-1-git-send-email-ahferroin7@gmail.com>
Austin S. Hemmelgarn wrote on 2016/03/16 11:26 -0400:
> Currently, open_ctree_fs_info will open whatever path you pass it and
> try to interpret it as a BTRFS filesystem. While this is not
> nessecarily dangerous (except possibly if done on a character device),
> it does result in some rather cryptic and non-sensical error messages
> when trying to run certain commands in ways they weren't intended to be
> run. Add a check using stat(2) to verify that the path we've been
> passed is in fact a regular file or a block device.
>
> This causes the following commands to provide a helpful error message
> when run on a FIFO, directory, character device, or socket:
> * btrfs check
> * btrfs restore
> * btrfs-image
> * btrfs-find-root
> * btrfs-debug-tree
>
> Signed-off-by: Austin S. Hemmelgarn <ahferroin7@gmail.com>
> ---
> This has been build and runtime tested on an x86-64 system with glibc.
> It has been build tested on x86-64 with uclibc.
> It has not been tested on Android or with musl, although it should work
> there also.
>
> There are other tools that have similarly bad behavior when called
> incorrectly (btrfs rescue immediately comes to mind), but they don't
> use open_ctree_fs_info, so this doesn't affect them. I may do followup
> patches to fix those too if I have the time.
>
> open_ctree_fs_info is also used in cmds-filesystem.c, although I'm not
> at all sure what exactly is going on there, and btrfs filesystem appears
> from my testing to behave exactly the same with this change, so I don't
> think this will have any effect on any of the btrfs filesystem commands.
>
> disk-io.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/disk-io.c b/disk-io.c
> index e520d80..d35153d 100644
> --- a/disk-io.c
> +++ b/disk-io.c
> @@ -1310,6 +1310,13 @@ struct btrfs_fs_info *open_ctree_fs_info(const char *filename,
> int fp;
> struct btrfs_fs_info *info;
> int oflags = O_CREAT | O_RDWR;
> + struct stat sb;
> +
> + stat(filename, &sb);
> + if (!(((sb.st_mode & S_IFMT) == S_IFREG) || ((sb.st_mode & S_IFMT) == S_IFBLK))) {
> + fprintf (stderr, "%s is not a regular file or block device\n", filename);
> + return NULL;
> + }
This one seems to be too restrict.
I prefer to block char/pipe/dir and some other obvious wrong ones other
than only allowing regular and block ones.
Thanks,
Qu
>
> if (!(flags & OPEN_CTREE_WRITES))
> oflags = O_RDONLY;
>
next prev parent reply other threads:[~2016-03-17 9:04 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-16 15:26 [PATCH] btrfs-progs: add stat check in open_ctree_fs_info Austin S. Hemmelgarn
2016-03-17 8:58 ` Duncan
2016-03-17 11:25 ` Austin S. Hemmelgarn
2016-03-17 9:04 ` Qu Wenruo [this message]
2016-03-17 11:22 ` Austin S. Hemmelgarn
2016-03-18 0:38 ` Qu Wenruo
2016-03-18 11:17 ` Austin S. Hemmelgarn
2016-03-18 15:03 ` David Sterba
2016-03-21 0:14 ` Qu Wenruo
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=56EA7314.2080104@cn.fujitsu.com \
--to=quwenruo@cn.fujitsu.com \
--cc=ahferroin7@gmail.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).