summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhillip Lougher <phillip@squashfs.org.uk>2013-09-03 04:21:52 +0100
committerPhillip Lougher <phillip@squashfs.org.uk>2013-09-06 04:57:53 +0100
commit52e9ce1c0f2060661e147ffaf701a17f2fc0a153 (patch)
treef2aab5b8acc99d967bc507da019e95f6ded80292
parent9dbc41d5d371cb10099c8182552f3915920e69b6 (diff)
downloadop-kernel-dev-52e9ce1c0f2060661e147ffaf701a17f2fc0a153.zip
op-kernel-dev-52e9ce1c0f2060661e147ffaf701a17f2fc0a153.tar.gz
Squashfs: fix corruption checks in squashfs_lookup()
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>
-rw-r--r--fs/squashfs/namei.c3
1 files changed, 2 insertions, 1 deletions
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);
OpenPOWER on IntegriCloud