summaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/refcounttree.c
diff options
context:
space:
mode:
authorRui Xiang2013-11-13 00:06:55 +0100
committerLinus Torvalds2013-11-13 04:09:00 +0100
commit58796207cf09552706b0c3e0669f2ce52ea6cee1 (patch)
treec3023177cd5414a1199da59ba8d52f74f7a64d32 /fs/ocfs2/refcounttree.c
parentocfs2: return ENOMEM when sb_getblk() fails (diff)
downloadkernel-qcow2-linux-58796207cf09552706b0c3e0669f2ce52ea6cee1.tar.gz
kernel-qcow2-linux-58796207cf09552706b0c3e0669f2ce52ea6cee1.tar.xz
kernel-qcow2-linux-58796207cf09552706b0c3e0669f2ce52ea6cee1.zip
ocfs2: add necessary check in case sb_getblk() fails
sb_getblk() may return an err, so add a check for bh. [joseph.qi@huawei.com: also add a check after calling sb_getblk() in ocfs2_create_xattr_block()] Signed-off-by: Rui Xiang <rui.xiang@huawei.com> Reviewed-by: Jie Liu <jeff.liu@oracle.com> Reviewed-by: Mark Fasheh <mfasheh@suse.de> Cc: Joel Becker <jlbec@evilplan.org> Cc: Joseph Qi <joseph.qi@huawei.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ocfs2/refcounttree.c')
-rw-r--r--fs/ocfs2/refcounttree.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c
index 70d083e60d40..55767e1ba724 100644
--- a/fs/ocfs2/refcounttree.c
+++ b/fs/ocfs2/refcounttree.c
@@ -612,6 +612,11 @@ static int ocfs2_create_refcount_tree(struct inode *inode,
}
new_bh = sb_getblk(inode->i_sb, first_blkno);
+ if (!new_bh) {
+ ret = -ENOMEM;
+ mlog_errno(ret);
+ goto out_commit;
+ }
ocfs2_set_new_buffer_uptodate(&new_tree->rf_ci, new_bh);
ret = ocfs2_journal_access_rb(handle, &new_tree->rf_ci, new_bh,