[RESEND,2/2] ocfs2: add necessary check in case sb_getblk fails

Commit Message

Joseph Qi Sept. 16, 2013, 11:49 a.m. UTC

On 2013/9/7 0:45, Mark Fasheh wrote:
> Reviewed-by: Mark Fasheh <[e-mail]>
> 
> On Thu, Sep 05, 2013 at 04:28:55PM +0800, Rui Xiang wrote:
>> Sb_getblk may retrun an err, so add a check for bh.
>>
>> Signed-off-by: Rui Xiang <[e-mail]>
>> Reviewed-by: Jie Liu <[e-mail]>
>> ---
>>  fs/ocfs2/refcounttree.c | 5 +++++
>>  1 file changed, 5 insertions(+)
>>
>> diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c
>> index 50c1796..22f3f19 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,
>> -- 
>> 1.8.2.2
>>
>>
> --
> Mark Fasheh
> 
> _______________________________________________
> Ocfs2-devel mailing list
> [e-mail]
> https://oss.oracle.com/mailman/listinfo/ocfs2-devel
> 
> 
Need also add a check after calling sb_getblk in
ocfs2_create_xattr_block.

Patch

diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c
index bd2a1f0..8d61105 100644
--- a/fs/ocfs2/xattr.c
+++ b/fs/ocfs2/xattr.c
@@ -2873,6 +2873,12 @@  static int ocfs2_create_xattr_block(struct inode *inode,
 	}
 
 	new_bh = sb_getblk(inode->i_sb, first_blkno);
+	if (!new_bh) {
+		ret = -ENOMEM;
+		mlog_errno(ret);
+		goto end;
+	}
+
 	ocfs2_set_new_buffer_uptodate(INODE_CACHE(inode), new_bh);
 
 	ret = ocfs2_journal_access_xb(ctxt->handle, INODE_CACHE(inode),