aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>2007-10-17 02:27:02 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-17 11:42:52 -0400
commit7c9e69faa28027913ee059c285a5ea8382e24b5d (patch)
tree951e6e780da734c61337eb8fef23ac3ad68b1e18 /fs
parent82df39738ba9e02c057fa99b7461a56117d36119 (diff)
ext2/ext3/ext4: add block bitmap validation
When a new block bitmap is read from disk in read_block_bitmap() there are a few bits that should ALWAYS be set. In particular, the blocks given by ext4_blk_bitmap, ext4_inode_bitmap and ext4_inode_table. Validate the block bitmap against these blocks. [akpm@linux-foundation.org: cleanups] Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Andreas Dilger <adilger@clusterfs.com> Acked-by: Mingming Cao <cmm@us.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/ext2/balloc.c56
-rw-r--r--fs/ext3/balloc.c54
-rw-r--r--fs/ext4/balloc.c62
3 files changed, 134 insertions, 38 deletions
diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
index 834ad4c16e2d..ffaa6d845442 100644
--- a/fs/ext2/balloc.c
+++ b/fs/ext2/balloc.c
@@ -69,6 +69,14 @@ struct ext2_group_desc * ext2_get_group_desc(struct super_block * sb,
69 return desc + offset; 69 return desc + offset;
70} 70}
71 71
72static inline int
73block_in_use(unsigned long block, struct super_block *sb, unsigned char *map)
74{
75 return ext2_test_bit ((block -
76 le32_to_cpu(EXT2_SB(sb)->s_es->s_first_data_block)) %
77 EXT2_BLOCKS_PER_GROUP(sb), map);
78}
79
72/* 80/*
73 * Read the bitmap for a given block_group, reading into the specified 81 * Read the bitmap for a given block_group, reading into the specified
74 * slot in the superblock's bitmap cache. 82 * slot in the superblock's bitmap cache.
@@ -78,20 +86,51 @@ struct ext2_group_desc * ext2_get_group_desc(struct super_block * sb,
78static struct buffer_head * 86static struct buffer_head *
79read_block_bitmap(struct super_block *sb, unsigned int block_group) 87read_block_bitmap(struct super_block *sb, unsigned int block_group)
80{ 88{
89 int i;
81 struct ext2_group_desc * desc; 90 struct ext2_group_desc * desc;
82 struct buffer_head * bh = NULL; 91 struct buffer_head * bh = NULL;
83 92 unsigned int bitmap_blk;
93
84 desc = ext2_get_group_desc (sb, block_group, NULL); 94 desc = ext2_get_group_desc (sb, block_group, NULL);
85 if (!desc) 95 if (!desc)
86 goto error_out; 96 return NULL;
87 bh = sb_bread(sb, le32_to_cpu(desc->bg_block_bitmap)); 97 bitmap_blk = le32_to_cpu(desc->bg_block_bitmap);
98 bh = sb_bread(sb, bitmap_blk);
88 if (!bh) 99 if (!bh)
89 ext2_error (sb, "read_block_bitmap", 100 ext2_error (sb, __FUNCTION__,
90 "Cannot read block bitmap - " 101 "Cannot read block bitmap - "
91 "block_group = %d, block_bitmap = %u", 102 "block_group = %d, block_bitmap = %u",
92 block_group, le32_to_cpu(desc->bg_block_bitmap)); 103 block_group, le32_to_cpu(desc->bg_block_bitmap));
93error_out: 104
105 /* check whether block bitmap block number is set */
106 if (!block_in_use(bitmap_blk, sb, bh->b_data)) {
107 /* bad block bitmap */
108 goto error_out;
109 }
110 /* check whether the inode bitmap block number is set */
111 bitmap_blk = le32_to_cpu(desc->bg_inode_bitmap);
112 if (!block_in_use(bitmap_blk, sb, bh->b_data)) {
113 /* bad block bitmap */
114 goto error_out;
115 }
116 /* check whether the inode table block number is set */
117 bitmap_blk = le32_to_cpu(desc->bg_inode_table);
118 for (i = 0; i < EXT2_SB(sb)->s_itb_per_group; i++, bitmap_blk++) {
119 if (!block_in_use(bitmap_blk, sb, bh->b_data)) {
120 /* bad block bitmap */
121 goto error_out;
122 }
123 }
124
94 return bh; 125 return bh;
126
127error_out:
128 brelse(bh);
129 ext2_error(sb, __FUNCTION__,
130 "Invalid block bitmap - "
131 "block_group = %d, block = %u",
132 block_group, bitmap_blk);
133 return NULL;
95} 134}
96 135
97/* 136/*
@@ -583,13 +622,6 @@ unsigned long ext2_count_free_blocks (struct super_block * sb)
583#endif 622#endif
584} 623}
585 624
586static inline int
587block_in_use(unsigned long block, struct super_block *sb, unsigned char *map)
588{
589 return ext2_test_bit ((block -
590 le32_to_cpu(EXT2_SB(sb)->s_es->s_first_data_block)) %
591 EXT2_BLOCKS_PER_GROUP(sb), map);
592}
593 625
594static inline int test_root(int a, int b) 626static inline int test_root(int a, int b)
595{ 627{
diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
index d3758ee9cb5b..7a87d15523be 100644
--- a/fs/ext3/balloc.c
+++ b/fs/ext3/balloc.c
@@ -80,6 +80,14 @@ struct ext3_group_desc * ext3_get_group_desc(struct super_block * sb,
80 return desc + offset; 80 return desc + offset;
81} 81}
82 82
83static inline int
84block_in_use(ext3_fsblk_t block, struct super_block *sb, unsigned char *map)
85{
86 return ext3_test_bit ((block -
87 le32_to_cpu(EXT3_SB(sb)->s_es->s_first_data_block)) %
88 EXT3_BLOCKS_PER_GROUP(sb), map);
89}
90
83/** 91/**
84 * read_block_bitmap() 92 * read_block_bitmap()
85 * @sb: super block 93 * @sb: super block
@@ -93,20 +101,51 @@ struct ext3_group_desc * ext3_get_group_desc(struct super_block * sb,
93static struct buffer_head * 101static struct buffer_head *
94read_block_bitmap(struct super_block *sb, unsigned int block_group) 102read_block_bitmap(struct super_block *sb, unsigned int block_group)
95{ 103{
104 int i;
96 struct ext3_group_desc * desc; 105 struct ext3_group_desc * desc;
97 struct buffer_head * bh = NULL; 106 struct buffer_head * bh = NULL;
107 ext3_fsblk_t bitmap_blk;
98 108
99 desc = ext3_get_group_desc (sb, block_group, NULL); 109 desc = ext3_get_group_desc (sb, block_group, NULL);
100 if (!desc) 110 if (!desc)
101 goto error_out; 111 return NULL;
102 bh = sb_bread(sb, le32_to_cpu(desc->bg_block_bitmap)); 112 bitmap_blk = le32_to_cpu(desc->bg_block_bitmap);
113 bh = sb_bread(sb, bitmap_blk);
103 if (!bh) 114 if (!bh)
104 ext3_error (sb, "read_block_bitmap", 115 ext3_error (sb, __FUNCTION__,
105 "Cannot read block bitmap - " 116 "Cannot read block bitmap - "
106 "block_group = %d, block_bitmap = %u", 117 "block_group = %d, block_bitmap = %u",
107 block_group, le32_to_cpu(desc->bg_block_bitmap)); 118 block_group, le32_to_cpu(desc->bg_block_bitmap));
108error_out: 119
120 /* check whether block bitmap block number is set */
121 if (!block_in_use(bitmap_blk, sb, bh->b_data)) {
122 /* bad block bitmap */
123 goto error_out;
124 }
125 /* check whether the inode bitmap block number is set */
126 bitmap_blk = le32_to_cpu(desc->bg_inode_bitmap);
127 if (!block_in_use(bitmap_blk, sb, bh->b_data)) {
128 /* bad block bitmap */
129 goto error_out;
130 }
131 /* check whether the inode table block number is set */
132 bitmap_blk = le32_to_cpu(desc->bg_inode_table);
133 for (i = 0; i < EXT3_SB(sb)->s_itb_per_group; i++, bitmap_blk++) {
134 if (!block_in_use(bitmap_blk, sb, bh->b_data)) {
135 /* bad block bitmap */
136 goto error_out;
137 }
138 }
139
109 return bh; 140 return bh;
141
142error_out:
143 brelse(bh);
144 ext3_error(sb, __FUNCTION__,
145 "Invalid block bitmap - "
146 "block_group = %d, block = %lu",
147 block_group, bitmap_blk);
148 return NULL;
110} 149}
111/* 150/*
112 * The reservation window structure operations 151 * The reservation window structure operations
@@ -1733,13 +1772,6 @@ ext3_fsblk_t ext3_count_free_blocks(struct super_block *sb)
1733#endif 1772#endif
1734} 1773}
1735 1774
1736static inline int
1737block_in_use(ext3_fsblk_t block, struct super_block *sb, unsigned char *map)
1738{
1739 return ext3_test_bit ((block -
1740 le32_to_cpu(EXT3_SB(sb)->s_es->s_first_data_block)) %
1741 EXT3_BLOCKS_PER_GROUP(sb), map);
1742}
1743 1775
1744static inline int test_root(int a, int b) 1776static inline int test_root(int a, int b)
1745{ 1777{
diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
index 8d59eec2e82b..b74bf4368441 100644
--- a/fs/ext4/balloc.c
+++ b/fs/ext4/balloc.c
@@ -100,6 +100,15 @@ struct ext4_group_desc * ext4_get_group_desc(struct super_block * sb,
100 return desc; 100 return desc;
101} 101}
102 102
103static inline int
104block_in_use(ext4_fsblk_t block, struct super_block *sb, unsigned char *map)
105{
106 ext4_grpblk_t offset;
107
108 ext4_get_group_no_and_offset(sb, block, NULL, &offset);
109 return ext4_test_bit (offset, map);
110}
111
103/** 112/**
104 * read_block_bitmap() 113 * read_block_bitmap()
105 * @sb: super block 114 * @sb: super block
@@ -113,21 +122,53 @@ struct ext4_group_desc * ext4_get_group_desc(struct super_block * sb,
113static struct buffer_head * 122static struct buffer_head *
114read_block_bitmap(struct super_block *sb, unsigned int block_group) 123read_block_bitmap(struct super_block *sb, unsigned int block_group)
115{ 124{
125 int i;
116 struct ext4_group_desc * desc; 126 struct ext4_group_desc * desc;
117 struct buffer_head * bh = NULL; 127 struct buffer_head * bh = NULL;
128 ext4_fsblk_t bitmap_blk;
118 129
119 desc = ext4_get_group_desc (sb, block_group, NULL); 130 desc = ext4_get_group_desc (sb, block_group, NULL);
120 if (!desc) 131 if (!desc)
121 goto error_out; 132 return NULL;
122 bh = sb_bread(sb, ext4_block_bitmap(sb, desc)); 133 bitmap_blk = ext4_block_bitmap(sb, desc);
134 bh = sb_bread(sb, bitmap_blk);
123 if (!bh) 135 if (!bh)
124 ext4_error (sb, "read_block_bitmap", 136 ext4_error (sb, __FUNCTION__,
125 "Cannot read block bitmap - " 137 "Cannot read block bitmap - "
126 "block_group = %d, block_bitmap = %llu", 138 "block_group = %d, block_bitmap = %llu",
127 block_group, 139 block_group, bitmap_blk);
128 ext4_block_bitmap(sb, desc)); 140
129error_out: 141 /* check whether block bitmap block number is set */
142 if (!block_in_use(bitmap_blk, sb, bh->b_data)) {
143 /* bad block bitmap */
144 goto error_out;
145 }
146
147 /* check whether the inode bitmap block number is set */
148 bitmap_blk = ext4_inode_bitmap(sb, desc);
149 if (!block_in_use(bitmap_blk, sb, bh->b_data)) {
150 /* bad block bitmap */
151 goto error_out;
152 }
153 /* check whether the inode table block number is set */
154 bitmap_blk = ext4_inode_table(sb, desc);
155 for (i = 0; i < EXT4_SB(sb)->s_itb_per_group; i++, bitmap_blk++) {
156 if (!block_in_use(bitmap_blk, sb, bh->b_data)) {
157 /* bad block bitmap */
158 goto error_out;
159 }
160 }
161
130 return bh; 162 return bh;
163
164error_out:
165 brelse(bh);
166 ext4_error(sb, __FUNCTION__,
167 "Invalid block bitmap - "
168 "block_group = %d, block = %llu",
169 block_group, bitmap_blk);
170 return NULL;
171
131} 172}
132/* 173/*
133 * The reservation window structure operations 174 * The reservation window structure operations
@@ -1747,15 +1788,6 @@ ext4_fsblk_t ext4_count_free_blocks(struct super_block *sb)
1747#endif 1788#endif
1748} 1789}
1749 1790
1750static inline int
1751block_in_use(ext4_fsblk_t block, struct super_block *sb, unsigned char *map)
1752{
1753 ext4_grpblk_t offset;
1754
1755 ext4_get_group_no_and_offset(sb, block, NULL, &offset);
1756 return ext4_test_bit (offset, map);
1757}
1758
1759static inline int test_root(int a, int b) 1791static inline int test_root(int a, int b)
1760{ 1792{
1761 int num = b; 1793 int num = b;