From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2C185C43381 for ; Mon, 18 Feb 2019 14:09:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E9319217D9 for ; Mon, 18 Feb 2019 14:09:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550498966; bh=bLmPVNf30r13MCVpvUTeeaZVTSnIBNjzjGkH5KHvyxw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=NjOz+3ZcJ4eatkEYCvB8XnHT0I21dkB46E2Gwfc8MM97Z4km8mM67dXkilAj9hUgP 7hDw1TF+w6zjBuyikNGjKxw63lNJ3rdVmJDn37n3GPDAHTPN+4f4RqORERAK+yqq/4 2Vkh0ihmru+YL3Kt+PHZvxlA96n7y0s09WdNzopU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391205AbfBROJZ (ORCPT ); Mon, 18 Feb 2019 09:09:25 -0500 Received: from mail.kernel.org ([198.145.29.99]:52944 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391183AbfBROJX (ORCPT ); Mon, 18 Feb 2019 09:09:23 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 105B3217D7; Mon, 18 Feb 2019 14:09:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550498962; bh=bLmPVNf30r13MCVpvUTeeaZVTSnIBNjzjGkH5KHvyxw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UMI+MUgZISw9ezV60kx67YUvrA4e/pluwm3PpMXuPb8gKf5fcyLm619sh/MFoUk1o Neq/Kekz/vg+38P48IwRLntg8GODx5wUuox1yv+zV0V/R9T5z71J+V6c0Az4IcQBz0 574FM1pL9OqpPK9U1ZTcL5a+T2sSCPpN9KMX2eTk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lars Ellenberg , Jens Axboe , Sasha Levin Subject: [PATCH 3.18 033/108] drbd: disconnect, if the wrong UUIDs are attached on a connected peer Date: Mon, 18 Feb 2019 14:43:29 +0100 Message-Id: <20190218133521.071992147@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190218133519.525507231@linuxfoundation.org> References: <20190218133519.525507231@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit b17b59602b6dcf8f97a7dc7bc489a48388d7063a ] With "on-no-data-accessible suspend-io", DRBD requires the next attach or connect to be to the very same data generation uuid tag it lost last. If we first lost connection to the peer, then later lost connection to our own disk, we would usually refuse to re-connect to the peer, because it presents the wrong data set. However, if the peer first connects without a disk, and then attached its disk, we accepted that same wrong data set, which would be "unexpected" by any user of that DRBD and cause "undefined results" (read: very likely data corruption). The fix is to forcefully disconnect as soon as we notice that the peer attached to the "wrong" dataset. Signed-off-by: Lars Ellenberg Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/block/drbd/drbd_receiver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 4f18ec5198fb..6b2b278bb2b7 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -3889,7 +3889,7 @@ static int receive_uuids(struct drbd_connection *connection, struct packet_info kfree(device->p_uuid); device->p_uuid = p_uuid; - if (device->state.conn < C_CONNECTED && + if ((device->state.conn < C_CONNECTED || device->state.pdsk == D_DISKLESS) && device->state.disk < D_INCONSISTENT && device->state.role == R_PRIMARY && (device->ed_uuid & ~((u64)1)) != (p_uuid[UI_CURRENT] & ~((u64)1))) { -- 2.19.1