[4.19,29/49] drm/amdgpu: prevent double kfree ttm->sg

Message ID	20201012132630.803558121@linuxfoundation.org
State	New
Headers	show Return-Path: <SRS0=uWP8=DT=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Philip Yang <Philip.Yang@amd.com>, Felix Kuehling <Felix.Kuehling@amd.com>, =?utf-8?q?Christian_K?= =?utf-8?b?w7ZuaWc=?= <christian.koenig@amd.com>, Alex Deucher <alexander.deucher@amd.com>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 4.19 29/49] drm/amdgpu: prevent double kfree ttm->sg Date: Mon, 12 Oct 2020 15:27:15 +0200 Message-Id: <20201012132630.803558121@linuxfoundation.org> In-Reply-To: <20201012132629.469542486@linuxfoundation.org> References: <20201012132629.469542486@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [4.19,05/49] net: wireless: nl80211: fix out-of-bounds access in nl80211_del_key() [4.19,06/49] drm/nouveau/mem: guard against NULL pointer access in mem_del [4.19,08/49] platform/x86: intel-vbtn: Fix SW_TABLET_MODE always reporting 1 on the HP Pavilion 1... [4.19,09/49] platform/x86: thinkpad_acpi: initialize tp_nvram_state variable [4.19,10/49] platform/x86: intel-vbtn: Switch to an allow-list for SW_TABLET_MODE reporting [4.19,15/49] mtd: rawnand: sunxi: Fix the probe error path [4.19,17/49] nvme-core: put ctrl ref when module ref get fail [4.19,18/49] macsec: avoid use-after-free in macsec_handle_frame() [4.19,21/49] cifs: Fix incomplete memory allocation on setxattr path [4.19,22/49] i2c: meson: fix clock setting overwrite [4.19,23/49] i2c: meson: fixup rate calculation with filter delay [4.19,25/49] sctp: fix sctp_auth_init_hmacs() error path [4.19,26/49] team: set dev->needed_headroom in team_setup_by_port() [4.19,29/49] drm/amdgpu: prevent double kfree ttm->sg [4.19,30/49] xfrm: clone XFRMA_SET_MARK in xfrm_do_migrate [4.19,32/49] xfrm: clone XFRMA_SEC_CTX in xfrm_do_migrate [4.19,34/49] net: stmmac: removed enabling eee in EEE set callback [4.19,38/49] mdio: fix mdio-thunder.c dependency & build error [4.19,39/49] net: usb: ax88179_178a: fix missing stop entry in driver_info [4.19,40/49] net/mlx5e: Fix VLAN cleanup flow [4.19,42/49] rxrpc: Fix rxkad token xdr encoding [4.19,46/49] perf: Fix task_function_call() error handling [4.19,47/49] mmc: core: dont set limits.discard_granularity as 0 [4.19,49/49] net: usb: rtl8150: set random MAC address when set_ethernet_addr() fails

Message ID

20201012132630.803558121@linuxfoundation.org

State

New

Headers

From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org,
	Philip Yang <Philip.Yang@amd.com>, 
	Felix Kuehling <Felix.Kuehling@amd.com>, =?utf-8?q?Christian_K?=
	=?utf-8?b?w7ZuaWc=?= <christian.koenig@amd.com>,
	Alex Deucher <alexander.deucher@amd.com>, Sasha Levin <sashal@kernel.org>
Subject: [PATCH 4.19 29/49] drm/amdgpu: prevent double kfree ttm->sg
Date: Mon, 12 Oct 2020 15:27:15 +0200
Message-Id: <20201012132630.803558121@linuxfoundation.org>
In-Reply-To: <20201012132629.469542486@linuxfoundation.org>
References: <20201012132629.469542486@linuxfoundation.org>
User-Agent: quilt/0.66
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

None | expand

Commit Message

Greg Kroah-Hartman Oct. 12, 2020, 1:27 p.m. UTC

From: Philip Yang <Philip.Yang@amd.com>

[ Upstream commit 1d0e16ac1a9e800598dcfa5b6bc53b704a103390 ]

Set ttm->sg to NULL after kfree, to avoid memory corruption backtrace:

[  420.932812] kernel BUG at
/build/linux-do9eLF/linux-4.15.0/mm/slub.c:295!
[  420.934182] invalid opcode: 0000 [#1] SMP NOPTI
[  420.935445] Modules linked in: xt_conntrack ipt_MASQUERADE
[  420.951332] Hardware name: Dell Inc. PowerEdge R7525/0PYVT1, BIOS
1.5.4 07/09/2020
[  420.952887] RIP: 0010:__slab_free+0x180/0x2d0
[  420.954419] RSP: 0018:ffffbe426291fa60 EFLAGS: 00010246
[  420.955963] RAX: ffff9e29263e9c30 RBX: ffff9e29263e9c30 RCX:
000000018100004b
[  420.957512] RDX: ffff9e29263e9c30 RSI: fffff3d33e98fa40 RDI:
ffff9e297e407a80
[  420.959055] RBP: ffffbe426291fb00 R08: 0000000000000001 R09:
ffffffffc0d39ade
[  420.960587] R10: ffffbe426291fb20 R11: ffff9e49ffdd4000 R12:
ffff9e297e407a80
[  420.962105] R13: fffff3d33e98fa40 R14: ffff9e29263e9c30 R15:
ffff9e2954464fd8
[  420.963611] FS:  00007fa2ea097780(0000) GS:ffff9e297e840000(0000)
knlGS:0000000000000000
[  420.965144] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[  420.966663] CR2: 00007f16bfffefb8 CR3: 0000001ff0c62000 CR4:
0000000000340ee0
[  420.968193] Call Trace:
[  420.969703]  ? __page_cache_release+0x3c/0x220
[  420.971294]  ? amdgpu_ttm_tt_unpopulate+0x5e/0x80 [amdgpu]
[  420.972789]  kfree+0x168/0x180
[  420.974353]  ? amdgpu_ttm_tt_set_user_pages+0x64/0xc0 [amdgpu]
[  420.975850]  ? kfree+0x168/0x180
[  420.977403]  amdgpu_ttm_tt_unpopulate+0x5e/0x80 [amdgpu]
[  420.978888]  ttm_tt_unpopulate.part.10+0x53/0x60 [amdttm]
[  420.980357]  ttm_tt_destroy.part.11+0x4f/0x60 [amdttm]
[  420.981814]  ttm_tt_destroy+0x13/0x20 [amdttm]
[  420.983273]  ttm_bo_cleanup_memtype_use+0x36/0x80 [amdttm]
[  420.984725]  ttm_bo_release+0x1c9/0x360 [amdttm]
[  420.986167]  amdttm_bo_put+0x24/0x30 [amdttm]
[  420.987663]  amdgpu_bo_unref+0x1e/0x30 [amdgpu]
[  420.989165]  amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu+0x9ca/0xb10
[amdgpu]
[  420.990666]  kfd_ioctl_alloc_memory_of_gpu+0xef/0x2c0 [amdgpu]

Signed-off-by: Philip Yang <Philip.Yang@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: Christian König <christian.koenig@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 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index fcf421263fd96..abad7460084f2 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -954,6 +954,7 @@  static int amdgpu_ttm_tt_pin_userptr(struct ttm_tt *ttm)
 
 release_sg:
 	kfree(ttm->sg);
+	ttm->sg = NULL;
 	return r;
 }

[4.19,29/49] drm/amdgpu: prevent double kfree ttm->sg

Commit Message

Patch