leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Squashfs: fix corruption check in get_dir_index_using_name()

Browse Source 
Patch "Squashfs: sanity check information from disk" from
Dan Carpenter adds a missing check for corruption in the
"size" field while reading the directory index from disk.

It, however, sets err to -EINVAL, this value is not used later, and
so setting it is completely redundant.  So remove it.

Errors in reading the index are deliberately non-fatal.  If we
get an error in reading the index we just return the part of the
index we have managed to read - the index isn't essential,
just quicker.

Signed-off-by: Phillip Lougher <phillip@squashfs.org.uk>
This commit is contained in:
Phillip Lougher 2013-09-03 04:02:53 +01:00
parent e0125262a2
commit 9dbc41d5d3
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/squashfs/namei.c
View File

@ -104,10 +104,8 @@ static int get_dir_index_using_name(struct super_block *sb,
size = le32_to_cpu(index->size) + 1;
if (size > SQUASHFS_NAME_LEN) {
err = -EINVAL;
if (size > SQUASHFS_NAME_LEN)
break;
}
err = squashfs_read_metadata(sb, index->name, &index_start,
&index_offset, size);