From patchwork Wed Aug 23 22:05:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 9918505 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 98BDD600C5 for ; Wed, 23 Aug 2017 22:06:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8C0A228A39 for ; Wed, 23 Aug 2017 22:06:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7D3D228A96; Wed, 23 Aug 2017 22:06:00 +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.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI 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 064F728A39 for ; Wed, 23 Aug 2017 22:06:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751188AbdHWWF6 (ORCPT ); Wed, 23 Aug 2017 18:05:58 -0400 Received: from mail-by2nam01on0064.outbound.protection.outlook.com ([104.47.34.64]:62624 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751162AbdHWWFt (ORCPT ); Wed, 23 Aug 2017 18:05:49 -0400 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=/lp2CiUV50H4W74mQCeRtN/r5RNbcQrchjExQMLZBQ8=; b=GhbyzY0qYexpcluazaCYYvKfND4xwtDtBgMlEB8nFnH/RAuvY3mPSihkFymlpwed0UgqPSVeoS7I3KP4TZTI+gYNNZ0LNMvs5zH/gnelbgpk8dSpsRZvn0KHCr6pC36A1VIgYtSb0jjbQgOc/kvb0tnoTehEwx35bTqyi3soJYs= Received: from DM5PR07CA0031.namprd07.prod.outlook.com (10.168.109.17) by CY1PR07MB2524.namprd07.prod.outlook.com (10.167.16.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1385.9; Wed, 23 Aug 2017 22:05:47 +0000 Received: from BL2FFO11FD037.protection.gbl (2a01:111:f400:7c09::155) by DM5PR07CA0031.outlook.office365.com (2603:10b6:3:16::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1385.9 via Frontend Transport; Wed, 23 Aug 2017 22:05:47 +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 BL2FFO11FD037.mail.protection.outlook.com (10.173.161.133) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.1341.15 via Frontend Transport; Wed, 23 Aug 2017 22:05:47 +0000 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.347.0; Wed, 23 Aug 2017 15:05:27 -0700 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 v7NM5RwW003206; Wed, 23 Aug 2017 15:05:27 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id v7NM5Rv9003205; Wed, 23 Aug 2017 15:05:27 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 14/31] qla2xxx: Prevent sp->free null/uninitialized pointer dereference. Date: Wed, 23 Aug 2017 15:05:08 -0700 Message-ID: <20170823220525.3115-15-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170823220525.3115-1-himanshu.madhani@cavium.com> References: <20170823220525.3115-1-himanshu.madhani@cavium.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:50.232.66.26; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(428002)(199003)(189002)(356003)(101416001)(305945005)(81166006)(478600001)(626005)(87636003)(5660300001)(50986999)(76176999)(6666003)(33646002)(8676002)(80596001)(81156014)(8936002)(86362001)(50226002)(2950100002)(189998001)(69596002)(5003940100001)(36756003)(105586002)(2906002)(47776003)(106466001)(4326008)(42186005)(50466002)(72206003)(1076002)(54906002)(48376002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR07MB2524; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; PTR:50-232-66-26-static.hfc.comcastbusiness.net; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD037; 1:SsCxnmNks2Igh5OSXHaovA2lRar+nf3q7jEbiZ6aQkAgTi8FeEIKK1JC4vEjtPW7BHD9/GXOHJgqOxko3Wgv6yuOEvc5rRyTqwD/Qx5AsiYz4IiWlLHrT7MZxAf5C4KI X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d90bbd52-14a0-467d-353d-08d4ea731bc3 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(2017052603190)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CY1PR07MB2524; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2524; 3:ka/tEtsIz3AaPV20dm5lRXtONhAyLZ/UuaXRhHWLhHIZ0TmcmIv475v/ry+/6iyIQGY/Cw+/diLu+y4utiAIY50doSIbz65l9qGL5Q6X3zm+2v727RH0k5Y5/L4vbCYQeo8Xdzng7zYR1MCbeZOFEPU9Y+hf4XdYKVOE8C9euPio+Q/cRiKyZ5+YLYTnzgFfAYXkjNnajqnYgrTCi3bUCpUnW0o7HT2OTPDBW5/50xAqXSoSU4Aa18pkuE9hz6PhLfpg25mOnf3Tlm0C1rDGrPw2P8jPRVESZdxJBKiSrFS1OMzwK9JepKxsdirRtI6LdZBs8m3bpCVJdT8PurUkKg==; 25:zTUEFgqlbiOotP1ySAwSKY72sSF3uxQOm6oRW0OV0ngfwSvfvw6x3YfsBsWTBk3+pF5v5V01f1f/wUe0LHp19pp4ihLBlFkUxIhieYhZIu8ZK/UZ3UFBnh1NRFtbF6jXZ2bKcFAmrnHVsePz/RgZOkEhYJ3qg9s0eyC6V/vJx3v8whpEHL4/pUb8nMXTwj4l+wo6BZc4yiawcyuI5Gyn5Mb51/auPbW4wFv8Yg8c/s0Fr7TuxwlJi6YxjWhvWR3+phTXHWD2HwBBbzvK1/z26C9LeAHs1HB5z13E7jm1quIOaddTrT/jpfHoWINo5qSRtemXIlhWvQrmjrciIQfh4g==; 31:Dgzna7mrvqenaoYOsaIgxIEFoF+O7xKYaSSwGE6Dg+uE/VbG1WoTeyPdKd/ZA71+xUdRkrknxhZXaJ/g2ud0sx/m7sgNMdzPNaBAGMaxlynyDVv+LIqW8INvf0DU0sSieyN7KIhtpzwIfxtyXbzxonprKHGHwr3qAuhkYK4r8Av6gPh1BtEt53qQfyifR3QV8HiAtcrELzxl6evswR3QJGItVlfVpoIlMVztc9s1oE8= X-MS-TrafficTypeDiagnostic: CY1PR07MB2524: X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2524; 20:MsGwOtb51S+rIBbfozpXTZ18Plztfa2Ke9nP9595fckQiFJUHrkeffHe52Yzpre2/ioL7ENRrJq1uMDPc5gRXdj6B1LXHX25hwBsICwt98o+k33jC4EdkmRGrbM8MkOHb0+XVdmv/emXzII2x3J18TSFgvCRmGDHqC5jRbx43mTmdz7Z1b/EMtjVu83sXwwHL9PojbOXRoNxADQ+XZ0TJTWWgM9oms5GYpkMOsKK+mwxsX0+XZBRRmeEWx8gUSasc1QE8MUpnOnNlhbV5kzP6yK/13UvA0nDAaXmfo8vVkyIMnHcwGY3JJVWjFhZiN6dqrDqXb5Gq4fnM7+WO391cUssnfFv707OK3ytabz9YDn3p75FxmMa2XkS8xAcF9q8nav4O/fmfOuQpvyo8ojunCGqfLzCcS9Ia8nkY6p2Nuh4IIUVLpdb5sih8J5y9hcBwOvu4wpkIQLbnQqkBRyRYfyy2eKE6SGXCixTlZMMd66taxTtC8SasmBhDjYu7JXA; 4:zpKdJa+8bk+oE0pxHMwJ8KMZtOGkgt7UiarwCLrj592WWS8CTRlLjL7EOFyY+iJ5KRlonVkO1JyIp/5tMIMKmpkfHTIlCy3KJcCx/nQRzXPz2/KoZk5XNd9lMIHKlI2OchJEabBhbCwf6Q3wO4qEuwT3f0PoD+NmFZ/6/t0DKYrYIaGX7fzRN25D4JDEyS0itnw3c9Jkbw7feoOV4S4zxLS7s6BwBBCT4QsaaPWAgH2u7SZvEwsT3gmgjLRJIHV1 X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(5005006)(13016025)(13018025)(3002001)(10201501046)(100000703101)(100105400095)(93006095)(93001095)(6041248)(20161123558100)(20161123564025)(20161123555025)(20161123560025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY1PR07MB2524; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY1PR07MB2524; X-Forefront-PRVS: 040866B734 X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2524; 23:p1hIiwSw+JjAVTSeKaCp/Mt4hc7ctv+MPJJ6vkDV2FuO7l8cFXttI10cepxRNDqNFo7b6cOu8Q9o6ZOfix6ixaenWXLqLlX8rloDctHlEdjp26QSl/r4M0ynBEvwVzW16DKdI28fFDLiI0n9DXyPXv62RseSp12h1Bb9DJWXKDqX2bBZl1JVgSaFDS8EbbVd3Cd1qrQ3psWi62TZ00ciymmqLXbnry6/DMulKXFOuI+HoKEgSDEzkYqYajtLJjvyNay1O46oKND7xW3tl8kmcpMXmzksFFqhpc16JYM7HpXJ/CLBz5TkNkJcwySKvImoMzOhz31AXJRm7oPMD82pTqUcXZf/f+ZjiOeUNqSIDpBr7SxsfE0ioQrCwlHGxJnX12Na31lAN3YbquMbZPBURLMxVphsrTV2u+qPvVinJ3lBuX+LWq+H/64BbekErdhvw0+qQRYP/6LVuFYRYaV/2D7JwTeOxLLb6c4LWo9WbUbBJmuAPj45GlnLSVfSyHhWjveBtc5Xf6JAj1Qhk9nAC/TOKuYKL9j7azksq5eCnbYRpOqkUZjQ7/ZrHaOIZzTcQEpzKPT9Yd2GSOvmLpTiw6LWiehXP7I9FQiW4hqqxYgc3rqmSqL24j7QaOSBeibtbdBx7srpxMp757jRLnsJ3RBtCBKQc9Pls5JeeYZAV6pKQFpe+WqH/XKN06W9yMkzMGvZrWv+1qO9e2w1MPULY1QjsFE26Zv4IZvYJqYSR2g0XVBlEni7YBAs2PnwyxafhMyg3OcmfjTRHV1tP64p4HY6rZz2E2pvWAfz8U5cu6SM3ulFneLr5pDt23VafMeYOmUPT4Nw+xG7fvuhYMD3cD+G2y3mh46xpWwXSOo0a5gqVS1/L3k5fZ9yFh4EVvNZjm3xMxR0M3BNaEZbETeRsF84RUBuaGkoZ0YBljMFh LkpXVTNuB8YXEC9JcbLnczR X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2524; 6:q5u6CueHgA+E5B2jEpvuBlU6M0pJewPZ2y/LusVHvL4olUITFqY5+yPI47CEs3yyjega/pQya2/OzLkJ067JIg8CTutHMmHWFwvqtvCCuiJVPHeyiV5cNyRUQdUiRA0OUw2hHKq8uLTtrWa0++9S/adAyLaNINKpp5+r/kwqyhpWAyMD3ys6sO3knVSoNWTa1TZv7FdXIuvYrfpJ01MY7YfUDacTnDS/T8xrhaTxD0tb+yJ5+ihtYildZGJxzDAPc9F2INPWuksBektx4CrfbIl02T0lObdQAf+VGWjGKegAdaEQ1QvJs+7pGtCVEx9uNFEV0D2G0UL4kGcksX0cfg==; 5:kqbzI1a36FkEqLI7gUneMmcNVCfjEiyovQvsWCgWoHEd+x88fSAcw03t9866zqAWLGFu9lU7Hx06VI/5z+wK+auYbnYQ/TJneCbxcr5lHlCVZEd7SdtDX/5TI5/2POpjQFJxNj/lMlLyy2OvtW7r4A==; 24:2TH+Bmw57BuIQwz2AeU9F30a162Ae11+HuL7VzwXbdGFa0C/35F4jaydN3w7EJtXkjRa5zuo85uH+cxHZN7ShyjXtKry+G1cMK2G00c3gao=; 7:vNlCV3/707gb4YkteBBXZrtS5VfopHG2PlS2SZZH743S7263Lmt+GMsz6QNUCa+979OT66AZaXpRReBBO6ZtCGoHsLE96bDbXbQkz3JDsyl4mIQ+5WjaiLZAtsyZYYqrM2XgcqAz8quTA00ghx0yvJjbrlGOegGm3Fzjgg3h95FDECNtHJUgKrFYDFP11OVQ0BI9J2N1THXGdMC4zn6Skipl25D/SwZyEmsHCRBXGEo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2017 22:05:47.0567 (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: CY1PR07MB2524 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: Joe Carnuccio Signed-off-by: Joe Carnuccio Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_init.c | 12 ++++++------ drivers/scsi/qla2xxx/qla_mr.c | 7 ++++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index b380a7c97d5b..d00e0129c51b 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -808,6 +808,12 @@ int qla24xx_async_gpdb(struct scsi_qla_host *vha, fc_port_t *fcport, u8 opt) if (!sp) goto done; + sp->type = SRB_MB_IOCB; + sp->name = "gpdb"; + sp->gen1 = fcport->rscn_gen; + sp->gen2 = fcport->login_gen; + qla2x00_init_timer(sp, qla2x00_get_async_timeout(vha) + 2); + pd = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &pd_dma); if (pd == NULL) { ql_log(ql_log_warn, vha, 0xd043, @@ -816,12 +822,6 @@ int qla24xx_async_gpdb(struct scsi_qla_host *vha, fc_port_t *fcport, u8 opt) } memset(pd, 0, max(PORT_DATABASE_SIZE, PORT_DATABASE_24XX_SIZE)); - sp->type = SRB_MB_IOCB; - sp->name = "gpdb"; - sp->gen1 = fcport->rscn_gen; - sp->gen2 = fcport->login_gen; - qla2x00_init_timer(sp, qla2x00_get_async_timeout(vha) + 2); - mb = sp->u.iocb_cmd.u.mbx.out_mb; mb[0] = MBC_GET_PORT_DATABASE; mb[1] = fcport->loop_id; diff --git a/drivers/scsi/qla2xxx/qla_mr.c b/drivers/scsi/qla2xxx/qla_mr.c index 10b742d27e16..e23a3d4c36f3 100644 --- a/drivers/scsi/qla2xxx/qla_mr.c +++ b/drivers/scsi/qla2xxx/qla_mr.c @@ -1819,6 +1819,10 @@ qlafx00_fx_disc(scsi_qla_host_t *vha, fc_port_t *fcport, uint16_t fx_type) if (!sp) goto done; + sp->type = SRB_FXIOCB_DCMD; + sp->name = "fxdisc"; + qla2x00_init_timer(sp, FXDISC_TIMEOUT); + fdisc = &sp->u.iocb_cmd; switch (fx_type) { case FXDISC_GET_CONFIG_INFO: @@ -1920,9 +1924,6 @@ qlafx00_fx_disc(scsi_qla_host_t *vha, fc_port_t *fcport, uint16_t fx_type) goto done_unmap_req; } - sp->type = SRB_FXIOCB_DCMD; - sp->name = "fxdisc"; - qla2x00_init_timer(sp, FXDISC_TIMEOUT); fdisc->timeout = qla2x00_fxdisc_iocb_timeout; fdisc->u.fxiocb.req_func_type = cpu_to_le16(fx_type); sp->done = qla2x00_fxdisc_sp_done;