diff mbox series

[5.5,35/65] drm/amdgpu: fix memory leak during TDR test(v2)

Message ID	20200319123937.637687088@linuxfoundation.org
State	New
Headers	show Return-Path: <SRS0=1QoN=5E=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, Monk Liu <Monk.Liu@amd.com>, Hawking Zhang <Hawking.Zhang@amd.com>, Alex Deucher <alexander.deucher@amd.com>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 5.5 35/65] drm/amdgpu: fix memory leak during TDR test(v2) Date: Thu, 19 Mar 2020 14:04:17 +0100 Message-Id: <20200319123937.637687088@linuxfoundation.org> In-Reply-To: <20200319123926.466988514@linuxfoundation.org> References: <20200319123926.466988514@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [5.5,02/65] pinctrl: qcom: ssbi-gpio: Fix fwspec parsing bug [5.5,05/65] mmc: sdhci-tegra: Fix busy detection by enabling MMC_CAP_NEED_RSP_BUSY [5.5,07/65] mmc: core: Respect MMC_CAP_NEED_RSP_BUSY for eMMC sleep command [5.5,08/65] mmc: core: Respect MMC_CAP_NEED_RSP_BUSY for erase/trim/discard [5.5,09/65] ACPI: watchdog: Allow disabling WDAT at boot [5.5,10/65] HID: apple: Add support for recent firmware on Magic Keyboards [5.5,11/65] ACPI: watchdog: Set default timeout in probe [5.5,13/65] mips: vdso: fix jalr t9 crash in vdso code [5.5,16/65] HID: hid-bigbenff: fix general protection fault caused by double kfree [5.5,17/65] HID: hid-bigbenff: call hid_hw_stop() in case of error [5.5,19/65] riscv: set pmp configuration if kernel is running in M-mode [5.5,20/65] MIPS: vdso: Wrap -mexplicit-relocs in cc-option [5.5,22/65] selftests/rseq: Fix out-of-tree compilation [5.5,25/65] scsi: libfc: free response frame from GPN_ID [5.5,27/65] net: ks8851-ml: Fix IRQ handling and locking [5.5,29/65] net: ll_temac: Fix race condition causing TX hang [5.5,32/65] net: ll_temac: Handle DMA halt condition caused by buffer underrun [5.5,35/65] drm/amdgpu: fix memory leak during TDR test(v2) [5.5,38/65] kbuild: add dt_binding_check to PHONY in a correct place [5.5,39/65] signal: avoid double atomic counter increments for user accounting [5.5,41/65] slip: not call free_netdev before rtnl_unlock in slip_open [5.5,43/65] hinic: fix a irq affinity bug [5.5,46/65] net: rmnet: fix NULL pointer dereference in rmnet_newlink() [5.5,47/65] net: rmnet: fix NULL pointer dereference in rmnet_changelink() [5.5,48/65] net: rmnet: fix suspicious RCU usage [5.5,49/65] net: rmnet: remove rcu_read_lock in rmnet_force_unassociate_device() [5.5,51/65] net: rmnet: use upper/lower device infrastructure [5.5,52/65] net: rmnet: fix bridge mode bugs [5.5,54/65] sfc: fix timestamp reconstruction at 16-bit rollover points [5.5,56/65] net: dsa: mv88e6xxx: Fix masking of egress port [5.5,59/65] ARM: 8957/1: VDSO: Match ARMv8 timer in cntvct_functional() [5.5,62/65] HID: google: add moonball USB id [5.5,64/65] ARM: 8961/2: Fix Kbuild issue caused by per-task stack protector GCC plugin

Commit Message

Greg KH March 19, 2020, 1:04 p.m. UTC

From: Monk Liu <Monk.Liu@amd.com>

[ Upstream commit 4829f89855f1d3a3d8014e74cceab51b421503db ]

fix system memory leak

v2:
fix coding style

Signed-off-by: Monk Liu <Monk.Liu@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
index 8b13d18c6414c..e4149e6b68b39 100644
--- a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
+++ b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
@@ -948,8 +948,12 @@  int smu_v11_0_init_max_sustainable_clocks(struct smu_context *smu)
 	struct smu_11_0_max_sustainable_clocks *max_sustainable_clocks;
 	int ret = 0;
 
-	max_sustainable_clocks = kzalloc(sizeof(struct smu_11_0_max_sustainable_clocks),
+	if (!smu->smu_table.max_sustainable_clocks)
+		max_sustainable_clocks = kzalloc(sizeof(struct smu_11_0_max_sustainable_clocks),
 					 GFP_KERNEL);
+	else
+		max_sustainable_clocks = smu->smu_table.max_sustainable_clocks;
+
 	smu->smu_table.max_sustainable_clocks = (void *)max_sustainable_clocks;
 
 	max_sustainable_clocks->uclock = smu->smu_table.boot_values.uclk / 100;