diff options
| author | Namhyung Kim <namhyung@gmail.com> | 2010-10-27 21:30:11 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2010-10-27 21:30:11 -0400 |
| commit | 877836905da55e8f2426234f42a89287184949e9 (patch) | |
| tree | eecb60e9b55daaf794a3083f9c48fc94e05d4cd2 /fs/ext4 | |
| parent | bd2d0210cf22f2bd0cef72eb97cf94fc7d31d8cc (diff) | |
| download | kernel_samsung_smdk4412-877836905da55e8f2426234f42a89287184949e9.zip kernel_samsung_smdk4412-877836905da55e8f2426234f42a89287184949e9.tar.gz kernel_samsung_smdk4412-877836905da55e8f2426234f42a89287184949e9.tar.bz2 | |
ext4: Check return value of sb_getblk() and friends
Fail block allocation if sb_getblk() returns NULL. In that case,
sb_find_get_block() also likely to fail so that it should skip
calling ext4_forget().
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/inode.c | 5 | ||||
| -rw-r--r-- | fs/ext4/mballoc.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 58604fe..077c3c9 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -761,6 +761,11 @@ static int ext4_alloc_branch(handle_t *handle, struct inode *inode, * parent to disk. */ bh = sb_getblk(inode->i_sb, new_blocks[n-1]); + if (unlikely(!bh)) { + err = -EIO; + goto failed; + } + branch[n].bh = bh; lock_buffer(bh); BUFFER_TRACE(bh, "call get_create_access"); diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index d732ef5..611c866 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -4537,6 +4537,8 @@ void ext4_free_blocks(handle_t *handle, struct inode *inode, if (!bh) tbh = sb_find_get_block(inode->i_sb, block + i); + if (unlikely(!tbh)) + continue; ext4_forget(handle, flags & EXT4_FREE_BLOCKS_METADATA, inode, tbh, block + i); } |