From patchwork Wed May 25 19:14:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Lawrence X-Patchwork-Id: 9136101 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 99B7E6075C for ; Wed, 25 May 2016 19:14:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8D8D928110 for ; Wed, 25 May 2016 19:14:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8265F28299; Wed, 25 May 2016 19:14:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1DE7D28110 for ; Wed, 25 May 2016 19:14:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751781AbcEYTOr (ORCPT ); Wed, 25 May 2016 15:14:47 -0400 Received: from mail-by2on0130.outbound.protection.outlook.com ([207.46.100.130]:28352 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751675AbcEYTOp (ORCPT ); Wed, 25 May 2016 15:14:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=StratusTechnologies.onmicrosoft.com; s=selector1-stratus-com; h=From:To:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=9JmuDTqOQuGnacXc/TBITvc4CFvpm9cozm1Cb16rgg0=; b=wTDzdJJJ+Z04hJ2g7Z/X8IgiKEFx2vhJ6ukuTfNLcB92vV+csnqwDVe3UwFF9j+nO8sL5lj9zJhWClhgAg+BC+neaeojfRkAunt7qQUMT3gMBx3Nz7S38HxRepWCWylmkYsMCrpY9c6pKIHb8rDEDBhzECPbIijDcohnpIROhzw= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=stratus.com; Received: from jlaw-desktop.mno.stratus.com (198.97.42.5) by CO2PR0801MB2248.namprd08.prod.outlook.com (10.166.214.144) with Microsoft SMTP Server (TLS) id 15.1.492.4; Wed, 25 May 2016 19:14:42 +0000 From: Joe Lawrence To: CC: , , , Joe Lawrence Subject: [PATCH 2/2] mpt3sas - avoid mpt3sas_transport_port_add NULL parent_dev Date: Wed, 25 May 2016 15:14:29 -0400 Message-ID: <1464203669-31974-3-git-send-email-joe.lawrence@stratus.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1464203669-31974-1-git-send-email-joe.lawrence@stratus.com> References: <1464203669-31974-1-git-send-email-joe.lawrence@stratus.com> MIME-Version: 1.0 X-Originating-IP: [198.97.42.5] X-ClientProxiedBy: DM2PR10CA0112.namprd10.prod.outlook.com (10.162.31.38) To CO2PR0801MB2248.namprd08.prod.outlook.com (10.166.214.144) X-MS-Office365-Filtering-Correlation-Id: 5447ced6-a163-4921-b59f-08d384d0d382 X-Microsoft-Exchange-Diagnostics: 1; CO2PR0801MB2248; 2:uDnWrRjYDzXwkQO+VMKr3SvhHODkw85cI3RTsMxyAj6d3NpCOco0xwtiVCdz+aQXNRytTt7M1qI6aVeEKvW3ERk1dCITJv9IKbmbFwOHNj9y1bIiTUJrf5W46NgU24lQlpy5+ZRR4LNdwiIAw5vBQ15nuc+x4p1t1gx279Yg0NarhP/BU/6dhblbptI76hMG; 3:rV9rExuTdvG8JYbHHlSl4DW73tqvzk+1jOd/3cFi7gHKXv0lIEP+qc4XKiV8xC5zs/IQ2CO/J+fiVkBsNsWZtY9RWPrvuToxxCeD5pD7Sy/JOErZVwZKwF7unH67DLq7 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CO2PR0801MB2248; X-Microsoft-Exchange-Diagnostics: 1; CO2PR0801MB2248; 25:BbnS2/vISCYAhsQhgdbtiv8lLvF1Ftpthgz7OGKOYxcvhMbsvI3dH8GupHUOXeROKUF7kYv6Cp2JzOVYuzf75Tdx29+AOlDatktqhDwHOq6LfR+vD5mheDEnnLLhlq0ls5USiNcteZDpHP8waCO1BUG3JqVTw94Q8X4Zyml+WtQ4EGoTK3eR+TGXLWvn+nSX/Ylu4m/Qic8hcTDe+edpmZbSpYheB4FKaIALxdU+FsiE7Oiq/9pDLcxa7sMA2Uim6/Uaz65T9dtZD1V31qIhQJ3eN2KQPrUKKL67YAswRUuHdMNSBHw+nfcQT92RByz67K/BuGB3izv8Zmte1VYt986o0huLQDU7hCZJ9dE9Eik7nFzWuzwMSrnUwh8DTgiFB4HHxQ6kpc61VFroCO4DS79lzC0tA7jqTl1uQKjr6C/zODy3B+HEdb8xROqSOWmG/nqFMSlnToViBrNKbk6OuqUI5SYyQ6IIfflaeeMj8+Q0WLnJP4gouxh1tt1gKhMDtBwWJo7LAXcLG01OEU+UDxN/svsgHfvwssLvf6ccoTPK/iHYi2ilbOTaTparWDcrxs4GkiQjj3DAlRQp6/D05l0fMSMdzOb8kX2gcIzMzosA7gEhIt/Nj/V6cfAlLUGrOaUcXeDiHgdDe7h4dpOAKP5AMk7FL1pRxI5bmnjl1HDYJJ999Nl/QKcmTrEAHXU51EG+K5zvB7cO34KoM2M1dg== X-Microsoft-Exchange-Diagnostics: 1; CO2PR0801MB2248; 20:3RbA+26ShreT7ehWcVA0a70msG2/rqI60cQqEM4mqWyhKWpTKjXKOnOj0TgMflWA8KDcB07reTqHyxRdye6kjjU/GNd7adgVvsKllJTdMhSEAO37Ss/Zik2kDZREQK5jHlC7Vrcy+/Sheqfm+GIfAUH/iAyx03jsAqZt92/IktMMHXZnsA6XDUMeaPI5+KZCBqrVI5hcd2lqmf6QzS8DURMTUs91VSTFmi+O2pIdcbqTtWbngM3uY/vRbc6sBMdMorK2vW/0St1fcgHC89YVxsLXx3obUfaHfMWz7bCUSh0iQDcUSS2OEY9sqYvcN/mu9ddJ/2CqaF4sOUyfTQq5SqmAmJN6X9X4UZX9xLk1tsCad5MoShi0qMxOyMzqmJdBsge2L0Qv8wR8rXy4RcHWVpSlKz7E9u9t2jIL4Va2tiWTc217nYwrLRlSVbp3Kxug+ZoXVil4ShdTGpYDcs92QE7KzD1KmyDi+w06WbI9TQI2bdtUGtydnWI8BxXaXkuf; 4:dZTKhkbJ0YbVUeTArDFfnsjiZFnGIm8EPSGlGcyaqkQLuo5/oiA+IZXVn1z1TF8htZ2T9YzFpTAEhYBNljKlDO1miNxsjKaL09qp7JPDNlN3Tq8+6Fj3cTpdpbhv50+C8Dy/v6vTatm4TPA45fqv8cKMOTk0SSgsAhis57PamysSJBZ8Y1OyuLB1+u7wdjBFiAm4p9cSfqMUgSmlZrKYkIG/sR+3TZl+3AsQQK1NP9Sile4Ls2dQSRd/OQt0OIsQgDX618EwbvGC3SJM/J2CuCB0UmINGiYmpWo0TbEHKuDiYfBSRkFPzg4635ebfoBZqw4KcaOVqu3qUZiICpiqEbcDf96tdBfeut3TRdStmktIbKr4RzR7ZFxrmfYQimHJ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001); SRVR:CO2PR0801MB2248; BCL:0; PCL:0; RULEID:; SRVR:CO2PR0801MB2248; X-Forefront-PRVS: 09538D3531 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(4001430100002)(42186005)(66066001)(33646002)(50986999)(110136002)(107886002)(189998001)(76176999)(50226002)(92566002)(5008740100001)(2906002)(6116002)(3846002)(36756003)(586003)(47776003)(4326007)(8676002)(81166006)(229853001)(50466002)(77096005)(2351001)(5003940100001)(19580405001)(19580395003)(2950100001)(5004730100002)(42413003)(15760500001)(32563001)(4720700001); DIR:OUT; SFP:1102; SCL:1; SRVR:CO2PR0801MB2248; H:jlaw-desktop.mno.stratus.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CO2PR0801MB2248; 23:idNI0cDs6cRAmI5VyCjKpNZsh8BUzhOWcAOnyS1?= =?us-ascii?Q?BCEFEwiZ8DuDSAxLZ/9s5ayzimhE+ZgsxvvlTHVa7HI0H3gn0lJ7zj1+Jkrg?= =?us-ascii?Q?Ncl9WsHdE7Rxhqootw1dQZY1fY5992RWDd1tclFkeTrwg/Dckk8usY2+QGj+?= =?us-ascii?Q?GtI+VQZAKPCT0ltxPVDVID0kXwRW54Vcf32U7wuxH1422PeuuZpa0HY/VGgO?= =?us-ascii?Q?YJX92NQ4bDWwZ/x8CpT/R6kSIOSoctG9m0JqDpqTsSty94SLb8wwsnUVT6h6?= =?us-ascii?Q?O94FQTWG52I64XltRJxiLj5QD0+rrHmhI2LmyYun2VYNCkeRcQmG2bL4F/Hn?= =?us-ascii?Q?Xf6AheHRBbqQQh7zVMW02cqDldzyqEtwSUKF7Tg6qFvB2C2FlolMz4x00M0y?= =?us-ascii?Q?atmK83Viz9n+tQfP56xC+AxJjTZgry058jzDpXJZ5zJFtRnlYe2OTwTnW+dJ?= =?us-ascii?Q?hi9vNQU3zWj9GxgUSECgpah89/Jkc3oBh4Cpdv2PCbK7Z2X1PmF/ncIB7czo?= =?us-ascii?Q?pfd9ZOWGdg9P0eHe3dySwi8wPp51dez5ltDTSd9eql7+cIm++o73xSN3KCoy?= =?us-ascii?Q?NDsVJKlfJS08Bknvh2MNNK+qJcO1sDxr/TGPBU9BXJKhlmpg7wDfxZBAnnZo?= =?us-ascii?Q?JpPQFfNgCnSO8y70GcNmwixUFi0DySAQES+LWFOjFpfyFYNCI8zXfZt0uxPq?= =?us-ascii?Q?DeyREKY0T7rGMWur37FZN36fRHa4kaeCewarjQvQHGk+qg0ILdJN9KDiblq/?= =?us-ascii?Q?Ximmxrh1VuPQUF1CUow1XUqS9+UCSpIcU6TncSE9DkUxwfUrg0xeRGIw9SZc?= =?us-ascii?Q?MZdI3BjCBEW0APgjDRfT754LfJ+vULPF0o3Fun61PaQnCR/ZwHHgTtBCBX4Y?= =?us-ascii?Q?LbCHg924IeVSt5lI3900gAX+xtMgARMqUL56yoY8PRAcSPOeMfjJku/atqWu?= =?us-ascii?Q?14b9wIeoJJrDGnMawyq1QRS+mvSLqMhsJGPysEdlEqA/WnalqNA4iS3Jt7pU?= =?us-ascii?Q?33M4=3D?= X-Microsoft-Exchange-Diagnostics: 1; CO2PR0801MB2248; 5:ARdSrDoeULKEQA+brZmV9ppSWJwiIFwHR4zP9wo0igC/DJ7ReqxczxHK0QJaV1Bx5BCyCNYB3IhGvUNLCV8IwJ+d1/sSaiPcC7rfUcKxS+cBU42jStZwIFUguj/nMCb9nY3gtyOWS+5lTpJWkxVreA==; 24:VpXzEDRF7d5VpiB/7lPVEn2pnWGwFGWPst4i3cOZ9PMEDvVSyw7b3INMl3ScDJpLvcj/4wPDfUZRX3PVO7L0wPBbxIibEI4lR/UJplWik1w=; 7:MSXO64prpNYknDkR9q+HlCLgjp2Kp4bUok1JlkbRdB5wyceTlJoCD6eRU8o3h+jOWiGn0vgYVhd2xkUrQVMO/mZQtXzY+w6jEqScZDSxywPTlVWutOiCnQBv0Rl0Q6RfSADc6758CVlXZ+kOVxTWdu14gDzaY1rSBSjQkrCyeFA2kcDozFOi4OdMlDxwisWq; 20:sbCseHIVRSYm3EzRDd9jEKx5obzJ1oSOXEa2XHOXt/0LXxv2OqpclL0Fj6LbSvugwGwlUE/sJe7V7GpR78nanfUPx9u6SR17dv4dL5MkStTV7et/jkXPL6ru7347zjletcul2Gx/fF9TKpC/eG9RyqGfet8C8L4Ije7E31T6K18= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: stratus.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2016 19:14:42.0057 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO2PR0801MB2248 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If _scsih_sas_host_add's call to mpt3sas_config_get_sas_iounit_pg0 fails, ioc->sas_hba.parent_dev may be left uninitialized. A later device probe could invoke mpt3sas_transport_port_add which will call sas_port_alloc_num [scsi_transport_sas] with a NULL parent_dev pointer. Signed-off-by: Joe Lawrence --- drivers/scsi/mpt3sas/mpt3sas_transport.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/scsi/mpt3sas/mpt3sas_transport.c b/drivers/scsi/mpt3sas/mpt3sas_transport.c index 6a84b82d71bb..ff93286bc32f 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_transport.c +++ b/drivers/scsi/mpt3sas/mpt3sas_transport.c @@ -705,6 +705,11 @@ mpt3sas_transport_port_add(struct MPT3SAS_ADAPTER *ioc, u16 handle, goto out_fail; } + if (!sas_node->parent_dev) { + pr_err(MPT3SAS_FMT "failure at %s:%d/%s()!\n", + ioc->name, __FILE__, __LINE__, __func__); + goto out_fail; + } port = sas_port_alloc_num(sas_node->parent_dev); if ((sas_port_add(port))) { pr_err(MPT3SAS_FMT "failure at %s:%d/%s()!\n",