From: Philipp Reisner <philipp.reisner@linbit.com>
To: linux-kernel@vger.kernel.org, Jens Axboe <axboe@kernel.dk>
Cc: drbd-dev@lists.linbit.com
Subject: [Drbd-dev] [PATCH 03/19] drbd: prevent NULL pointer deref when resuming diskless primary
Date: Tue, 4 Aug 2015 14:56:27 +0200 [thread overview]
Message-ID: <1438693003-17554-4-git-send-email-philipp.reisner@linbit.com> (raw)
In-Reply-To: <1438693003-17554-1-git-send-email-philipp.reisner@linbit.com>
From: Lars Ellenberg <lars.ellenberg@linbit.com>
In a multiple error scenario, we may end up with a "frozen" Primary,
that has no access to any data (no local disk, no replication link).
If we then resume-io, we try to generate a new data generation id,
which will fail if there is no longer a local disk.
Double check for available local data,
which prevents the NULL pointer deref.
If we are diskless, turn the resume-io in this situation
into the first stage of a "force down", by bumping the "effective" data
gen id, which will prevent later attach or connect to the former data
set without first being demoted (deconfigured).
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
---
drivers/block/drbd/drbd_nl.c | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index 0152f0f..66e8acd 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -2920,7 +2920,30 @@ int drbd_adm_resume_io(struct sk_buff *skb, struct genl_info *info)
mutex_lock(&adm_ctx.resource->adm_mutex);
device = adm_ctx.device;
if (test_bit(NEW_CUR_UUID, &device->flags)) {
- drbd_uuid_new_current(device);
+ if (get_ldev_if_state(device, D_ATTACHING)) {
+ drbd_uuid_new_current(device);
+ put_ldev(device);
+ } else {
+ /* This is effectively a multi-stage "forced down".
+ * The NEW_CUR_UUID bit is supposedly only set, if we
+ * lost the replication connection, and are configured
+ * to freeze IO and wait for some fence-peer handler.
+ * So we still don't have a replication connection.
+ * And now we don't have a local disk either. After
+ * resume, we will fail all pending and new IO, because
+ * we don't have any data anymore. Which means we will
+ * eventually be able to terminate all users of this
+ * device, and then take it down. By bumping the
+ * "effective" data uuid, we make sure that you really
+ * need to tear down before you reconfigure, we will
+ * the refuse to re-connect or re-attach (because no
+ * matching real data uuid exists).
+ */
+ u64 val;
+ get_random_bytes(&val, sizeof(u64));
+ drbd_set_ed_uuid(device, val);
+ drbd_warn(device, "Resumed without access to data; please tear down before attempting to re-configure.\n");
+ }
clear_bit(NEW_CUR_UUID, &device->flags);
}
drbd_suspend_io(device);
--
1.9.1
next prev parent reply other threads:[~2015-08-04 12:56 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-04 12:56 [Drbd-dev] [PATCH 00/19] RFC DRBD updates for the 4.3 merge window (part II) Philipp Reisner
2015-08-04 12:56 ` [Drbd-dev] [PATCH 01/19] drbd: Rename asender to ack_receiver Philipp Reisner
2015-08-04 12:56 ` [Drbd-dev] [PATCH 02/19] drbd: Create a dedicated workqueue for sending acks on the control connection Philipp Reisner
2015-08-04 12:56 ` Philipp Reisner [this message]
2015-08-04 12:56 ` [Drbd-dev] [PATCH 04/19] drbd: debugfs: expose ed_data_gen_id Philipp Reisner
2015-08-04 12:56 ` [Drbd-dev] [PATCH 05/19] drbd: use resource name in workqueue Philipp Reisner
2015-08-04 12:56 ` [Drbd-dev] [PATCH 06/19] drbd: avoid redefinition of BITS_PER_PAGE Philipp Reisner
2015-08-04 12:56 ` [Drbd-dev] [PATCH 07/19] drbd: use bitmap_weight() helper, don't open code Philipp Reisner
2015-08-04 12:56 ` [Drbd-dev] [PATCH 08/19] drbd: fix spurious alert level printk Philipp Reisner
2015-08-04 12:56 ` [Drbd-dev] [PATCH 09/19] drbd: fix queue limit setup for discard Philipp Reisner
2015-08-04 12:56 ` [Drbd-dev] [PATCH 10/19] drbd: make drbd known to lsblk: use bd_link_disk_holder Philipp Reisner
2015-08-04 12:56 ` [Drbd-dev] [PATCH 11/19] lru_cache: Converted lc_seq_printf_status to return void Philipp Reisner
2015-08-04 12:56 ` [Drbd-dev] [PATCH 12/19] drbd: don't block forever in disconnect during resync if fencing=r-a-stonith Philipp Reisner
2015-08-04 12:56 ` [Drbd-dev] [PATCH 13/19] drbd: fix memory leak in drbd_adm_resize Philipp Reisner
2015-08-04 12:56 ` [Drbd-dev] [PATCH 14/19] drbd: fix "endless" transfer log walk in protocol A Philipp Reisner
2015-08-04 12:56 ` [Drbd-dev] [PATCH 15/19] drbd: make suspend_io() / resume_io() must be thread and recursion safe Philipp Reisner
2015-08-04 12:56 ` [Drbd-dev] [PATCH 16/19] drbd: separate out __al_write_transaction helper function Philipp Reisner
2015-08-04 12:56 ` [Drbd-dev] [PATCH 17/19] drbd: avoid potential deadlock during handshake Philipp Reisner
2015-08-04 12:56 ` [Drbd-dev] [PATCH 18/19] drbd: fix error path during resize Philipp Reisner
2015-08-04 12:56 ` [Drbd-dev] [PATCH 19/19] MAINTAINERS: Updated information for DRBD DRIVER Philipp Reisner
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=1438693003-17554-4-git-send-email-philipp.reisner@linbit.com \
--to=philipp.reisner@linbit.com \
--cc=axboe@kernel.dk \
--cc=drbd-dev@lists.linbit.com \
--cc=linux-kernel@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