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=-6.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,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 0FF50C282DD for ; Thu, 23 May 2019 19:40:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D1E9620881 for ; Thu, 23 May 2019 19:40:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558640426; bh=F3ZuU/gwy/KLeQZjm6lkPc1LIF72DdiJ0KLUwHFmL9k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=hpTDlbEUQcPu+D0E3BXarwEJENfc2iD5sSH0Kc9VqkAb9kZ7e/vWsNefZ/u7ShFjK wDu50SXDsmUZJwobFmALez5vsZ/u+vmvRtnvLXLX1vKBlUmsjW49FCWIbacfJm4dLM fj8Zef6JFo4+4rHR5pPkdoG2QArSmrnq2fnNzMKA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390215AbfEWTVP (ORCPT ); Thu, 23 May 2019 15:21:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:58406 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389504AbfEWTVM (ORCPT ); Thu, 23 May 2019 15:21:12 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 2944220863; Thu, 23 May 2019 19:21:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558639271; bh=F3ZuU/gwy/KLeQZjm6lkPc1LIF72DdiJ0KLUwHFmL9k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zJU246g8yuUR4K2gatTCgs8h4n2Lhp4WwRgp3wTAuNuJiSjN36gcth4sLCLeEporM JmIf6ssyqWxMG4ABbYgqadQeW4akyXoIryjPN0IKthYetG/IuvZOL3+a6jAv6OlnoA /+gtA3Luvf2cchAdX4uMEqJm59vjFDSUf6XKGaUs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Xiao Ni , NeilBrown , Yufen Yu , Song Liu Subject: [PATCH 5.0 035/139] md: add mddev->pers to avoid potential NULL pointer dereference Date: Thu, 23 May 2019 21:05:23 +0200 Message-Id: <20190523181725.350796905@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190523181720.120897565@linuxfoundation.org> References: <20190523181720.120897565@linuxfoundation.org> User-Agent: quilt/0.66 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 From: Yufen Yu commit ee37e62191a59d253fc916b9fc763deb777211e2 upstream. When doing re-add, we need to ensure rdev->mddev->pers is not NULL, which can avoid potential NULL pointer derefence in fallowing add_bound_rdev(). Fixes: a6da4ef85cef ("md: re-add a failed disk") Cc: Xiao Ni Cc: NeilBrown Cc: # 4.4+ Reviewed-by: NeilBrown Signed-off-by: Yufen Yu Signed-off-by: Song Liu Signed-off-by: Greg Kroah-Hartman --- drivers/md/md.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -2852,8 +2852,10 @@ state_store(struct md_rdev *rdev, const err = 0; } } else if (cmd_match(buf, "re-add")) { - if (test_bit(Faulty, &rdev->flags) && (rdev->raid_disk == -1) && - rdev->saved_raid_disk >= 0) { + if (!rdev->mddev->pers) + err = -EINVAL; + else if (test_bit(Faulty, &rdev->flags) && (rdev->raid_disk == -1) && + rdev->saved_raid_disk >= 0) { /* clear_bit is performed _after_ all the devices * have their local Faulty bit cleared. If any writes * happen in the meantime in the local node, they