From: Johannes Thumshirn <jthumshirn@suse.de>
To: David Sterba <dsterba@suse.com>
Cc: Linux BTRFS Mailinglist <linux-btrfs@vger.kernel.org>,
Johannes Thumshirn <jthumshirn@suse.de>
Subject: [PATCH 3/5] btrfs: handle allocation failure in strdup
Date: Tue, 12 Nov 2019 13:24:14 +0100 [thread overview]
Message-ID: <20191112122416.30672-4-jthumshirn@suse.de> (raw)
In-Reply-To: <20191112122416.30672-1-jthumshirn@suse.de>
Gracefully handle allocation failures in btrfs_close_one_device()'s
rcu_string_strdup() instead of crashing the machine.
Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
---
fs/btrfs/volumes.c | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 0a2a73907563..e5864ca3bb3b 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -1064,7 +1064,7 @@ static void btrfs_close_bdev(struct btrfs_device *device)
static int btrfs_close_one_device(struct btrfs_device *device)
{
struct btrfs_fs_devices *fs_devices = device->fs_devices;
- struct btrfs_device *new_device;
+ struct btrfs_device *new_device = NULL;
struct rcu_string *name;
new_device = btrfs_alloc_device(NULL, &device->devid,
@@ -1072,6 +1072,15 @@ static int btrfs_close_one_device(struct btrfs_device *device)
if (IS_ERR(new_device))
goto err_close_device;
+ /* Safe because we are under uuid_mutex */
+ if (device->name) {
+ name = rcu_string_strdup(device->name->str, GFP_NOFS);
+ if (!name)
+ goto err_free_device;
+
+ rcu_assign_pointer(new_device->name, name);
+ }
+
if (test_bit(BTRFS_DEV_STATE_WRITEABLE, &device->dev_state) &&
device->devid != BTRFS_DEV_REPLACE_DEVID) {
list_del_init(&device->dev_alloc_list);
@@ -1085,13 +1094,6 @@ static int btrfs_close_one_device(struct btrfs_device *device)
if (device->bdev)
fs_devices->open_devices--;
- /* Safe because we are under uuid_mutex */
- if (device->name) {
- name = rcu_string_strdup(device->name->str, GFP_NOFS);
- BUG_ON(!name); /* -ENOMEM */
- rcu_assign_pointer(new_device->name, name);
- }
-
list_replace_rcu(&device->dev_list, &new_device->dev_list);
new_device->fs_devices = device->fs_devices;
@@ -1100,6 +1102,10 @@ static int btrfs_close_one_device(struct btrfs_device *device)
return 0;
+err_free_device:
+ if (new_device)
+ btrfs_free_device(new_device);
+
err_close_device:
btrfs_close_bdev(device);
if (device->bdev) {
--
2.16.4
next prev parent reply other threads:[~2019-11-12 12:24 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-12 12:24 [PATCH 0/5] remove BUG_ON()s in btrfs_close_one_device() Johannes Thumshirn
2019-11-12 12:24 ` [PATCH 1/5] btrfs: decrement number of open devices after closing the device not before Johannes Thumshirn
2019-11-12 12:24 ` [PATCH 2/5] btrfs: handle device allocation failure in btrfs_close_one_device() Johannes Thumshirn
2019-11-12 12:24 ` Johannes Thumshirn [this message]
2019-11-12 12:24 ` [PATCH 4/5] btrfs: handle error return of close_fs_devices() Johannes Thumshirn
2019-11-12 12:24 ` [PATCH 5/5] btrfs: remove final BUG_ON() in close_fs_devices() Johannes Thumshirn
2019-11-12 12:41 ` Qu Wenruo
2019-11-12 12:55 ` David Sterba
2019-11-12 12:59 ` Johannes Thumshirn
2019-11-12 12:40 ` [PATCH 0/5] remove BUG_ON()s in btrfs_close_one_device() Qu Wenruo
2019-11-12 12:57 ` Johannes Thumshirn
2019-11-12 12:49 ` David Sterba
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=20191112122416.30672-4-jthumshirn@suse.de \
--to=jthumshirn@suse.de \
--cc=dsterba@suse.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).