redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

xfs: fix double free in xlog_recover_commit_trans

Browse source 
When an error occurs during buffer submission in
xlog_recover_commit_trans(), we free the trans structure twice. Fix
it by only freeing the structure in the caller regardless of the
success or failure of the function.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Dave Chinner 2014-09-29 09:45:32 +10:00 committed by Dave Chinner
parent e9131e50f9
commit 88b863db97
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fs/xfs/xfs_log_recover.c
View file

@ -3528,8 +3528,6 @@ out:
if (!list_empty(&done_list))
list_splice_init(&done_list, &trans->r_itemq);
xlog_recover_free_trans(trans);
error2 = xfs_buf_delwri_submit(&buffer_list);
return error ? error : error2;
}
@ -3554,6 +3552,10 @@ xlog_recovery_process_trans(
if (flags & XLOG_WAS_CONT_TRANS)
flags &= ~XLOG_CONTINUE_TRANS;
/*
* Callees must not free the trans structure. We'll decide if we need to
* free it or not based on the operation being done and it's result.
*/
switch (flags) {
/* expected flag values */
case 0:
@ -3565,6 +3567,8 @@ xlog_recovery_process_trans(
break;
case XLOG_COMMIT_TRANS:
error = xlog_recover_commit_trans(log, trans, pass);
/* success or fail, we are now done with this transaction. */
freeit = true;
break;
/* unexpected flag values */