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 CB3A32BD12; Fri, 5 Jan 2024 14:40:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="FvdEFph2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 01251C433C8; Fri, 5 Jan 2024 14:40:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1704465609; bh=NfPHhMUkx+5o98AHjbmOkDUIi8TB6CEZHkm5jt8hkiU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FvdEFph2ARHjM9sNcxRlGAzIfkY2QRqnkFBUkoRZpQhT/PwTQ3lEx7xVMTKPVBz04 11KbmyW59dYlALYOjsDocfI8HZHWxYnTUgsSAjedlVUN7luMdaKslHmodU5q89NyEu hyAUM5JFUZyrKrsnEcPuJFo3POwygl4O8+VUi1MM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Zhipeng Lu , Suman Ghosh , "David S. Miller" , Sasha Levin Subject: [PATCH 4.14 05/21] ethernet: atheros: fix a memleak in atl1e_setup_ring_resources Date: Fri, 5 Jan 2024 15:38:52 +0100 Message-ID: <20240105143811.791652924@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240105143811.536282337@linuxfoundation.org> References: <20240105143811.536282337@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zhipeng Lu [ Upstream commit 309fdb1c33fe726d92d0030481346f24e1b01f07 ] In the error handling of 'offset > adapter->ring_size', the tx_ring->tx_buffer allocated by kzalloc should be freed, instead of 'goto failed' instantly. Fixes: a6a5325239c2 ("atl1e: Atheros L1E Gigabit Ethernet driver") Signed-off-by: Zhipeng Lu Reviewed-by: Suman Ghosh Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c index 33a688d8aaba9..3c6a32d548468 100644 --- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c +++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c @@ -880,10 +880,13 @@ static int atl1e_setup_ring_resources(struct atl1e_adapter *adapter) netdev_err(adapter->netdev, "offset(%d) > ring size(%d) !!\n", offset, adapter->ring_size); err = -1; - goto failed; + goto free_buffer; } return 0; +free_buffer: + kfree(tx_ring->tx_buffer); + tx_ring->tx_buffer = NULL; failed: if (adapter->ring_vir_addr != NULL) { pci_free_consistent(pdev, adapter->ring_size, -- 2.43.0