Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp2231563imm; Mon, 28 May 2018 04:25:09 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrDfLBKKFcMTaJ0hEFS20+pfxFHArWVgDbpEfeHHFMNKM2r/H4lpIKXLlQQtmjEe614wPWG X-Received: by 2002:a62:5754:: with SMTP id l81-v6mr13130903pfb.56.1527506709328; Mon, 28 May 2018 04:25:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527506709; cv=none; d=google.com; s=arc-20160816; b=gjNI7J2yeGuNhjnORXR97BNLihRJlE9NwIS0Z510WRx8ZqXUrhZW83IQ3sZRacRlLl jpLOnYtY9O50YF6AmgfxR8TbkWL/mdFkeCmvV1GcmSGDnyPSXbEvnie/0N+3r9izxKZx HZM4L4pP4F0nbJWME1IO4LJEi/7DdfCXzuB4kFG1miYxwIE1XK6aWds3l8l2O8K7s5pD W9nJ2JRf08Dd0+I/v9+MmkCBr+ri1gys/y+S3Ryk1l0FQeefdJUx4CTd9DUlgM6Dwebm PBHN2e0Wzx/rTU2b1RoVLTgI7fKBPXvXKHT/dLzVbdn9W2RFuWfCUXdfimfl4mBaYlxX jh2Q== 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=2oZOWUI56OCORqxlOYxJfRRQYfcB6TIztfvX+EevTTU=; b=DVAa9SIkOx6itEMuZbS9g6S2ie/66lUbGn2YopFU1cQA4OSZulBSM1SQCvOc0XwRUS D3ix59LKpmg3Jl5cW54qmjTuGNtqa9/IVJUBvke+4jEbJw27oQVfLxMytWo2wMA830Te c2AhJgNT7YbPyYGlN6IuScmgObpiiRFTtdKDSmlpMn/htJkCMxgjFPqfBPT02rP6Mr2+ U8yc8vbmMIGofjtqh5EcauC3zGbFSkDgBUCKNkXxfoZ7l/oAVML2KwzryrRRc6f0lcRv iieiRyYPy5Ill/ZesNVs5H1mHUT1AxGeDBMT77/qWConqld3wC3iz1YJQbDCTXi9xO+P I6yQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ld/r7YCg; 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 r9-v6si10420966pge.1.2018.05.28.04.24.54; Mon, 28 May 2018 04:25:09 -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=ld/r7YCg; 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 S1424880AbeE1LYG (ORCPT + 99 others); Mon, 28 May 2018 07:24:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:39768 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1424879AbeE1LXS (ORCPT ); Mon, 28 May 2018 07:23:18 -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 2902B20883; Mon, 28 May 2018 11:23:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1527506597; bh=xBAPVFTmL79aAnrI7zyceN47cjE8vnZNwfVo1wMk8k4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ld/r7YCge6QFHYYg1eUms04HhjoaOFRuCnbh9DhOzksWuekm8MQ+8p1yM5n526ghF G30aj/BI1krdhZN/W642/Aj2uMt0Bg5IEymKVRWnZxj29R6Z+jUVViGsy84Qd58V7n oCMnqwgWPTQgDAg0XKMD++9uyOlckEFHsBi9CIzs= 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 4.4 090/268] md raid10: fix NULL deference in handle_write_completed() Date: Mon, 28 May 2018 12:01:04 +0200 Message-Id: <20180528100212.393539772@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180528100202.045206534@linuxfoundation.org> References: <20180528100202.045206534@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 4.4-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 @@ -2630,7 +2630,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 (!r10_bio->devs[m].bio->bi_error) { rdev_clear_badblocks( @@ -2645,7 +2646,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 (!r10_bio->devs[m].repl_bio->bi_error) {