From: Theodore Ts'o <tytso@mit.edu>
To: Ext4 Developers List <linux-ext4@vger.kernel.org>
Cc: abuchbinder@google.com, Theodore Ts'o <tytso@mit.edu>
Subject: [PATCH 3/5] libext2fs: add stricter checks on the inode size in ext2fs_open2()
Date: Sun, 23 Jul 2017 00:50:33 -0400 [thread overview]
Message-ID: <20170723045035.26019-3-tytso@mit.edu> (raw)
In-Reply-To: <20170723045035.26019-1-tytso@mit.edu>
An inode size larger than the block size can cause userspace programs
to crash.
This problem was found using American Fuzzy Lop.
Reported-by: Adam Buchbinder <abuchbinder@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---
lib/ext2fs/openfs.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/ext2fs/openfs.c b/lib/ext2fs/openfs.c
index 0362b2839..da03bc147 100644
--- a/lib/ext2fs/openfs.c
+++ b/lib/ext2fs/openfs.c
@@ -121,6 +121,7 @@ errcode_t ext2fs_open2(const char *name, const char *io_options,
blk64_t group_block, blk;
char *dest, *cp;
int group_zero_adjust = 0;
+ int inode_size;
#ifdef WORDS_BIGENDIAN
unsigned int groups_per_block;
struct ext2_group_desc *gdp;
@@ -297,7 +298,10 @@ errcode_t ext2fs_open2(const char *name, const char *io_options,
goto cleanup;
}
fs->fragsize = fs->blocksize = EXT2_BLOCK_SIZE(fs->super);
- if (EXT2_INODE_SIZE(fs->super) < EXT2_GOOD_OLD_INODE_SIZE) {
+ inode_size = EXT2_INODE_SIZE(fs->super);
+ if ((inode_size < EXT2_GOOD_OLD_INODE_SIZE) ||
+ (inode_size > fs->blocksize) ||
+ (inode_size & (inode_size - 1))) {
retval = EXT2_ET_CORRUPT_SUPERBLOCK;
goto cleanup;
}
--
2.11.0.rc0.7.gbe5a750
next prev parent reply other threads:[~2017-07-23 4:50 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-23 4:50 [PATCH 1/5] e2fsck: quiet some harmless bitmap warnings Theodore Ts'o
2017-07-23 4:50 ` [PATCH 2/5] e2fsck: don't restart after a critical metadata collision in e2fsck -n mode Theodore Ts'o
2017-07-23 4:50 ` Theodore Ts'o [this message]
2017-07-23 4:50 ` [PATCH 4/5] debugfs: add sanity checking to the string_to_inode() utility function Theodore Ts'o
2017-07-23 4:50 ` [PATCH 5/5] resize2fs: sanity check the free blocks and inode counts Theodore Ts'o
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=20170723045035.26019-3-tytso@mit.edu \
--to=tytso@mit.edu \
--cc=abuchbinder@google.com \
--cc=linux-ext4@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).