diff options
| author | Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> | 2015-05-05 16:24:00 -0700 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-08-07 00:32:09 +0100 |
| commit | 74e08b1cc7be2c4eecdd277484ed89fcacb0d3dd (patch) | |
| tree | 37038e39ef8c07e61450fbb6d34f3fc91c74c5a0 /include | |
| parent | 38787a8ce9e6e053070b12ea19945b962d79d579 (diff) | |
| download | kernel_samsung_smdk4412-74e08b1cc7be2c4eecdd277484ed89fcacb0d3dd.zip kernel_samsung_smdk4412-74e08b1cc7be2c4eecdd277484ed89fcacb0d3dd.tar.gz kernel_samsung_smdk4412-74e08b1cc7be2c4eecdd277484ed89fcacb0d3dd.tar.bz2 | |
nilfs2: fix sanity check of btree level in nilfs_btree_root_broken()
commit d8fd150fe3935e1692bf57c66691e17409ebb9c1 upstream.
The range check for b-tree level parameter in nilfs_btree_root_broken()
is wrong; it accepts the case of "level == NILFS_BTREE_LEVEL_MAX" even
though the level is limited to values in the range of 0 to
(NILFS_BTREE_LEVEL_MAX - 1).
Since the level parameter is read from storage device and used to index
nilfs_btree_path array whose element count is NILFS_BTREE_LEVEL_MAX, it
can cause memory overrun during btree operations if the boundary value
is set to the level parameter on device.
This fixes the broken sanity check and adds a comment to clarify that
the upper bound NILFS_BTREE_LEVEL_MAX is exclusive.
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/nilfs2_fs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/nilfs2_fs.h b/include/linux/nilfs2_fs.h index 7454ad7..d4d512f 100644 --- a/include/linux/nilfs2_fs.h +++ b/include/linux/nilfs2_fs.h @@ -457,7 +457,7 @@ struct nilfs_btree_node { /* level */ #define NILFS_BTREE_LEVEL_DATA 0 #define NILFS_BTREE_LEVEL_NODE_MIN (NILFS_BTREE_LEVEL_DATA + 1) -#define NILFS_BTREE_LEVEL_MAX 14 +#define NILFS_BTREE_LEVEL_MAX 14 /* Max level (exclusive) */ /** * struct nilfs_palloc_group_desc - block group descriptor |