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=-12.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED 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 3AD24C4360F for ; Tue, 2 Apr 2019 22:42:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E3AD720700 for ; Tue, 2 Apr 2019 22:42:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=fb.com header.i=@fb.com header.b="Dot94F38"; dkim=pass (1024-bit key) header.d=fb.onmicrosoft.com header.i=@fb.onmicrosoft.com header.b="iI0t23mZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726193AbfDBWmD (ORCPT ); Tue, 2 Apr 2019 18:42:03 -0400 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:58090 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726071AbfDBWmD (ORCPT ); Tue, 2 Apr 2019 18:42:03 -0400 Received: from pps.filterd (m0044010.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x32MYp1p027133; Tue, 2 Apr 2019 15:41:03 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : references : in-reply-to : content-type : content-id : content-transfer-encoding : mime-version; s=facebook; bh=l+FF+fAqAeCABAQmha1eynF6BBwOubPmUGkTdrW5YHI=; b=Dot94F38LvlnByspVQYqtddenncORGtt9lzf6N+OjtLULDrrYNjAg95wLR0KD/BoirJH FnqoWiVGOb5hbazE8tbVR8r1Hk1haas+cb9eyWtnj8mdILkw0Fv7NxrMfeATToNG42Yq YueRfDSNJBec2gZI1tEnhsq02Di1tOiRQbk= Received: from mail.thefacebook.com ([199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 2rmgdh026s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 02 Apr 2019 15:41:03 -0700 Received: from prn-mbx06.TheFacebook.com (2620:10d:c081:6::20) by prn-hub04.TheFacebook.com (2620:10d:c081:35::128) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.1.1713.5; Tue, 2 Apr 2019 15:41:02 -0700 Received: from prn-hub03.TheFacebook.com (2620:10d:c081:35::127) by prn-mbx06.TheFacebook.com (2620:10d:c081:6::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.1.1713.5; Tue, 2 Apr 2019 15:41:02 -0700 Received: from NAM03-CO1-obe.outbound.protection.outlook.com (192.168.54.28) by o365-in.thefacebook.com (192.168.16.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.1.1713.5 via Frontend Transport; Tue, 2 Apr 2019 15:41:02 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.onmicrosoft.com; s=selector1-fb-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=l+FF+fAqAeCABAQmha1eynF6BBwOubPmUGkTdrW5YHI=; b=iI0t23mZJdbqK64CJSCqxLzT49mcsN9GLKGPP+YjkXjDSrh5T3xeLC+aVBxGbwOvaCDpv4OYYsfenv5s8UsczdRh2DpYvEcjVaZGrdLzgs5o+GjJoyKdTfWu24Dz7wgzxir0Eox5UKA5r2rdWOajt0kNPOCR8HMsmJgjCQne+KM= Received: from MWHPR15MB1165.namprd15.prod.outlook.com (10.175.2.19) by MWHPR15MB1392.namprd15.prod.outlook.com (10.173.234.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1750.19; Tue, 2 Apr 2019 22:41:00 +0000 Received: from MWHPR15MB1165.namprd15.prod.outlook.com ([fe80::5185:8137:2f1d:7171]) by MWHPR15MB1165.namprd15.prod.outlook.com ([fe80::5185:8137:2f1d:7171%2]) with mapi id 15.20.1750.017; Tue, 2 Apr 2019 22:41:00 +0000 From: Song Liu To: NeilBrown CC: Yufen Yu , "axboe@kernel.dk" , "xni@redhat.com" , "linux-raid@vger.kernel.org" , "stable@vger.kernel.org" Subject: Re: [PATCH v2] md: add mddev->pers to avoid potential NULL pointer dereference Thread-Topic: [PATCH v2] md: add mddev->pers to avoid potential NULL pointer dereference Thread-Index: AQHU6RvatPnllxREzU+KoN0nHJ1xpaYpXyKAgAAY8AA= Date: Tue, 2 Apr 2019 22:41:00 +0000 Message-ID: <6D99E4B5-ADCC-4BF2-A447-4EE52FE775FE@fb.com> References: <20190402062214.136669-1-yuyufen@huawei.com> <87lg0s159q.fsf@notabene.neil.brown.name> In-Reply-To: <87lg0s159q.fsf@notabene.neil.brown.name> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: Apple Mail (2.3445.104.8) x-originating-ip: [2620:10d:c090:200::939b] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 5e024bc9-0424-48cd-c23c-08d6b7bc4803 x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(5600139)(711020)(4605104)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7193020);SRVR:MWHPR15MB1392; x-ms-traffictypediagnostic: MWHPR15MB1392: x-ms-exchange-purlcount: 1 x-microsoft-antispam-prvs: x-forefront-prvs: 0995196AA2 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(366004)(39860400002)(396003)(376002)(346002)(136003)(199004)(189003)(55674003)(99286004)(82746002)(5660300002)(54906003)(6436002)(316002)(57306001)(36756003)(305945005)(50226002)(33656002)(102836004)(186003)(446003)(2616005)(486006)(476003)(229853002)(106356001)(6506007)(53546011)(256004)(105586002)(46003)(11346002)(25786009)(966005)(76176011)(6486002)(83716004)(6512007)(8676002)(6246003)(4326008)(8936002)(97736004)(2906002)(478600001)(86362001)(7736002)(71200400001)(81156014)(6306002)(81166006)(53936002)(6116002)(6916009)(14454004)(68736007)(71190400001);DIR:OUT;SFP:1102;SCL:1;SRVR:MWHPR15MB1392;H:MWHPR15MB1165.namprd15.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: fb.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: We9UAhNHahMe2L9KfFIY7m3ZHQpC+drxAS+ZlVOrxT9M4g86Dq8aXUe16VH/iD5NsLcJNslfHBDUWye9mMgIHXDacZhiE73ekpMRGVNuGPR18hMrvpKRq3lB7F3HdLgB1EtQ/1k0GP/8LPp+VGZnvUIOH2WPra2vdWM7pdBVKYUsrH23IuqxjXJDdcL07G4yMARd2I9kX/F6Fy4Hq72hY5RlI81oivaUs2QAYZi/ncft3FY0BL7xQ7EvjqwDgi78ilAkiV+5Ytw0m6NifVAko968pVGZynXTgCC5QKjMuHC99BP8lB74kGjTz8Ir4sLRZN4bWoheEbWmikNODR056Xlz/S8YOAoPcSrv27FXGtPMErsYV1PnHDOyMI52XQMV+Z9dCJItbJNRVCmX5KO6tR8e/Nm+E3dhIbz/q7xy1wQ= Content-Type: text/plain; charset="us-ascii" Content-ID: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 5e024bc9-0424-48cd-c23c-08d6b7bc4803 X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Apr 2019 22:41:00.8573 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR15MB1392 X-OriginatorOrg: fb.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-04-02_10:,, signatures=0 X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org > On Apr 2, 2019, at 2:11 PM, NeilBrown wrote: >=20 > On Tue, Apr 02 2019, Yufen Yu wrote: >=20 >> 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(). >>=20 >> Fixes: a6da4ef85cef ("md: re-add a failed disk") >> Cc: Xiao Ni >> Cc: NeilBrown >> Cc: >> Signed-off-by: Yufen Yu >=20 > Reviewed-by: NeilBrown >=20 > Thanks, > NeilBrown Thanks Yufen and Neil.=20 I applied it to the md-next branch: https://github.com/liu-song-6/linux/tree/md-next Song >=20 >> --- >> drivers/md/md.c | 6 ++++-- >> 1 file changed, 4 insertions(+), 2 deletions(-) >>=20 >> diff --git a/drivers/md/md.c b/drivers/md/md.c >> index 875b29ba5926..66b6bdf9f364 100644 >> --- a/drivers/md/md.c >> +++ b/drivers/md/md.c >> @@ -2859,8 +2859,10 @@ state_store(struct md_rdev *rdev, const char *buf= , size_t len) >> err =3D 0; >> } >> } else if (cmd_match(buf, "re-add")) { >> - if (test_bit(Faulty, &rdev->flags) && (rdev->raid_disk =3D=3D -1) && >> - rdev->saved_raid_disk >=3D 0) { >> + if (!rdev->mddev->pers) >> + err =3D -EINVAL; >> + else if (test_bit(Faulty, &rdev->flags) && (rdev->raid_disk =3D=3D -1= ) && >> + rdev->saved_raid_disk >=3D 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 >> --=20 >> 2.16.2.dirty