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=unavailable 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 3B585C433E0 for ; Thu, 18 Jun 2020 01:33:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0DAF2207E8 for ; Thu, 18 Jun 2020 01:33:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592444017; bh=hx81nUocqBVnrfUij0Ud9e2DUHC0kMoqcKSVpgKsi44=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=GiL3/ZqD0SfHin/U3wo5f0FW5TcAZhc8OKg7hxrW6b1Gd7b6tdx5sTLLKrU5PL1nM y/UejQEgz0Wm2dtgp8IN+0KscC1u+1n8GyYiPQUsmKGuxLQF5S4KSMpd7JKTrQk4ox 7D1pf9ZojkKvbwcGNNNE5OaCOw3vsbcFGJBYvHlE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732966AbgFRBdf (ORCPT ); Wed, 17 Jun 2020 21:33:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:41064 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731283AbgFRBat (ORCPT ); Wed, 17 Jun 2020 21:30:49 -0400 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 DEDE52224B; Thu, 18 Jun 2020 01:30:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592443848; bh=hx81nUocqBVnrfUij0Ud9e2DUHC0kMoqcKSVpgKsi44=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X0wUaLzd8nfReFWi5GecIDXlTrlb4/2RQnEmKFse/NOV2J829SmIvBLxDnejeXZtB FrmA/jyqNvSGTvYCUiJtv8qFDtopPel7zZaFXAblR8jgnUxI7oBBzqC3fyO0crYgjn 6oT0MODjaR8h4oy/PR4HN9olU6gJAyeTXpNldGRU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Suganath Prabu S , Dan Carpenter , "Martin K . Petersen" , Sasha Levin , MPT-FusionLinux.pdl@broadcom.com, linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 33/60] scsi: mpt3sas: Fix double free warnings Date: Wed, 17 Jun 2020 21:29:37 -0400 Message-Id: <20200618013004.610532-33-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618013004.610532-1-sashal@kernel.org> References: <20200618013004.610532-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Suganath Prabu S [ Upstream commit cbbfdb2a2416c9f0cde913cf09670097ac281282 ] Fix following warning from Smatch static analyser: drivers/scsi/mpt3sas/mpt3sas_base.c:5256 _base_allocate_memory_pools() warn: 'ioc->hpr_lookup' double freed drivers/scsi/mpt3sas/mpt3sas_base.c:5256 _base_allocate_memory_pools() warn: 'ioc->internal_lookup' double freed Link: https://lore.kernel.org/r/20200508110738.30732-1-suganath-prabu.subramani@broadcom.com Reported-by: Dan Carpenter Signed-off-by: Suganath Prabu S Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/mpt3sas/mpt3sas_base.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c index 7af7a0859478..8d52afd1f71d 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.c +++ b/drivers/scsi/mpt3sas/mpt3sas_base.c @@ -3136,7 +3136,9 @@ _base_release_memory_pools(struct MPT3SAS_ADAPTER *ioc) ioc->scsi_lookup = NULL; } kfree(ioc->hpr_lookup); + ioc->hpr_lookup = NULL; kfree(ioc->internal_lookup); + ioc->internal_lookup = NULL; if (ioc->chain_lookup) { for (i = 0; i < ioc->chain_depth; i++) { if (ioc->chain_lookup[i].chain_buffer) -- 2.25.1