From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH v2 2/4] btrfs: fix race between free_stale_devices and close_fs_devices
Date: Thu, 26 Jul 2018 14:53:32 +0800 [thread overview]
Message-ID: <20180726065334.30594-3-anand.jain@oracle.com> (raw)
In-Reply-To: <20180726065334.30594-1-anand.jain@oracle.com>
From: Anand Jain <Anand.Jain@oracle.com>
%fs_devices can be free-ed by btrfs_free_stale_devices() when the
close_fs_devices() drops fs_devices::opened to zero, but close_fs_devices
tries to access the %fs_devices again without the device_list_mutex.
Fix this by bringing the %fs_devices access with in the device_list_mutex.
Stack trace as below.
WARNING: CPU: 1 PID: 4499 at fs/btrfs/volumes.c:1071 close_fs_devices+0xbc7/0xfa0 fs/btrfs/volumes.c:1071
Kernel panic - not syncing: panic_on_warn set ...
::
RIP: 0010:close_fs_devices+0xbc7/0xfa0 fs/btrfs/volumes.c:1071
::
btrfs_close_devices+0x29/0x150 fs/btrfs/volumes.c:1085
open_ctree+0x589/0x7898 fs/btrfs/disk-io.c:3358
btrfs_fill_super fs/btrfs/super.c:1202 [inline]
btrfs_mount_root+0x16df/0x1e70 fs/btrfs/super.c:1593
mount_fs+0xae/0x328 fs/super.c:1277
vfs_kern_mount.part.34+0xd4/0x4d0 fs/namespace.c:1037
vfs_kern_mount+0x40/0x60 fs/namespace.c:1027
btrfs_mount+0x4a1/0x213e fs/btrfs/super.c:1661
mount_fs+0xae/0x328 fs/super.c:1277
Reported-by: syzbot+ceb2606025ec1cc3479c@syzkaller.appspotmail.com
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
v1->v2: Commit log update. Satisfy checkpatch.pl. Remove HEAD..
fs/btrfs/volumes.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 2166c5e7cc01..c62b5e46792e 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -1062,13 +1062,13 @@ static int close_fs_devices(struct btrfs_fs_devices *fs_devices)
list_for_each_entry_safe(device, tmp, &fs_devices->devices, dev_list) {
btrfs_close_one_device(device);
}
- mutex_unlock(&fs_devices->device_list_mutex);
-
WARN_ON(fs_devices->open_devices);
WARN_ON(fs_devices->rw_devices);
fs_devices->opened = 0;
fs_devices->seeding = 0;
+ mutex_unlock(&fs_devices->device_list_mutex);
+
return 0;
}
--
2.7.0
next prev parent reply other threads:[~2018-07-26 8:05 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-26 6:53 [PATCH v2 0/4] Misc volume patch set part2 Anand Jain
2018-07-26 6:53 ` [PATCH v4 1/4] btrfs: drop uuid_mutex in btrfs_free_extra_devids() Anand Jain
2018-07-26 6:53 ` Anand Jain [this message]
2018-08-01 14:29 ` [PATCH v2 2/4] btrfs: fix race between free_stale_devices and close_fs_devices David Sterba
2018-08-02 9:29 ` Anand Jain
2018-08-07 14:59 ` David Sterba
2018-08-08 9:51 ` Anand Jain
2018-07-26 6:53 ` [PATCH 3/4] btrfs: bug_on for num_devices below 0 Anand Jain
2018-07-26 6:53 ` [PATCH v2 4/4] btrfs: add helper btrfs_num_devices() to deduce num_devices Anand Jain
2018-08-01 14:41 ` David Sterba
2018-08-02 10:09 ` Anand Jain
2018-08-02 10:09 ` [PATCH v3 " Anand Jain
2018-08-02 10:11 ` Nikolay Borisov
2018-08-02 12:21 ` David Sterba
2018-08-02 13:07 ` Anand Jain
2018-08-07 15:02 ` David Sterba
2018-08-07 22:43 ` Anand Jain
2018-08-03 12:45 ` [PATCH v4 " Anand Jain
2018-08-03 12:45 ` [PATCH] btrfs: handle the BUG_ON in btrfs_num_devices() Anand Jain
2018-08-03 13:33 ` Nikolay Borisov
2018-08-06 8:57 ` Anand Jain
2018-08-07 17:09 ` David Sterba
2018-08-07 22:51 ` Anand Jain
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=20180726065334.30594-3-anand.jain@oracle.com \
--to=anand.jain@oracle.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).