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=-13.1 required=3.0 tests=BAYES_00,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 E44CDC433E1 for ; Fri, 21 Aug 2020 16:25:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BC83B20658 for ; Fri, 21 Aug 2020 16:25:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598027131; bh=Y6ZBqBPEUEaXpKEt9DK8JT4fXyxAw65qwD3fk4ufWy0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ywiqJq7r/McyrZb+o00vqNYmAY2f3COYfpVTOxKindBzgJjqTOuAglRfAgWvNkAaf W7Z0ko23NNGhYqx/Cri6cePftW1s/WkZfX+8kIDXDl2HQtO8TODLwaOHyal1VwJ9Jz QB76uClAh2XvBpqdgikvzTvNRPTtNr1vo3sdVa/Y= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728622AbgHUQYk (ORCPT ); Fri, 21 Aug 2020 12:24:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:50114 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728467AbgHUQVg (ORCPT ); Fri, 21 Aug 2020 12:21:36 -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 B914622DD6; Fri, 21 Aug 2020 16:20:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598026841; bh=Y6ZBqBPEUEaXpKEt9DK8JT4fXyxAw65qwD3fk4ufWy0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kd7eqXgUChu7dPvMUwK1Mn9TqEGIUgXIv4F5x5y25ODitEMzS4tKT6zE3gJViAmjB rmRMfB3tzQJ+lwRgFoT9ukr21R/jGJvD36bEN8V/uKB0LaWXvvHRjepkb3GuOrfyaZ jmfdR8YSPjEUZotnB05fSWhljZr1IG0Fp8MThrqo= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Javed Hasan , Girish Basrur , Santosh Vernekar , Saurav Kashyap , Shyam Sundar , "Martin K . Petersen" , Sasha Levin , linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 21/22] scsi: fcoe: Memory leak fix in fcoe_sysfs_fcf_del() Date: Fri, 21 Aug 2020 12:20:13 -0400 Message-Id: <20200821162014.349506-21-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200821162014.349506-1-sashal@kernel.org> References: <20200821162014.349506-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: Javed Hasan [ Upstream commit e95b4789ff4380733006836d28e554dc296b2298 ] In fcoe_sysfs_fcf_del(), we first deleted the fcf from the list and then freed it if ctlr_dev was not NULL. This was causing a memory leak. Free the fcf even if ctlr_dev is NULL. Link: https://lore.kernel.org/r/20200729081824.30996-3-jhasan@marvell.com Reviewed-by: Girish Basrur Reviewed-by: Santosh Vernekar Reviewed-by: Saurav Kashyap Reviewed-by: Shyam Sundar Signed-off-by: Javed Hasan Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/fcoe/fcoe_ctlr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/fcoe/fcoe_ctlr.c b/drivers/scsi/fcoe/fcoe_ctlr.c index 3bc610d160f57..53afdbe17d71d 100644 --- a/drivers/scsi/fcoe/fcoe_ctlr.c +++ b/drivers/scsi/fcoe/fcoe_ctlr.c @@ -264,9 +264,9 @@ static void fcoe_sysfs_fcf_del(struct fcoe_fcf *new) WARN_ON(!fcf_dev); new->fcf_dev = NULL; fcoe_fcf_device_delete(fcf_dev); - kfree(new); mutex_unlock(&cdev->lock); } + kfree(new); } /** -- 2.25.1