From: Dave Chinner <david@fromorbit.com>
To: xfs@oss.sgi.com
Subject: [PATCH 3/4] xfs: fix double free in xlog_recover_commit_trans
Date: Tue, 26 Aug 2014 11:21:40 +1000 [thread overview]
Message-ID: <1409016101-9511-4-git-send-email-david@fromorbit.com> (raw)
In-Reply-To: <1409016101-9511-1-git-send-email-david@fromorbit.com>
From: Dave Chinner <dchinner@redhat.com>
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>
---
fs/xfs/xfs_log_recover.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 460cf98..23895d5 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -3524,8 +3524,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;
}
@@ -3571,6 +3569,11 @@ xlog_recovery_process_ophdr(
if (flags & XLOG_WAS_CONT_TRANS)
flags &= ~XLOG_CONTINUE_TRANS;
+ /*
+ * Callees must not free the trans structure. We own it, so 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:
@@ -3582,7 +3585,8 @@ xlog_recovery_process_ophdr(
break;
case XLOG_COMMIT_TRANS:
error = xlog_recover_commit_trans(log, trans, pass);
- break;
+ xlog_recover_free_trans(trans);
+ return error;
/* unexpected flag values */
case XLOG_UNMOUNT_TRANS:
--
2.0.0
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2014-08-26 1:21 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-26 1:21 [RFC, PATCH 0/4] xfs: clean up xlog_recover_process_data Dave Chinner
2014-08-26 1:21 ` [PATCH 1/4] xfs: refactor xlog_recover_process_data() Dave Chinner
2014-08-26 4:09 ` Christoph Hellwig
2014-08-26 4:55 ` Dave Chinner
2014-08-26 12:41 ` Brian Foster
2014-08-26 22:34 ` Dave Chinner
2014-08-27 11:19 ` Brian Foster
2014-08-28 0:47 ` Dave Chinner
2014-08-26 1:21 ` [PATCH 2/4] xfs: recovery of XLOG_UNMOUNT_TRANS leaks memory Dave Chinner
2014-08-26 12:41 ` Brian Foster
2014-08-26 1:21 ` Dave Chinner [this message]
2014-08-26 12:42 ` [PATCH 3/4] xfs: fix double free in xlog_recover_commit_trans Brian Foster
2014-08-26 1:21 ` [PATCH 4/4] xfs: reorganise transaction recovery item code Dave Chinner
2014-08-26 12:40 ` [RFC, PATCH 0/4] xfs: clean up xlog_recover_process_data Brian Foster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1409016101-9511-4-git-send-email-david@fromorbit.com \
--to=david@fromorbit.com \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox