From patchwork Tue Dec 6 20:30:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 9463229 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 DDD3C60236 for ; Tue, 6 Dec 2016 20:31:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D10F4284C4 for ; Tue, 6 Dec 2016 20:31:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C5FB1284DD; Tue, 6 Dec 2016 20:31:16 +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 2C343284C4 for ; Tue, 6 Dec 2016 20:31:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752366AbcLFUbO (ORCPT ); Tue, 6 Dec 2016 15:31:14 -0500 Received: from mail-bl2nam02on0054.outbound.protection.outlook.com ([104.47.38.54]:62528 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752185AbcLFUbL (ORCPT ); Tue, 6 Dec 2016 15:31:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=ChgadInoNy8749kGXvo1ZZIZ5rAtdVagtzoNjw/Gv54=; b=A7gijpWFISWAl+W7IInqmOB7ISmCOhMGy9CjB+PFpCdQAYQegtEQneVZQftdwRnQnJ1vdSXfioj78V5dK765Q06HConqMLrw8DXv5t1jfNoAZcmLRIplHJ+LIeuxeeIbvfpc6LbZ91Gzj1lo2+JXUEp44pLjJSF61WYoyjNbGuo= Received: from SN1PR0701CA0015.namprd07.prod.outlook.com (10.162.96.25) by SN2PR07MB031.namprd07.prod.outlook.com (10.255.174.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.761.9; Tue, 6 Dec 2016 20:31:09 +0000 Received: from BN1BFFO11FD018.protection.gbl (2a01:111:f400:7c10::1:134) by SN1PR0701CA0015.outlook.office365.com (2a01:111:e400:5173::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.761.9 via Frontend Transport; Tue, 6 Dec 2016 20:31:09 +0000 Authentication-Results: spf=none (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=none action=none header.from=cavium.com; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) Received: from CAEXCH02.caveonetworks.com (50.232.66.26) by BN1BFFO11FD018.mail.protection.outlook.com (10.58.144.81) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.734.4 via Frontend Transport; Tue, 6 Dec 2016 20:31:08 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:1148; Count:15 Received: from dut1171.mv.qlogic.com (172.29.51.171) by CAEXCH02.caveonetworks.com (10.17.4.29) with Microsoft SMTP Server id 14.2.309.2; Tue, 6 Dec 2016 12:30:53 -0800 Received: from dut1171.mv.qlogic.com (localhost [127.0.0.1]) by dut1171.mv.qlogic.com (8.14.7/8.14.7) with ESMTP id uB6KUrXo002367; Tue, 6 Dec 2016 12:30:53 -0800 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id uB6KUrqi002366; Tue, 6 Dec 2016 12:30:53 -0800 From: Himanshu Madhani To: , CC: , , Subject: [PATCH 07/22] qla2xxx: Fix crash due to null pointer access. Date: Tue, 6 Dec 2016 12:30:36 -0800 Message-ID: <1481056251-2310-8-git-send-email-himanshu.madhani@cavium.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1481056251-2310-1-git-send-email-himanshu.madhani@cavium.com> References: <1481056251-2310-1-git-send-email-himanshu.madhani@cavium.com> MIME-Version: 1.0 X-IncomingHeaderCount: 15 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:50.232.66.26; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(428002)(189002)(199003)(86362001)(189998001)(107886002)(4720700003)(33646002)(50986999)(575784001)(4001430100002)(101416001)(105586002)(5001770100001)(36756003)(42186005)(106466001)(76176999)(38730400001)(2950100002)(6666003)(626004)(8676002)(39410400001)(5660300001)(92566002)(50466002)(39450400002)(5003940100001)(48376002)(8936002)(81156014)(39850400001)(47776003)(81166006)(50226002)(69596002)(80596001)(7846002)(39840400001)(4326007)(2906002)(356003)(305945005)(87636001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN2PR07MB031; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; PTR:50-232-66-26-static.hfc.comcastbusiness.net; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD018; 1:zFUnNWx2/F5TvUEFK2hWQIz2e0Io7udKAsbHPoPbPpBwbgTde29E8WFRzvFHFmus9Fpj7iF9YGGi4LoaXG6F/nAZqno1jyHt3FvAtpy39FjV1/Rguu+aikVhgWcRPkexhXDmbA52tjwRmQDxqEOPoXjW71nMuk6UeVf4BmYgHwv7KHN7JOJoNuHb0Fb5eElfyjTNj7UYK2vKbd+/M4Fl0bi6DFaquyvhdBnTOfz6K815J3NcZ3eOBICdyhPMlpOa7ikBVC3IEmrBv01G+t1lFQA6T9Re02bppod+YtPMwDcQM1y5LaowF8TDqi6Iga278sLwzG7x7SnkJNNFwkYJww36Gazq3XevhKe/90IZj4ZVUIfmu+PF6WEKeGlUpRQJUj5sTWukGpLniqgei2QqRfqJeveEKuxDJFJxK6zFXcnWVPP9o0KzcywPcqTtYgetV+sHKdixHtxlKnp5cpARd0PY19SeAPVl3o432GC50QTwu7N2ua/CmWdSzFu9VyeMMaY1kHfhjek8vWWPfMaCBQ== X-MS-Office365-Filtering-Correlation-Id: 25db5969-0813-4ace-ed38-08d41e16cfd8 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:SN2PR07MB031; X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB031; 3:EH4/2Y5p7WZDQob2ypGPA0PdTPpFyb30MhzUvT1JoNdnJ5kFA5tS5JivrN7KsV8q4O+RiAmQZrEsx/CU3MurYeKc9ppzrgqz8icGrf6OXPwskD/RWqKpXroPI3ziNx2aViK7ZjWMUkbLNqHE67z1jFiVRvhmFlz9PkY7zuW/dk1IxGYfISKhx36Os1tapxQmqzGdBPNHFXKdOgJYpG4vyL543xRwOocku8NALcfhPAZOiCuWZL+NWA2KeLLhT0dEEveAJs3iXVBkOE9W0TXhdV75C8K6InpkPYdHnNoGV7LzNhM+e8Ond0bSKmWL2QyVSZoR5/c86WpyZmlmAiNUDQgknKCECMBUp0+rMnc04OU= X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB031; 25:ZfstFJ3aC0crou6oL1xapDcNe9jJkxG3enfn/6GF0KAthS6psBgwiO+8Pbh1MsEw1k5bMVXPwDEWxyJjg92F08Ox+nAK0TrZau+w/i/i0HQbAcbXDBPbkb4zKIi5jctzw0GaH3+5pHc7r3otj4NdXIelwaM2P7s/lgXMOq6dE/vZ8QVEuba6/VEYC+31+i4gldZg0lgkDMas5NvpzHGvu0On8sqWnXtRNYEP2HFmLTfigQvyDNVw/pg9rmwFvmps3/A9dWFPJKY+QHRzqu11JyatVbjpKjqDgweZYH4Sd4Ij/maAxXZTuFjoREhKewdPPTOGk3iVFBW5VGjH2InuJq4ze9Zo5RnM8hvZ84ailks4Ly7hbMIONsVmVmSOjbFjYRtKA0GRWQ41OJJLUinso5nO1fEEPEmhzxZE5b9Nnu117SCo6y2JNAVYbyFrBy+jwe4/F5yNFjn2Kx7KNKAr7CHfXNeBiFIYwuVlWvptBQe4N/JyzNOqyPi8jHMUKep9rzwciiD/M2iEQVlY9f5SWD/SM1lfwvVPGYNBwCZXU02TgN1aVTVtSUR7Pz1XzDG4dBg5mdTXNuZXgrkjYPdiBvrPf6Dd6yt7ARM0dHw6JvFW3WcMcbYUk+A4uzbOR8xYwCnSyCt6E1BcMPZc85e3Bkw4+RqqoT1MXeWQkNOAnX96FbFbbv3gfAq/zCFn1IIdRf7DZIo9bR4ZqmFpwRBSo6rTJUz2CZT7JsIgixvnn75mOmNVu0hRnAZ/fHU547aUtJ+OZfsr34vrqlk6k00pvrcagwMHWwWMkQzJbn2pCiOuq28kcajTQpJruYNXRUmPpBuno7syh3GoWDoJIiAzEKisBPaXtzCo6xByf5b3cvs= X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB031; 31:yTeg/uxz8ME1G66Pczb3A4FJlqtlX5wIKEZtXe06JUYnlp5th4jg14WWkC9LHGgDb0v2e+dp7HtSSlYyDOU5YWoOppJ6abu1hdP/Zov1elKg5ZSI30WQWcTWVyhHnk9h9HrfGZzl2jMpK2YE+eXmhQQFxWXlsJ962uZ8hItxq8ClLFq6cdcyM5u1okGAwi2ZFBCMriIYV+Iz/GdoUD7qERgcAwVVxWJkvW9Ut5vzO8TqpgVWiHvTXb/As6s+SdbxucIQe/wXjOJEaBF2B22+xQ==; 20:snj/UJysfxHuODR2H8P2LB1hgyOSiYAv3/TYE5xi4bRpHrjwstts401aQi1vXVIaQiURXNbZ5SbN0xks1jtN5UOC4MK65F4Y4z8/lgorP0h/AcyVvr5IgfAJ0AB5ghpklAdSvIGWS9mWeSPWEmQrqOV0WvpMgqJbpO4Y53xK+HukY9rsqC2Pz/bUQyu0M3XMI1MFoYRmDDQfwpqn9lXXGDHIC7cCgPrqPwL4NeVDUhYaBbiFEWdS5a+Sx1i3f8a/fHj+l3XgISX43f35PPClgHvWcb6PXbdf3R+qW/4NwFl5EM513o1Ep3L/oMCAH5CiAj918mB6gtODopFdo+Ud1e+HptPakc25DfiL62POZqcMRqDf/46YWH3TIWL0kri4e9bAHn6cQzelhkE7YrhlziewvxQChQRECpfwrLc/DNNMomOq3BOqkXO4qZ7RWRZXj8Mtz+G3mpQuq23Po0xDDWk+YxrVCLwOLPbfsqlIShIkFNXEmxwABvETGER5bLqt X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(13023025)(13015025)(13017025)(13024025)(13018025)(5005006)(8121501046)(3002001)(10201501046)(6041248)(20161123555025)(20161123562025)(20161123564025)(20161123560025)(6072148); SRVR:SN2PR07MB031; BCL:0; PCL:0; RULEID:; SRVR:SN2PR07MB031; X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB031; 4:fGY7Cw03KhQZGls0jTrRUz2e0skjf8YVKVvO+JfP9wbcHu6rpJAXC94QX35g9jzWmscT5xe7Atswy0Lv4DmhdOz3R+i5ElgfTERhKbsKSJ0m21bicrX8/yhfZIifT4B1RSeWEShjdwN2OipSovD6MnkoPolBWLLNmR9TFy9+poAnaL6PajcgJ1P3Zlx80EuD8rDS5k1Jundz3rtb79R8y/LrN2+WjuAkuk94djTRAoJ6MLSMSrnBceAt6mCblSeh71O9ypZc1Z+JRSvic8sJ0BlaZAbdMbkIq5D3KG+iiLvNaX3Uu6bEtUFKd2JomzQWV7oeye6nyTQezhcStkzZ+PXkPtoH+3GmRF7g7q//wHeQgE3VAzyo5MBD8IgZ3Vq8Ixh6PigiZhbFkNOm2D8Y+7D7u3IqVjhlJBamxzgryH0CUghkpyblzlt/dzz5dK+ENyBSO8HJv2JZLrOhc7WPCnwKKtukdkFH4rZ+FthNelAumz/RtAUru1kObos7ZBlMbeRPsRyT6oRUDA0u9Ro+mxVALjtJrrKrYdX8q4Rw7jKcZqfHXMxdOGpjfxLj/2HeEd+Hi0Oj8L2QIFi18Bc4lSr05kKHLJjJDFWFX03R9lLD2/Nf1IUlnIefOV/y7r8mJCZutSFDnsSOZIY04ABVXVUdf6u1ZBp5lhLAg8RhBW8= X-Forefront-PRVS: 01480965DA X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN2PR07MB031; 23:IQ5MopTmGqL1c/cINz+zBh93gX4UJcmVngCb+EQffD?= =?us-ascii?Q?TrEO5NCOv79Wom9HxmzBd4sPhzpQ/5Mr9js3tWfuuSoGr2STR5tOQm65w997?= =?us-ascii?Q?YjI2ngWmcAuOGpEOEzF2OP7a5DyIj/Qke1mhtrAmIVgC8fVIDp9QwTqRHvtw?= =?us-ascii?Q?CHdyfTbDBV/92ZhYoSWiMk0KwGUND2mmHT1MGa+fs1GPklJcVTeK8sqF0Yuk?= =?us-ascii?Q?pntY4sj0AFeFQD/J4HT9TWu+Rf5kS9rmMol40ONYT05HK2lON5tDnTuIOpb/?= =?us-ascii?Q?M04cXOH5QsfyLemIjYBPlt72VygQ06ICxBsRoDMtt2fyxIcE6gaYplwdD6y2?= =?us-ascii?Q?HgfQsG8uvEjB9H89j/P0gvKJ6oW0ewYVhCymA21DJTtqORakG5ikryQ1GKVq?= =?us-ascii?Q?ZUPeUd+O46EbJH9VvmHp1Ck1Ve/dAsxb7GdZOT0BwuV71TpEsHXQoUP4KANX?= =?us-ascii?Q?I2iAGwEgS+Q5u+WXYckWnpHMIu/4KaAMoHxIselpQvJJhEACCPOQw8r8J0jF?= =?us-ascii?Q?qzctccRm+28UR9nWCfciGEsSFOc2wH1XfqmHweUXpLEKbRe/0dflWiONjKtA?= =?us-ascii?Q?KzM8lbEf366w2XZQi92250E4GFfgOE/jQOWlWT8ousDG0XPaNXyIJ5PQ7Rvm?= =?us-ascii?Q?pGHUY1jlj3Y85y8xVHNzb87CKBGNBOuaKNQGp74x/1R4m6/SiPwgpDatZgHo?= =?us-ascii?Q?UWls46ICFSEUBitIs3HxeKaguKEoIuSGGfI+d2OzIYNtUjyLWiVdRZZDiO6y?= =?us-ascii?Q?eInf7uQn6HTemGOXOkJwuUMWcjUrbES+3HixkSUqHXVQfavyxTjT+Gje6SwK?= =?us-ascii?Q?eqOQ5qG20mFJYXvw2pvig68oGcq2zfQ9U2jz5NWPWI4Gd2/41ds4SMExpCtZ?= =?us-ascii?Q?etPkBar7FUwempoeEaOug3Gj+J1GecwDSwY9CnebpLyp0pMnEydNwoJym1+6?= =?us-ascii?Q?/rleQ8cASWZ7jCvjKzlYqo4z7zCZE/dff9HsFtVKvPNaloaYrS0AbL77B8IY?= =?us-ascii?Q?AkdwnSJIWEyMnrpjQfsJLF/27MSm4r38AdYu9X+6OevCv5BEO5NTslZff4Jh?= =?us-ascii?Q?V6WUHyrIAQc6Wn8GVEAPA/5fwxM9GAjoX0MCrvaqjQoDbWoQP77POHwtaWC6?= =?us-ascii?Q?aQuLWaefDcDlQrzr0BJq3bT/fSVWFX+YZVzeg/5Nl7LWsVNptixfm3CZIo95?= =?us-ascii?Q?OQXkfrOELhY2ntPeaSBsF+WnENQa9YLLcg?= X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB031; 6:gCInxCKz3BgHLy0NWGEpg66yi9KzXmnsGoxlQn4YN1XuXWSy1SrFKHvjcmQX0ELYglIOoMtvpDMOPtHnKVGbT0sfUbPZpCUZAkVbR9bI2OqQYoExG+wNt43zLgnQS7yiMstGzKaJu8pFZobWBWEjgFkWRuEcm32BT3WVVRwIIuK8lQQU7D+z2X5bDGXgdoGkH1q7BxBmaO5wrfYjzn5fmsAhvQhzVPZWdgKqIiOoAxGsdHZRZU0/Jv7WolbqWybXaf4PpxXonHPF8qrqNwF8eFRvYXzEVm+6WiyzYO0kk/AC4gJnGHmCftyp0oEsXuFA7oUc6fqVH0eWH+gER3QgX07DkT1BrU3O1pJhHtI82nH/h61ITwZdSVghbXkze9OjSB9s7QDfo8lVWGJxEh32UgfOwMNwAEM6SUm/oCIyhpEED8gVsreU8QxxbL10tEX7eGP9ClLJKPpcba3Mgx/5Hw==; 5:5GXNhbxwxHTEq4bmmrSJjl1ad89xlMY6vwfUdI4DdzcOrzDTi8r3GSRtCN0bfTvropdVFjx2VWHUckByrx/m/x5GKAhVi4LjJcABMiAkko68N/mVk59SPVWTEnod4J2uzkTjRdwzvraT/Lf+H9c8Ew==; 24:k1mtlV3yvEsNt4Nibyil+iiegvU9jTXjwmt9LAh4WPOQle/1JXw8lWSv7R285Nf2OMYI/pIq9BQ0sjMIoQvj2q0My3m3XvvNtqqXXOXg6KU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB031; 7:nk4ePmBmipVzN8zbeLUXc57P3sRGc0Wn9eE8g52UhKChOSRDPAea8c6Z7yztthWp33EIc/HDDr5eMI+p6vuuJFI+4g0k88Do1RI8Fp7d6odijYMVcu/hWjJ07u0qlJj+cuUUq95/PqrgM2LLbO1fvY4Tk5tsZQ0SoKJ6REY1whwQpCNCl1fL1vtXkQVuVRjdjUmmBWyKHQFn9QB8AK+mKxKpPPjO+GDhAlGBeZ+hCLO2BYbr4TxvraDpsl+6AyX1mcia08RYFXYJBo9ZOAnnlwp/IzeEbhWV9ngqDkpLx5SklhQwHUL+l5ZafmZgxgo7pWicolXwPn23I4xCFtrGBIoOxPFhnx+tMefnGrv83O/oS7rft2gePCBy8vxc7ymI3OQ+KkWSNFw2Z0Iv1o2uS6XZvacarKUbfOY/Q1OkPf3tL9hYm/a0wFS+FRpuEaxgU+J+TZ7lo+Txw2DyD8TIvA== X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2016 20:31:08.6616 (UTC) X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=711e4ccf-2e9b-4bcf-a551-4094005b6194; Ip=[50.232.66.26]; Helo=[CAEXCH02.caveonetworks.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN2PR07MB031 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 From: Quinn Tran This patch fixes crash due to Null pointer access. Following stack trace will be seen. [1469877.797315] Call Trace: [1469877.799940] [] qla2x00_mem_alloc+0xb09/0x10c0 [qla2xxx] [1469877.806980] [] qla2x00_probe_one+0x86a/0x1b50 [qla2xxx] [1469877.814013] [] ? __pm_runtime_resume+0x51/0xa0 [1469877.820265] [] ? _raw_spin_lock_irqsave+0x25/0x90 [1469877.826776] [] ? _raw_spin_unlock_irqrestore+0x6d/0x80 [1469877.833720] [] ? preempt_count_sub+0xb1/0x100 [1469877.839885] [] ? _raw_spin_unlock_irqrestore+0x4c/0x80 [1469877.846830] [] local_pci_probe+0x4c/0xb0 [1469877.852562] [] ? preempt_count_sub+0xb1/0x100 [1469877.858727] [] pci_call_probe+0x89/0xb0 Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_os.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 544f957..ce8c1dd 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -3681,7 +3681,7 @@ void qla2x00_mark_device_lost(scsi_qla_host_t *vha, fc_port_t *fcport, sizeof(struct ct6_dsd), 0, SLAB_HWCACHE_ALIGN, NULL); if (!ctx_cachep) - goto fail_free_gid_list; + goto fail_free_srb_mempool; } ha->ctx_mempool = mempool_create_slab_pool(SRB_MIN_REQ, ctx_cachep); @@ -3834,7 +3834,7 @@ void qla2x00_mark_device_lost(scsi_qla_host_t *vha, fc_port_t *fcport, ha->loop_id_map = kzalloc(BITS_TO_LONGS(LOOPID_MAP_SIZE) * sizeof(long), GFP_KERNEL); if (!ha->loop_id_map) - goto fail_async_pd; + goto fail_loop_id_map; else { qla2x00_set_reserved_loop_ids(ha); ql_dbg_pci(ql_dbg_init, ha->pdev, 0x0123, @@ -3843,10 +3843,15 @@ void qla2x00_mark_device_lost(scsi_qla_host_t *vha, fc_port_t *fcport, return 0; +fail_loop_id_map: + dma_pool_free(ha->s_dma_pool, ha->async_pd, ha->async_pd_dma); + ha->async_pd = NULL; fail_async_pd: dma_pool_free(ha->s_dma_pool, ha->ex_init_cb, ha->ex_init_cb_dma); + ha->ex_init_cb = NULL; fail_ex_init_cb: kfree(ha->npiv_info); + ha->npiv_info = NULL; fail_npiv_info: dma_free_coherent(&ha->pdev->dev, ((*rsp)->length + 1) * sizeof(response_t), (*rsp)->ring, (*rsp)->dma); @@ -3870,6 +3875,14 @@ void qla2x00_mark_device_lost(scsi_qla_host_t *vha, fc_port_t *fcport, dma_pool_free(ha->s_dma_pool, ha->ms_iocb, ha->ms_iocb_dma); ha->ms_iocb = NULL; ha->ms_iocb_dma = 0; + + if (ha->sns_cmd) { + dma_free_coherent(&ha->pdev->dev, sizeof(struct sns_cmd_pkt), + ha->sns_cmd, ha->sns_cmd_dma); + ha->sns_cmd_dma = 0; + ha->sns_cmd = NULL; + } + fail_dma_pool: if (IS_QLA82XX(ha) || ql2xenabledif) { dma_pool_destroy(ha->fcp_cmnd_dma_pool); @@ -3887,10 +3900,12 @@ void qla2x00_mark_device_lost(scsi_qla_host_t *vha, fc_port_t *fcport, kfree(ha->nvram); ha->nvram = NULL; fail_free_ctx_mempool: - mempool_destroy(ha->ctx_mempool); + if (ha->ctx_mempool) + mempool_destroy(ha->ctx_mempool); ha->ctx_mempool = NULL; fail_free_srb_mempool: - mempool_destroy(ha->srb_mempool); + if (ha->srb_mempool) + mempool_destroy(ha->srb_mempool); ha->srb_mempool = NULL; fail_free_gid_list: dma_free_coherent(&ha->pdev->dev, qla2x00_gid_list_size(ha),