Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp2229360imm; Mon, 28 May 2018 04:22:28 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJT3RavpYWU3Zr/VsUZB4UiEr1e24ELqvnASInI2mRK6n+WG7jPMRlrB0KoKuSJLoTY3cqJ X-Received: by 2002:a17:902:566:: with SMTP id 93-v6mr2911231plf.385.1527506548136; Mon, 28 May 2018 04:22:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527506548; cv=none; d=google.com; s=arc-20160816; b=ASUjrUEDLEQ2R/sk0EZD1DeYlhFGWzwnRyWYTFy1hQKJ60H4KoFlUMpD9g0DCdAS2q b6AbU8GffqBEB7+MG0XiSvRpCP5fnJ085xV7Wbiq36cJI5C9NspCOzHz/D4jXsElTqEC FbjO9aXi2GZdE5Bel2MKDYTChNEb6b0X6PabKNNYbkI7EsJRZaEwGkejdmI/HiF6tDNS nCJzIPBGEJze9DWheNUe0n8NkTGkSdXAQAbr1gfBDaUTqcMvyx3/A/zMrBV27omtFHhh dWgWWjMXVfJHc9oJO7iFzBeAZzTvlx1KUV0dXCkPAvIXOfkHA69rT6llmQFO6jicXast HyZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=TmXFgFWYWO2YEKT9aUIiosWKr7jYCR2pRQINV3Tding=; b=YeP40Jcqata3nCIzx3BFlM54vo0fmu8GqAoJrFcqTJ7P1ZeENQBIGt2mBJsoMVKr9P ijc2JLxps4EFKMISA8fiaZehu37K2UWfrZwtUuEYG5bu7UpQYoI04PWgVq22Y3Mz4CQW yp7TO03AySHstIR1EsqpMFawhc42YQTUV3EUwimuP/q2IZ+/0QPAyQFBoX3LNZDf4VI7 PqKZKaH7grD+wbQwUN1cnJql0SKmyoSqbebQQ9tS4CAzjVtpZp7HDTRXE64yPkjVKhRG PDqXRhN8iGr2XlYqIUR/Kb738l0INw4DxIbJFL6oqH7t5qxe+QMpmHujxXK0SkEDR2a4 iMmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=fC5cxPSP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l61-v6si29348629plb.507.2018.05.28.04.22.13; Mon, 28 May 2018 04:22:28 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=fC5cxPSP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1424863AbeE1LVV (ORCPT + 99 others); Mon, 28 May 2018 07:21:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:38146 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1424837AbeE1LUx (ORCPT ); Mon, 28 May 2018 07:20:53 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) (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 443EE2089D; Mon, 28 May 2018 11:20:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1527506452; bh=6FJFhrtcOL7lvzCE01sNLRZF69GtXPeZXJ/QXgh8fF0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fC5cxPSPk/vc/gcJ8mtWQqXKLoQsjHZ8rvutZsMGXMSe/WQYu+eZRCDusiWaO4/bG i1AC2luB1RQ2BBAc4rLOBIpwt7nkErxeq4WNtwai5/APZQmyCtTxrAqHrGNrNJEy+Z kZdrCZDhtqUsqnbtoTT8UrKdLH77kt0r4MS1MvL0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, NeilBrown , Yufen Yu , Shaohua Li , Sasha Levin Subject: [PATCH 3.18 060/185] md raid10: fix NULL deference in handle_write_completed() Date: Mon, 28 May 2018 12:01:41 +0200 Message-Id: <20180528100055.980589061@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180528100050.700971285@linuxfoundation.org> References: <20180528100050.700971285@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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. ------------------ From: Yufen Yu [ Upstream commit 01a69cab01c184d3786af09e9339311123d63d22 ] In the case of 'recover', an r10bio with R10BIO_WriteError & R10BIO_IsRecover will be progressed by handle_write_completed(). This function traverses all r10bio->devs[copies]. If devs[m].repl_bio != NULL, it thinks conf->mirrors[dev].replacement is also not NULL. However, this is not always true. When there is an rdev of raid10 has replacement, then each r10bio ->devs[m].repl_bio != NULL in conf->r10buf_pool. However, in 'recover', even if corresponded replacement is NULL, it doesn't clear r10bio ->devs[m].repl_bio, resulting in replacement NULL deference. This bug was introduced when replacement support for raid10 was added in Linux 3.3. As NeilBrown suggested: Elsewhere the determination of "is this device part of the resync/recovery" is made by resting bio->bi_end_io. If this is end_sync_write, then we tried to write here. If it is NULL, then we didn't try to write. Fixes: 9ad1aefc8ae8 ("md/raid10: Handle replacement devices during resync.") Cc: stable (V3.3+) Suggested-by: NeilBrown Signed-off-by: Yufen Yu Signed-off-by: Shaohua Li Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/md/raid10.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -2754,7 +2754,8 @@ static void handle_write_completed(struc for (m = 0; m < conf->copies; m++) { int dev = r10_bio->devs[m].devnum; rdev = conf->mirrors[dev].rdev; - if (r10_bio->devs[m].bio == NULL) + if (r10_bio->devs[m].bio == NULL || + r10_bio->devs[m].bio->bi_end_io == NULL) continue; if (test_bit(BIO_UPTODATE, &r10_bio->devs[m].bio->bi_flags)) { @@ -2770,7 +2771,8 @@ static void handle_write_completed(struc md_error(conf->mddev, rdev); } rdev = conf->mirrors[dev].replacement; - if (r10_bio->devs[m].repl_bio == NULL) + if (r10_bio->devs[m].repl_bio == NULL || + r10_bio->devs[m].repl_bio->bi_end_io == NULL) continue; if (test_bit(BIO_UPTODATE, &r10_bio->devs[m].repl_bio->bi_flags)) {