mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 17:01:14 +00:00
ext4: ext4_fill_super shouldn't return 0 on corruption
At the start of ext4_fill_super, ret is set to -EINVAL, and any failure path
out of that function returns ret. However, the generic_check_addressable
clause sets ret = 0 (if it passes), which means that a subsequent failure (e.g.
a group checksum error) returns 0 even though the mount should fail. This
causes vfs_kern_mount in turn to think that the mount succeeded, leading to an
oops.
A simple fix is to avoid using ret for the generic_check_addressable check,
which was last changed in commit 30ca22c70e
.
Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
parent
0587aa3d11
commit
5a9ae68a34
1 changed files with 3 additions and 2 deletions
|
@ -3265,13 +3265,14 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
|
||||||
* Test whether we have more sectors than will fit in sector_t,
|
* Test whether we have more sectors than will fit in sector_t,
|
||||||
* and whether the max offset is addressable by the page cache.
|
* and whether the max offset is addressable by the page cache.
|
||||||
*/
|
*/
|
||||||
ret = generic_check_addressable(sb->s_blocksize_bits,
|
err = generic_check_addressable(sb->s_blocksize_bits,
|
||||||
ext4_blocks_count(es));
|
ext4_blocks_count(es));
|
||||||
if (ret) {
|
if (err) {
|
||||||
ext4_msg(sb, KERN_ERR, "filesystem"
|
ext4_msg(sb, KERN_ERR, "filesystem"
|
||||||
" too large to mount safely on this system");
|
" too large to mount safely on this system");
|
||||||
if (sizeof(sector_t) < 8)
|
if (sizeof(sector_t) < 8)
|
||||||
ext4_msg(sb, KERN_WARNING, "CONFIG_LBDAF not enabled");
|
ext4_msg(sb, KERN_WARNING, "CONFIG_LBDAF not enabled");
|
||||||
|
ret = err;
|
||||||
goto failed_mount;
|
goto failed_mount;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue