From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Lang Yu <lang.yu@amd.com>,
Alex Deucher <alexander.deucher@amd.com>,
Sasha Levin <sashal@kernel.org>,
christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com,
simona@ffwll.ch, Frank.Min@amd.com,
pierre-eric.pelloux-prayer@amd.com, felix.kuehling@amd.com,
Philip.Yang@amd.com, mdaenzer@redhat.com,
Arunpravin.PaneerSelvam@amd.com, Amaranath.Somalapuram@amd.com,
amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Subject: [PATCH AUTOSEL 5.10 18/33] drm/amdgpu: refine error handling in amdgpu_ttm_tt_pin_userptr
Date: Sun, 24 Nov 2024 08:53:30 -0500 [thread overview]
Message-ID: <20241124135410.3349976-18-sashal@kernel.org> (raw)
In-Reply-To: <20241124135410.3349976-1-sashal@kernel.org>
From: Lang Yu <lang.yu@amd.com>
[ Upstream commit 46186667f98fb7158c98f4ff5da62c427761ffcd ]
Free sg table when dma_map_sgtable() failed to avoid memory leak.
Signed-off-by: Lang Yu <lang.yu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 0b162928a248b..8196a8e253266 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -1006,7 +1006,7 @@ static int amdgpu_ttm_tt_pin_userptr(struct ttm_bo_device *bdev,
/* Map SG to device */
r = dma_map_sgtable(adev->dev, ttm->sg, direction, 0);
if (r)
- goto release_sg;
+ goto release_sg_table;
/* convert SG to linear array of pages and dma addresses */
drm_prime_sg_to_page_addr_arrays(ttm->sg, ttm->pages,
@@ -1014,6 +1014,8 @@ static int amdgpu_ttm_tt_pin_userptr(struct ttm_bo_device *bdev,
return 0;
+release_sg_table:
+ sg_free_table(ttm->sg);
release_sg:
kfree(ttm->sg);
ttm->sg = NULL;
--
2.43.0
next prev parent reply other threads:[~2024-11-24 13:54 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-24 13:53 [PATCH AUTOSEL 5.10 01/33] drm/vc4: hvs: Set AXI panic modes for the HVS Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 02/33] drm: panel-orientation-quirks: Add quirk for AYA NEO 2 model Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 03/33] drm/mcde: Enable module autoloading Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 04/33] drm/radeon/r600_cs: Fix possible int overflow in r600_packet3_check() Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 05/33] r8169: don't apply UDP padding quirk on RTL8126A Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 06/33] samples/bpf: Fix a resource leak Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 07/33] net: fec_mpc52xx_phy: Use %pa to format resource_size_t Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 08/33] net: ethernet: fs_enet: " Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 09/33] net/sched: cbs: Fix integer overflow in cbs_set_port_rate() Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 10/33] af_packet: avoid erroring out after sock_init_data() in packet_create() Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 11/33] Bluetooth: L2CAP: do not leave dangling sk pointer on error in l2cap_sock_create() Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 12/33] net: af_can: do not leave a dangling sk pointer in can_create() Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 13/33] net: ieee802154: do not leave a dangling sk pointer in ieee802154_create() Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 14/33] net: inet: do not leave a dangling sk pointer in inet_create() Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 15/33] net: inet6: do not leave a dangling sk pointer in inet6_create() Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 16/33] wifi: ath5k: add PCI ID for SX76X Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 17/33] wifi: ath5k: add PCI ID for Arcadyan devices Sasha Levin
2024-11-24 13:53 ` Sasha Levin [this message]
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 19/33] dma-debug: fix a possible deadlock on radix_lock Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 20/33] jfs: array-index-out-of-bounds fix in dtReadFirst Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 21/33] jfs: fix shift-out-of-bounds in dbSplit Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 22/33] jfs: fix array-index-out-of-bounds in jfs_readdir Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 23/33] jfs: add a check to prevent array-index-out-of-bounds in dbAdjTree Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 24/33] net: enetc: add i.MX95 EMDIO support Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 25/33] drm/amdgpu: skip amdgpu_device_cache_pci_state under sriov Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 26/33] drm/amdgpu: set the right AMDGPU sg segment limitation Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 27/33] wifi: ipw2x00: libipw_rx_any(): fix bad alignment Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 28/33] wifi: brcmfmac: Fix oops due to NULL pointer dereference in brcmf_sdiod_sglist_rw() Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 29/33] Bluetooth: btusb: Add RTL8852BE device 0489:e123 to device tables Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 30/33] ASoC: hdmi-codec: reorder channel allocation list Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 31/33] rocker: fix link status detection in rocker_carrier_init() Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 32/33] net/neighbor: clear error in case strict check is not set Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 33/33] netpoll: Use rcu_access_pointer() in __netpoll_setup Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241124135410.3349976-18-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=Amaranath.Somalapuram@amd.com \
--cc=Arunpravin.PaneerSelvam@amd.com \
--cc=Frank.Min@amd.com \
--cc=Philip.Yang@amd.com \
--cc=Xinhui.Pan@amd.com \
--cc=airlied@gmail.com \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=christian.koenig@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=felix.kuehling@amd.com \
--cc=lang.yu@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mdaenzer@redhat.com \
--cc=pierre-eric.pelloux-prayer@amd.com \
--cc=simona@ffwll.ch \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox