mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
nilfs2: reject filesystem with unsupported block size
This inserts sanity check that refuses to mount a filesystem with unsupported block size. Previously, kernel code of nilfs was looking only limitation of devices though mkfs.nilfs2 limits the range of block sizes; there was no check that prevents rec_len overflow with larger block sizes. With this change, block sizes larger than 64KB or smaller than 1KB will get rejected explicitly by kernel. Signed-off-by: Ryusuke Konishi <[email protected]>
This commit is contained in:
parent
6cda9fa257
commit
89c0fd014d
2 changed files with 14 additions and 1 deletions
|
|
@ -671,7 +671,7 @@ int init_nilfs(struct the_nilfs *nilfs, struct nilfs_sb_info *sbi, char *data)
|
|||
goto out;
|
||||
}
|
||||
|
||||
blocksize = sb_min_blocksize(sb, BLOCK_SIZE);
|
||||
blocksize = sb_min_blocksize(sb, NILFS_MIN_BLOCK_SIZE);
|
||||
if (!blocksize) {
|
||||
printk(KERN_ERR "NILFS: unable to set blocksize\n");
|
||||
err = -EINVAL;
|
||||
|
|
@ -690,6 +690,13 @@ int init_nilfs(struct the_nilfs *nilfs, struct nilfs_sb_info *sbi, char *data)
|
|||
goto failed_sbh;
|
||||
|
||||
blocksize = BLOCK_SIZE << le32_to_cpu(sbp->s_log_block_size);
|
||||
if (blocksize < NILFS_MIN_BLOCK_SIZE ||
|
||||
blocksize > NILFS_MAX_BLOCK_SIZE) {
|
||||
printk(KERN_ERR "NILFS: couldn't mount because of unsupported "
|
||||
"filesystem blocksize %d\n", blocksize);
|
||||
err = -EINVAL;
|
||||
goto failed_sbh;
|
||||
}
|
||||
if (sb->s_blocksize != blocksize) {
|
||||
int hw_blocksize = bdev_logical_block_size(sb->s_bdev);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue