From: Josef Bacik <josef@toxicpanda.com>
To: linux-btrfs@vger.kernel.org, kernel-team@fb.com
Subject: [PATCH 6/8] btrfs: clear BTRFS_ROOT_DEAD_RELOC_TREE before dropping the reloc root
Date: Fri, 13 Mar 2020 11:44:46 -0400 [thread overview]
Message-ID: <20200313154448.53461-7-josef@toxicpanda.com> (raw)
In-Reply-To: <20200313154448.53461-1-josef@toxicpanda.com>
Qu put this in place in order to avoid a use after free in
init_reloc_root. However a previous patch in this series makes the use
after free impossible because at this point we no longer have a
reloc_control set on the fs_info.
So move this to be coupled with clearing the root->reloc_root so we're
consistent with all other operations of the reloc root.
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
---
fs/btrfs/relocation.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 9c8a4a4b2bde..5bbed0ea26e1 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -2291,18 +2291,19 @@ static int clean_dirty_subvols(struct reloc_control *rc)
list_del_init(&root->reloc_dirty_list);
root->reloc_root = NULL;
- if (reloc_root) {
-
- ret2 = btrfs_drop_snapshot(reloc_root, NULL, 0, 1);
- if (ret2 < 0 && !ret)
- ret = ret2;
- }
/*
* Need barrier to ensure clear_bit() only happens after
* root->reloc_root = NULL. Pairs with have_reloc_root.
*/
smp_wmb();
clear_bit(BTRFS_ROOT_DEAD_RELOC_TREE, &root->state);
+
+ if (reloc_root) {
+
+ ret2 = btrfs_drop_snapshot(reloc_root, NULL, 0, 1);
+ if (ret2 < 0 && !ret)
+ ret = ret2;
+ }
btrfs_put_root(root);
} else {
/* Orphan reloc tree, just clean it up */
--
2.24.1
next prev parent reply other threads:[~2020-03-13 15:45 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-13 15:44 [PATCH 0/8][v3] relocation error handling fixes Josef Bacik
2020-03-13 15:44 ` [PATCH 1/8] btrfs: drop block from cache on error in relocation Josef Bacik
2020-03-13 15:44 ` [PATCH 2/8] btrfs: do not init a reloc root if we aren't relocating Josef Bacik
2020-03-13 15:44 ` [PATCH 3/8] btrfs: unset reloc control if we fail to recover Josef Bacik
2020-03-13 15:44 ` [PATCH 4/8] btrfs: free the reloc_control in a consistent way Josef Bacik
2020-03-13 17:18 ` David Sterba
2020-03-13 17:38 ` David Sterba
2020-03-13 17:39 ` Josef Bacik
2020-03-13 15:44 ` [PATCH 5/8] btrfs: run clean_dirty_subvols if we fail to start a trans Josef Bacik
2020-03-13 15:44 ` Josef Bacik [this message]
2020-03-13 15:44 ` [PATCH 7/8] btrfs: hold a ref on the root->reloc_root Josef Bacik
2020-03-13 15:44 ` [PATCH 8/8] btrfs: remove a BUG_ON() from merge_reloc_roots() Josef Bacik
-- strict thread matches above, loose matches on Subject: below --
2020-03-04 16:18 [PATCH 0/8][v2] relocation error handling fixes Josef Bacik
2020-03-04 16:18 ` [PATCH 6/8] btrfs: clear BTRFS_ROOT_DEAD_RELOC_TREE before dropping the reloc root Josef Bacik
2020-03-05 11:41 ` Qu Wenruo
2020-03-05 13:54 ` Josef Bacik
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=20200313154448.53461-7-josef@toxicpanda.com \
--to=josef@toxicpanda.com \
--cc=kernel-team@fb.com \
--cc=linux-btrfs@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).