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 0B3561D5ABA; Wed, 25 Feb 2026 01:32:21 +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=1771983142; cv=none; b=kYLUSR2+bEd33MRVzrtyaWELeD5NLx03gFnadTikuFBJf5LSPd2LpV5/9uQH64QKXYLKFilAwXXsqX/4EKXPs0Bi2YrpkNMrKK5QRpmTKVd7m5gBIu0c4PzDHTvP3BbDtu1gYdO10z5CTQhJhoPaOekgMLVAApf2jBrqao5rKEM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771983142; c=relaxed/simple; bh=nSNPfmaPDqNZRe1uzaXoZH5tSWpGj5zx/Np/OPxY3wQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Q0N62sMWiOSsIAYu4OQxBLI/hAUfH36bnaljqlDgp2xGgvsePJjgrIicnwgT8CD+WQ0nSBgXcuWPdyEEJYtXujA8O0oWES9jPuZPSmE0wn1jxDx/1bEc05ajSJ8Vo9VFWbcB2QKsEWPwbtaLW5iXFndlBooXMaafsAo0SQCXG4Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ZlPkDqS2; 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="ZlPkDqS2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 86CE2C116D0; Wed, 25 Feb 2026 01:32:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1771983141; bh=nSNPfmaPDqNZRe1uzaXoZH5tSWpGj5zx/Np/OPxY3wQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZlPkDqS2jmojqtrb98AyQTuZIMY6WQNBIJ0kL8GP9ahvMfCmKq5x9Wbya82HM+b6l 5f9yBoZRBytWF8qzYzrLMO/Mm39VbCnCKWEBvWKCgqW9baRtjkHoxz72uNT5Rh/YYX vUpLABc84psBcomQL1INJToArMfso5i8uhDa+GZM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Zishun Yi , Lizhi Hou , Min Ma , Sasha Levin Subject: [PATCH 6.19 295/781] accel/amdxdna: Fix memory leak in amdxdna_ubuf_map Date: Tue, 24 Feb 2026 17:16:44 -0800 Message-ID: <20260225012406.944695732@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260225012359.695468795@linuxfoundation.org> References: <20260225012359.695468795@linuxfoundation.org> User-Agent: quilt/0.69 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.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zishun Yi [ Upstream commit 84dd57fb0359500092f1101409ca32091731490d ] The amdxdna_ubuf_map() function allocates memory for sg and internal sg table structures, but it fails to free them if subsequent operations (sg_alloc_table_from_pages or dma_map_sgtable) fail. Fixes: bd72d4acda10 ("accel/amdxdna: Support user space allocated buffer") Signed-off-by: Zishun Yi Reviewed-by: Lizhi Hou Reviewed-by: Min Ma Signed-off-by: Lizhi Hou Link: https://patch.msgid.link/20260129171022.68578-1-zishun.yi.dev@gmail.com Signed-off-by: Sasha Levin --- drivers/accel/amdxdna/amdxdna_ubuf.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/accel/amdxdna/amdxdna_ubuf.c b/drivers/accel/amdxdna/amdxdna_ubuf.c index 077b2261cf2a0..9e3b3b055caa8 100644 --- a/drivers/accel/amdxdna/amdxdna_ubuf.c +++ b/drivers/accel/amdxdna/amdxdna_ubuf.c @@ -34,15 +34,21 @@ static struct sg_table *amdxdna_ubuf_map(struct dma_buf_attachment *attach, ret = sg_alloc_table_from_pages(sg, ubuf->pages, ubuf->nr_pages, 0, ubuf->nr_pages << PAGE_SHIFT, GFP_KERNEL); if (ret) - return ERR_PTR(ret); + goto err_free_sg; if (ubuf->flags & AMDXDNA_UBUF_FLAG_MAP_DMA) { ret = dma_map_sgtable(attach->dev, sg, direction, 0); if (ret) - return ERR_PTR(ret); + goto err_free_table; } return sg; + +err_free_table: + sg_free_table(sg); +err_free_sg: + kfree(sg); + return ERR_PTR(ret); } static void amdxdna_ubuf_unmap(struct dma_buf_attachment *attach, -- 2.51.0