From: Phillip Lougher <phillip@squashfs.org.uk>
To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org
Cc: Phillip Lougher <phillip@squashfs.org.uk>
Subject: [PATCH 2/5] Squashfs: fix corruption checks in squashfs_lookup()
Date: Fri, 6 Sep 2013 04:54:38 +0100 [thread overview]
Message-ID: <1378439682-12830-3-git-send-email-phillip@squashfs.org.uk> (raw)
In-Reply-To: <1378439682-12830-1-git-send-email-phillip@squashfs.org.uk>
The dir_count and size fields when read from disk are sanity
checked for correctness. However, the sanity checks only check the
values are not greater than expected. As dir_count and size were
incorrectly defined as signed ints, this can lead to corrupted values
appearing as negative which are not trapped.
Signed-off-by: Phillip Lougher <phillip@squashfs.org.uk>
---
fs/squashfs/namei.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/fs/squashfs/namei.c b/fs/squashfs/namei.c
index 342a5aa..67cad77 100644
--- a/fs/squashfs/namei.c
+++ b/fs/squashfs/namei.c
@@ -147,7 +147,8 @@ static struct dentry *squashfs_lookup(struct inode *dir, struct dentry *dentry,
struct squashfs_dir_entry *dire;
u64 block = squashfs_i(dir)->start + msblk->directory_table;
int offset = squashfs_i(dir)->offset;
- int err, length, dir_count, size;
+ int err, length;
+ unsigned int dir_count, size;
TRACE("Entered squashfs_lookup [%llx:%x]\n", block, offset);
--
1.8.3.2
next prev parent reply other threads:[~2013-09-06 4:03 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-06 3:54 [PATCH 0/5] Squashfs: extra sanity checks and sanity check fixes Phillip Lougher
2013-09-06 3:54 ` [PATCH 1/5] Squashfs: fix corruption check in get_dir_index_using_name() Phillip Lougher
2013-09-06 3:54 ` Phillip Lougher [this message]
2013-09-06 3:54 ` [PATCH 3/5] Squashfs: fix corruption checks in squashfs_readdir() Phillip Lougher
2013-09-06 3:54 ` [PATCH 4/5] Squashfs: add corruption check in get_dir_index_using_offset() Phillip Lougher
2013-09-06 3:54 ` [PATCH 5/5] Squashfs: add corruption check for type in squashfs_readdir() Phillip Lougher
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=1378439682-12830-3-git-send-email-phillip@squashfs.org.uk \
--to=phillip@squashfs.org.uk \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@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
all inboxes | Powered by JetHome®