From: Eric Sandeen <sandeen@sandeen.net>
To: Eric Sandeen <sandeen@redhat.com>, xfs-oss <xfs@oss.sgi.com>
Subject: Re: [PATCH] xfs: avoid double free on xlog_recover_commit_trans error
Date: Sat, 02 Aug 2014 11:37:09 -0500 [thread overview]
Message-ID: <53DD13B5.5050000@sandeen.net> (raw)
In-Reply-To: <53DBAE0B.6020000@redhat.com>
On 8/1/14, 10:11 AM, Eric Sandeen wrote:
> xlog_recover_process_data() frees the transaction on
> any error out of the oh_flags switch statement, but
> in the XLOG_COMMIT_TRANS / xlog_recover_commit_trans() case,
> the transaction has already been freed in
> xlog_recover_commit_trans() before the error is returned.
>
> Avoid this by only freeing the transaction in
> xlog_recover_commit_trans() if no error will be returned.
>
> (Coverity spotted this)
Ok, I see that Mark already sent this (thanks Mark, sorry for not
seeing / remembering) and he was scolded for not thinking hard enough
about the problem. I guess I'm not thinking hard enough either...
Sorry 'bout that.
-Eric
> Signed-off-by: Eric Sandeen <sandeen@redhat.com>
> ---
>
> diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
> index 981af0f..e634ffd 100644
> --- a/fs/xfs/xfs_log_recover.c
> +++ b/fs/xfs/xfs_log_recover.c
> @@ -3514,9 +3514,11 @@ 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);
> + /* caller will free trans on error */
> + if (!error && !error2)
> + xlog_recover_free_trans(trans);
> +
> return error ? error : error2;
> }
>
>
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs
>
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
prev parent reply other threads:[~2014-08-02 16:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-01 15:11 [PATCH] xfs: avoid double free on xlog_recover_commit_trans error Eric Sandeen
2014-08-02 16:37 ` Eric Sandeen [this message]
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=53DD13B5.5050000@sandeen.net \
--to=sandeen@sandeen.net \
--cc=sandeen@redhat.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