Commit 0ec060d1 authored by Ryusuke Konishi's avatar Ryusuke Konishi Committed by Linus Torvalds

nilfs2: verify metadata sizes read from disk

Add code to check sizes of on-disk data of metadata files such as inode
size, segment usage size, DAT entry size, and checkpoint size.  Although
these sizes are read from disk, the current implementation doesn't check
them.

If these sizes are not sane on disk, it can cause out-of-range access to
metadata or memory access overrun on metadata block buffers due to
overflow in sundry calculations.

Both lower limit and upper limit of metadata sizes are verified to
prevent these issues.
Signed-off-by: default avatarRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Cc: Andreas Rohner <andreas.rohner@gmx.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f9f32c44
...@@ -942,6 +942,18 @@ int nilfs_cpfile_read(struct super_block *sb, size_t cpsize, ...@@ -942,6 +942,18 @@ int nilfs_cpfile_read(struct super_block *sb, size_t cpsize,
struct inode *cpfile; struct inode *cpfile;
int err; int err;
if (cpsize > sb->s_blocksize) {
printk(KERN_ERR
"NILFS: too large checkpoint size: %zu bytes.\n",
cpsize);
return -EINVAL;
} else if (cpsize < NILFS_MIN_CHECKPOINT_SIZE) {
printk(KERN_ERR
"NILFS: too small checkpoint size: %zu bytes.\n",
cpsize);
return -EINVAL;
}
cpfile = nilfs_iget_locked(sb, NULL, NILFS_CPFILE_INO); cpfile = nilfs_iget_locked(sb, NULL, NILFS_CPFILE_INO);
if (unlikely(!cpfile)) if (unlikely(!cpfile))
return -ENOMEM; return -ENOMEM;
......
...@@ -484,6 +484,18 @@ int nilfs_dat_read(struct super_block *sb, size_t entry_size, ...@@ -484,6 +484,18 @@ int nilfs_dat_read(struct super_block *sb, size_t entry_size,
struct nilfs_dat_info *di; struct nilfs_dat_info *di;
int err; int err;
if (entry_size > sb->s_blocksize) {
printk(KERN_ERR
"NILFS: too large DAT entry size: %zu bytes.\n",
entry_size);
return -EINVAL;
} else if (entry_size < NILFS_MIN_DAT_ENTRY_SIZE) {
printk(KERN_ERR
"NILFS: too small DAT entry size: %zu bytes.\n",
entry_size);
return -EINVAL;
}
dat = nilfs_iget_locked(sb, NULL, NILFS_DAT_INO); dat = nilfs_iget_locked(sb, NULL, NILFS_DAT_INO);
if (unlikely(!dat)) if (unlikely(!dat))
return -ENOMEM; return -ENOMEM;
......
...@@ -1169,6 +1169,18 @@ int nilfs_sufile_read(struct super_block *sb, size_t susize, ...@@ -1169,6 +1169,18 @@ int nilfs_sufile_read(struct super_block *sb, size_t susize,
void *kaddr; void *kaddr;
int err; int err;
if (susize > sb->s_blocksize) {
printk(KERN_ERR
"NILFS: too large segment usage size: %zu bytes.\n",
susize);
return -EINVAL;
} else if (susize < NILFS_MIN_SEGMENT_USAGE_SIZE) {
printk(KERN_ERR
"NILFS: too small segment usage size: %zu bytes.\n",
susize);
return -EINVAL;
}
sufile = nilfs_iget_locked(sb, NULL, NILFS_SUFILE_INO); sufile = nilfs_iget_locked(sb, NULL, NILFS_SUFILE_INO);
if (unlikely(!sufile)) if (unlikely(!sufile))
return -ENOMEM; return -ENOMEM;
......
...@@ -399,6 +399,16 @@ static int nilfs_store_disk_layout(struct the_nilfs *nilfs, ...@@ -399,6 +399,16 @@ static int nilfs_store_disk_layout(struct the_nilfs *nilfs,
return -EINVAL; return -EINVAL;
nilfs->ns_inode_size = le16_to_cpu(sbp->s_inode_size); nilfs->ns_inode_size = le16_to_cpu(sbp->s_inode_size);
if (nilfs->ns_inode_size > nilfs->ns_blocksize) {
printk(KERN_ERR "NILFS: too large inode size: %d bytes.\n",
nilfs->ns_inode_size);
return -EINVAL;
} else if (nilfs->ns_inode_size < NILFS_MIN_INODE_SIZE) {
printk(KERN_ERR "NILFS: too small inode size: %d bytes.\n",
nilfs->ns_inode_size);
return -EINVAL;
}
nilfs->ns_first_ino = le32_to_cpu(sbp->s_first_ino); nilfs->ns_first_ino = le32_to_cpu(sbp->s_first_ino);
nilfs->ns_blocks_per_segment = le32_to_cpu(sbp->s_blocks_per_segment); nilfs->ns_blocks_per_segment = le32_to_cpu(sbp->s_blocks_per_segment);
......
...@@ -82,6 +82,8 @@ struct nilfs_inode { ...@@ -82,6 +82,8 @@ struct nilfs_inode {
__le32 i_pad; __le32 i_pad;
}; };
#define NILFS_MIN_INODE_SIZE 128
/** /**
* struct nilfs_super_root - structure of super root * struct nilfs_super_root - structure of super root
* @sr_sum: check sum * @sr_sum: check sum
...@@ -482,6 +484,8 @@ struct nilfs_dat_entry { ...@@ -482,6 +484,8 @@ struct nilfs_dat_entry {
__le64 de_rsv; __le64 de_rsv;
}; };
#define NILFS_MIN_DAT_ENTRY_SIZE 32
/** /**
* struct nilfs_snapshot_list - snapshot list * struct nilfs_snapshot_list - snapshot list
* @ssl_next: next checkpoint number on snapshot list * @ssl_next: next checkpoint number on snapshot list
...@@ -520,6 +524,8 @@ struct nilfs_checkpoint { ...@@ -520,6 +524,8 @@ struct nilfs_checkpoint {
struct nilfs_inode cp_ifile_inode; struct nilfs_inode cp_ifile_inode;
}; };
#define NILFS_MIN_CHECKPOINT_SIZE (64 + NILFS_MIN_INODE_SIZE)
/* checkpoint flags */ /* checkpoint flags */
enum { enum {
NILFS_CHECKPOINT_SNAPSHOT, NILFS_CHECKPOINT_SNAPSHOT,
...@@ -615,6 +621,8 @@ struct nilfs_segment_usage { ...@@ -615,6 +621,8 @@ struct nilfs_segment_usage {
__le32 su_flags; __le32 su_flags;
}; };
#define NILFS_MIN_SEGMENT_USAGE_SIZE 16
/* segment usage flag */ /* segment usage flag */
enum { enum {
NILFS_SEGMENT_USAGE_ACTIVE, NILFS_SEGMENT_USAGE_ACTIVE,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment