From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 08EB127F4D9; Wed, 23 Apr 2025 15:25:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745421929; cv=none; b=iJx/NYXouJAyRzVrc2Hp7SyEYHarPUWE7PefNcL9yVHja4fTa0+XmwBTdg9FFSaj8RmDIz9dgOwzVAoRpfzuQ2tmQyEERzaUU5ydpsYCp3v/b/E65zUjjQs7vhC0CM3u1Hljnovsf6z/6iSVjPS0hY05/swB4afvqzfilflYRlg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745421929; c=relaxed/simple; bh=ubNGzRovKsW1KPic2qPIo+KJey+p62ke8zerwxfRKH0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DeglL59Ol56x+NLLbOoJj2RsgQO2H6YDWfLy6gMqF2VjWFG7WJJxAmTtJlgbAZVdrwFJ8PlOwU968Z1ygMMYt5aaWmWElvsYYRuT+MGR025ioJxrHLj2t89RzXVUfYh3+4FpBPlZxK5M0Lh15kj1hC2WqbqNNORri8huVxXTPUk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=t9bPkZPF; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="t9bPkZPF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 907A5C4CEE2; Wed, 23 Apr 2025 15:25:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745421928; bh=ubNGzRovKsW1KPic2qPIo+KJey+p62ke8zerwxfRKH0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t9bPkZPFYwtQLphuB6uXrhvyKEVkbufSgpmzQ1TkXwZBuu5OT01rsT/v4ScaIw/Ff PvtDh3Q4/NgMgO6U4WGMMoaiTOtAZWNa3d9bkNzuqQRrk1yOfBcPy61obDJho4Fq/E 0R0D1dwmlzhSRPsxe4JxwUwjK821KS8KXo5u/My0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Abdun Nihaal , Simon Horman , Jacob Keller , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.1 187/291] cxgb4: fix memory leak in cxgb4_init_ethtool_filters() error path Date: Wed, 23 Apr 2025 16:42:56 +0200 Message-ID: <20250423142632.016287321@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250423142624.409452181@linuxfoundation.org> References: <20250423142624.409452181@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Abdun Nihaal [ Upstream commit 00ffb3724ce743578163f5ade2884374554ca021 ] In the for loop used to allocate the loc_array and bmap for each port, a memory leak is possible when the allocation for loc_array succeeds, but the allocation for bmap fails. This is because when the control flow goes to the label free_eth_finfo, only the allocations starting from (i-1)th iteration are freed. Fix that by freeing the loc_array in the bmap allocation error path. Fixes: d915c299f1da ("cxgb4: add skeleton for ethtool n-tuple filters") Signed-off-by: Abdun Nihaal Reviewed-by: Simon Horman Reviewed-by: Jacob Keller Link: https://patch.msgid.link/20250414170649.89156-1-abdun.nihaal@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c index 8477a93cee6bd..b77897aa06c4f 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c @@ -2273,6 +2273,7 @@ int cxgb4_init_ethtool_filters(struct adapter *adap) eth_filter->port[i].bmap = bitmap_zalloc(nentries, GFP_KERNEL); if (!eth_filter->port[i].bmap) { ret = -ENOMEM; + kvfree(eth_filter->port[i].loc_array); goto free_eth_finfo; } } -- 2.39.5