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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 7BE07C33CAF for ; Thu, 16 Jan 2020 17:14:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 43872246B8 for ; Thu, 16 Jan 2020 17:14:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579194859; bh=ClXA1MpHf/zfcZYYxVaGGymz8GFZcU/7v2NCprR9GjQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=M4JGv8+OVly+pveXSgVFz4U9N57jEYGTGFfQoj68Jkbgm+ANOgHoNL3VWSrUmNgN7 uLnVau/9gc962mdI90pwQFXXqK+YfoxA5990URklsxwOklznULeVJRVblIP/mZ20nF rZzyGeWrmRtRJRJbhalrpCPoeOb78RtYthoz9fDo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390529AbgAPROS (ORCPT ); Thu, 16 Jan 2020 12:14:18 -0500 Received: from mail.kernel.org ([198.145.29.99]:33036 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390954AbgAPROR (ORCPT ); Thu, 16 Jan 2020 12:14:17 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 56F3B2469E; Thu, 16 Jan 2020 17:14:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579194857; bh=ClXA1MpHf/zfcZYYxVaGGymz8GFZcU/7v2NCprR9GjQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dPp5TUA7h40s0pZr+LeIrTO5ARAX/kgOGH8cCp1LBIKkN+rwjSpux3tTQcg25jtab S6Fta9O/YdpxjKau7siH/CJeNdqWlYth3fV+o6we26fTgHbzzKSdLBznV1uQ40oMyA I4IHiYWnAdNOttXsuRZV3nTmV1knVQfllj3tkIJo= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Pan Bian , Manish Rangankar , "Martin K . Petersen" , Sasha Levin , linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 652/671] scsi: qla4xxx: fix double free bug Date: Thu, 16 Jan 2020 12:04:50 -0500 Message-Id: <20200116170509.12787-389-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116170509.12787-1-sashal@kernel.org> References: <20200116170509.12787-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org From: Pan Bian [ Upstream commit 3fe3d2428b62822b7b030577cd612790bdd8c941 ] The variable init_fw_cb is released twice, resulting in a double free bug. The call to the function dma_free_coherent() before goto is removed to get rid of potential double free. Fixes: 2a49a78ed3c8 ("[SCSI] qla4xxx: added IPv6 support.") Link: https://lore.kernel.org/r/1572945927-27796-1-git-send-email-bianpan2016@163.com Signed-off-by: Pan Bian Acked-by: Manish Rangankar Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/qla4xxx/ql4_mbx.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/scsi/qla4xxx/ql4_mbx.c b/drivers/scsi/qla4xxx/ql4_mbx.c index 5d56904687b9..c81de7732359 100644 --- a/drivers/scsi/qla4xxx/ql4_mbx.c +++ b/drivers/scsi/qla4xxx/ql4_mbx.c @@ -640,9 +640,6 @@ int qla4xxx_initialize_fw_cb(struct scsi_qla_host * ha) if (qla4xxx_get_ifcb(ha, &mbox_cmd[0], &mbox_sts[0], init_fw_cb_dma) != QLA_SUCCESS) { - dma_free_coherent(&ha->pdev->dev, - sizeof(struct addr_ctrl_blk), - init_fw_cb, init_fw_cb_dma); goto exit_init_fw_cb; } -- 2.20.1