summaryrefslogtreecommitdiffstats
path: root/fs/squashfs/xattr.h
diff options
context:
space:
mode:
authorPhillip Lougher <phillip@lougher.demon.co.uk>2011-05-24 05:05:22 +0200
committerPhillip Lougher <phillip@lougher.demon.co.uk>2011-05-25 19:21:32 +0200
commit37986f63c81bf23c856f65fc5e4830550e7f3d5b (patch)
treeaafcc2078b469fb8fdb6e43255e136fcc7059dc9 /fs/squashfs/xattr.h
parentSquashfs: add sanity checks to xattr reading at mount time (diff)
downloadlinux-37986f63c81bf23c856f65fc5e4830550e7f3d5b.tar.xz
linux-37986f63c81bf23c856f65fc5e4830550e7f3d5b.zip
Squashfs: add sanity checks to id reading at mount time
Fsfuzzer generates corrupted filesystems which throw a warn_on in kmalloc. One of these is due to a corrupted superblock no_ids field. Fix this by checking that the number of bytes to be read (and allocated) does not extend into the next filesystem structure. Also add a couple of other sanity checks of the mount-time id table structures. Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
Diffstat (limited to '')
-rw-r--r--fs/squashfs/xattr.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/squashfs/xattr.h b/fs/squashfs/xattr.h
index b634efce4bde..9b3dd6c4c1fe 100644
--- a/fs/squashfs/xattr.h
+++ b/fs/squashfs/xattr.h
@@ -31,6 +31,7 @@ static inline __le64 *squashfs_read_xattr_id_table(struct super_block *sb,
u64 start, u64 *xattr_table_start, int *xattr_ids)
{
ERROR("Xattrs in filesystem, these will be ignored\n");
+ *xattr_table_start = start;
return ERR_PTR(-ENOTSUPP);
}