https://github.com/torvalds/linux
Revision a3f94cb99a854fa381fe7fadd97c4f61633717a5 authored by Phillip Lougher on 02 August 2018, 15:45:15 UTC, committed by Linus Torvalds on 02 August 2018, 16:34:02 UTC
Previously in squashfs_readpage() when copying data into the page cache, it used the length of the datablock read from the filesystem (after decompression). However, if the filesystem has been corrupted this data block may be short, which will leave pages unfilled. The fix for this is to compute the expected number of bytes to copy from the inode size, and use this to detect if the block is short. Signed-off-by: Phillip Lougher <phillip@squashfs.org.uk> Tested-by: Willy Tarreau <w@1wt.eu> Cc: Анатолий Тросиненко <anatoly.trosinenko@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 71755ee
Tip revision: a3f94cb99a854fa381fe7fadd97c4f61633717a5 authored by Phillip Lougher on 02 August 2018, 15:45:15 UTC
Squashfs: Compute expected length from inode size rather than block length
Squashfs: Compute expected length from inode size rather than block length
Tip revision: a3f94cb
| File | Mode | Size |
|---|---|---|
| 9p | ||
| adfs | ||
| affs | ||
| afs | ||
| autofs | ||
| befs | ||
| bfs | ||
| btrfs | ||
| cachefiles | ||
| ceph | ||
| cifs | ||
| coda | ||
| configfs | ||
| cramfs | ||
| crypto | ||
| debugfs | ||
| devpts | ||
| dlm | ||
| ecryptfs | ||
| efivarfs | ||
| efs | ||
| exofs | ||
| exportfs | ||
| ext2 | ||
| ext4 | ||
| f2fs | ||
| fat | ||
| freevxfs | ||
| fscache | ||
| fuse | ||
| gfs2 | ||
| hfs | ||
| hfsplus | ||
| hostfs | ||
| hpfs | ||
| hugetlbfs | ||
| isofs | ||
| jbd2 | ||
| jffs2 | ||
| jfs | ||
| kernfs | ||
| lockd | ||
| minix | ||
| nfs | ||
| nfs_common | ||
| nfsd | ||
| nilfs2 | ||
| nls | ||
| notify | ||
| ntfs | ||
| ocfs2 | ||
| omfs | ||
| openpromfs | ||
| orangefs | ||
| overlayfs | ||
| proc | ||
| pstore | ||
| qnx4 | ||
| qnx6 | ||
| quota | ||
| ramfs | ||
| reiserfs | ||
| romfs | ||
| squashfs | ||
| sysfs | ||
| sysv | ||
| tracefs | ||
| ubifs | ||
| udf | ||
| ufs | ||
| xfs | ||
| Kconfig | -rw-r--r-- | 7.4 KB |
| Kconfig.binfmt | -rw-r--r-- | 7.1 KB |
| Makefile | -rw-r--r-- | 4.2 KB |
| aio.c | -rw-r--r-- | 49.6 KB |
| anon_inodes.c | -rw-r--r-- | 4.9 KB |
| attr.c | -rw-r--r-- | 9.7 KB |
| bad_inode.c | -rw-r--r-- | 5.3 KB |
| binfmt_aout.c | -rw-r--r-- | 10.8 KB |
| binfmt_elf.c | -rw-r--r-- | 63.7 KB |
| binfmt_elf_fdpic.c | -rw-r--r-- | 47.3 KB |
| binfmt_em86.c | -rw-r--r-- | 2.8 KB |
| binfmt_flat.c | -rw-r--r-- | 27.7 KB |
| binfmt_misc.c | -rw-r--r-- | 18.3 KB |
| binfmt_script.c | -rw-r--r-- | 3.0 KB |
| block_dev.c | -rw-r--r-- | 53.7 KB |
| buffer.c | -rw-r--r-- | 89.6 KB |
| char_dev.c | -rw-r--r-- | 16.6 KB |
| compat.c | -rw-r--r-- | 3.4 KB |
| compat_binfmt_elf.c | -rw-r--r-- | 3.4 KB |
| compat_ioctl.c | -rw-r--r-- | 42.2 KB |
| coredump.c | -rw-r--r-- | 21.2 KB |
| d_path.c | -rw-r--r-- | 11.2 KB |
| dax.c | -rw-r--r-- | 46.7 KB |
| dcache.c | -rw-r--r-- | 83.4 KB |
| dcookies.c | -rw-r--r-- | 7.0 KB |
| direct-io.c | -rw-r--r-- | 40.8 KB |
| drop_caches.c | -rw-r--r-- | 1.6 KB |
| eventfd.c | -rw-r--r-- | 10.8 KB |
| eventpoll.c | -rw-r--r-- | 63.1 KB |
| exec.c | -rw-r--r-- | 46.9 KB |
| fcntl.c | -rw-r--r-- | 23.1 KB |
| fhandle.c | -rw-r--r-- | 6.8 KB |
| file.c | -rw-r--r-- | 23.4 KB |
| file_table.c | -rw-r--r-- | 8.6 KB |
| filesystems.c | -rw-r--r-- | 6.2 KB |
| fs-writeback.c | -rw-r--r-- | 70.7 KB |
| fs_pin.c | -rw-r--r-- | 2.0 KB |
| fs_struct.c | -rw-r--r-- | 3.3 KB |
| inode.c | -rw-r--r-- | 56.4 KB |
| internal.h | -rw-r--r-- | 5.3 KB |
| ioctl.c | -rw-r--r-- | 17.4 KB |
| iomap.c | -rw-r--r-- | 35.6 KB |
| libfs.c | -rw-r--r-- | 31.8 KB |
| locks.c | -rw-r--r-- | 73.4 KB |
| mbcache.c | -rw-r--r-- | 12.0 KB |
| mount.h | -rw-r--r-- | 3.9 KB |
| mpage.c | -rw-r--r-- | 20.9 KB |
| namei.c | -rw-r--r-- | 122.6 KB |
| namespace.c | -rw-r--r-- | 85.8 KB |
| no-block.c | -rw-r--r-- | 688 bytes |
| nsfs.c | -rw-r--r-- | 6.2 KB |
| open.c | -rw-r--r-- | 29.2 KB |
| pipe.c | -rw-r--r-- | 27.2 KB |
| pnode.c | -rw-r--r-- | 15.3 KB |
| pnode.h | -rw-r--r-- | 1.9 KB |
| posix_acl.c | -rw-r--r-- | 21.4 KB |
| proc_namespace.c | -rw-r--r-- | 7.8 KB |
| read_write.c | -rw-r--r-- | 47.5 KB |
| readdir.c | -rw-r--r-- | 11.4 KB |
| select.c | -rw-r--r-- | 34.6 KB |
| seq_file.c | -rw-r--r-- | 24.5 KB |
| signalfd.c | -rw-r--r-- | 9.0 KB |
| splice.c | -rw-r--r-- | 39.6 KB |
| stack.c | -rw-r--r-- | 2.5 KB |
| stat.c | -rw-r--r-- | 19.3 KB |
| statfs.c | -rw-r--r-- | 9.4 KB |
| super.c | -rw-r--r-- | 40.7 KB |
| sync.c | -rw-r--r-- | 9.9 KB |
| timerfd.c | -rw-r--r-- | 13.3 KB |
| userfaultfd.c | -rw-r--r-- | 49.9 KB |
| utimes.c | -rw-r--r-- | 7.5 KB |
| xattr.c | -rw-r--r-- | 23.4 KB |
Computing file changes ...
