From: Eric Sandeen <sandeen@redhat.com>
To: linux-xfs <linux-xfs@vger.kernel.org>
Cc: "Xu, Wen" <wen.xu@gatech.edu>
Subject: [PATCH] xfs: verify size-vs-format for symlinks & dirs
Date: Sun, 26 Aug 2018 15:31:35 -0500 [thread overview]
Message-ID: <b0919ac0-deb3-4a0c-f755-309dd65c3206@redhat.com> (raw)
Today, xfs_ifork_verify_data() will simply skip verification if the inode
claims to be in non-local format. However, nothing catches the case where
the size for the format is too small to be non-local. xfs_repair tests
for this mismatch in process_check_inode_sizes(), so do the same in this
verifier.
Reported-by: Xu, Wen <wen.xu@gatech.edu>
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=200925
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---
diff --git a/fs/xfs/libxfs/xfs_inode_fork.c b/fs/xfs/libxfs/xfs_inode_fork.c
index f9acf1d436f6..e032986d3f67 100644
--- a/fs/xfs/libxfs/xfs_inode_fork.c
+++ b/fs/xfs/libxfs/xfs_inode_fork.c
@@ -704,12 +704,21 @@ xfs_ifork_verify_data(
struct xfs_inode *ip,
struct xfs_ifork_ops *ops)
{
- /* Non-local data fork, we're done. */
- if (ip->i_d.di_format != XFS_DINODE_FMT_LOCAL)
- return NULL;
+ int mode = VFS_I(ip)->i_mode;
+
+ if (ip->i_d.di_format != XFS_DINODE_FMT_LOCAL) {
+ /* Small size for dir & symlink must be local */
+ if ((S_ISDIR(mode) || S_ISLNK(mode)) &&
+ (ip->i_d.di_size <= XFS_IFORK_DSIZE(ip))) {
+ return __this_address;
+ } else {
+ /* Non-local data fork, we're done. */
+ return NULL;
+ }
+ }
/* Check the inline data fork if there is one. */
- switch (VFS_I(ip)->i_mode & S_IFMT) {
+ switch (mode & S_IFMT) {
case S_IFDIR:
return ops->verify_dir(ip);
case S_IFLNK:
next reply other threads:[~2018-08-27 0:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-26 20:31 Eric Sandeen [this message]
2018-08-27 1:43 ` [PATCH] xfs: verify size-vs-format for symlinks & dirs Dave Chinner
2018-08-27 2:19 ` Eric Sandeen
2018-08-27 4:41 ` Dave Chinner
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=b0919ac0-deb3-4a0c-f755-309dd65c3206@redhat.com \
--to=sandeen@redhat.com \
--cc=linux-xfs@vger.kernel.org \
--cc=wen.xu@gatech.edu \
/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).