mirror of
https://github.com/torvalds/linux.git
synced 2024-11-23 04:31:50 +00:00
ocfs2: free meta_ac and data_ac when ocfs2_start_trans fails in ocfs2_xattr_set()
In ocfs2_xattr_set(), if ocfs2_start_trans failed, meta_ac and data_ac should be free. Otherwise, It would lead to a memory leak. Signed-off-by: Younger Liu <younger.liu@huawei.com> Cc: Joseph Qi <joseph.qi@huawei.com> Reviewed-by: Jie Liu <jeff.liu@oracle.com> Cc: Mark Fasheh <mfasheh@suse.com> Cc: Joel Becker <jlbec@evilplan.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
17caf9555e
commit
6ea437a363
@ -3505,7 +3505,7 @@ int ocfs2_xattr_set(struct inode *inode,
|
||||
int ret, credits, ref_meta = 0, ref_credits = 0;
|
||||
struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
|
||||
struct inode *tl_inode = osb->osb_tl_inode;
|
||||
struct ocfs2_xattr_set_ctxt ctxt = { NULL, NULL, };
|
||||
struct ocfs2_xattr_set_ctxt ctxt = { NULL, NULL, NULL, };
|
||||
struct ocfs2_refcount_tree *ref_tree = NULL;
|
||||
|
||||
struct ocfs2_xattr_info xi = {
|
||||
@ -3609,13 +3609,14 @@ int ocfs2_xattr_set(struct inode *inode,
|
||||
if (IS_ERR(ctxt.handle)) {
|
||||
ret = PTR_ERR(ctxt.handle);
|
||||
mlog_errno(ret);
|
||||
goto cleanup;
|
||||
goto out_free_ac;
|
||||
}
|
||||
|
||||
ret = __ocfs2_xattr_set_handle(inode, di, &xi, &xis, &xbs, &ctxt);
|
||||
|
||||
ocfs2_commit_trans(osb, ctxt.handle);
|
||||
|
||||
out_free_ac:
|
||||
if (ctxt.data_ac)
|
||||
ocfs2_free_alloc_context(ctxt.data_ac);
|
||||
if (ctxt.meta_ac)
|
||||
|
Loading…
Reference in New Issue
Block a user