Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1627531E822 for ; Mon, 8 Jun 2026 06:36:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780900607; cv=none; b=L92Xqbs3SAD6p6h/t0YFf7e4iwQb3vVFQlgLFc6e96oem7X6I6OokYtX9j3LH0aL5aBDXUsXnHHuEuhrFKn8VmB2LmFQosi7I4S29mMDM3K+5dYnVmRYuHd80J/Zhy/PUEs97oZkD9RphMjdXqwtLIIZpenYe1mebwTd0IEikTw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780900607; c=relaxed/simple; bh=rPQaOwvb5gszQQzTzjgk1Ydn5FOX8Zwj1Etk/ZGvGIk=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=FQrb+ZUYPzHpllsXn8/C3i6vFvdZbZ5dwW38Nrnbiqn7ADKzUBX5+3PTTU2myj5dqLi8WKTNtTxjnGAK0X8AOSs4Bzscc0xG7dOOJfVb6e0sdDiFC/rWDJLgi2uEiV0pxx92y+yGlWvkEptyrgNvQWALbs2woT8sbfZvEgGk4tc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=fKnBKsPx; arc=none smtp.client-ip=209.85.215.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fKnBKsPx" Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-c8584bbbf2cso2611774a12.3 for ; Sun, 07 Jun 2026 23:36:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780900604; x=1781505404; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=7oVk9np2C8rowcJJ6cLLZoIRh76RsaPNf2tnKfd50h0=; b=fKnBKsPx7Qi0vod17O0GMU37mkgC5Hlj86j2XyQEp3eHGN7buTzZMXKncTbEPkRYIs rAq0T2PgUAcdvwuU5NHRRPl1DwlNTgjAOA5xPemUSsHShwi96O63zoCbObwwb/yPYcAn 69rNbRjO6PcY8fPMHt7eR9RQnm3DvOneKZD6XzxwZufelZi61QUqEIqqp9QxKfegW6v0 Y1Qga0ro9QwVtVO24HyS1Ei0ckvXTZpF3pbpZZLmTSGYZwzempz9JbNax2l8QokS6Gq1 wT/RzZR7jxGDrTIwAX/ZI2DcPrJ03kJavm4Vsk4fLAyImzQfH1ng/kBHLRJAUucFE/Lk eo6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780900604; x=1781505404; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=7oVk9np2C8rowcJJ6cLLZoIRh76RsaPNf2tnKfd50h0=; b=JqY3BlTFN1jF9nW3OaLXcH6U781TkXRg8fZtU8YrS7Ycy+tpr6P2XRJvbbbU0PyyI/ r6bmkG4ucj6jsab8Sx2C7ZqbwREBrfmgbWFaO0IpwnNT4lLnxshfQIc8kp9hnCxNDXO4 DWoC3r30+O8BPG9DAJjhZDDcU2mWB6AunfEeFs5EkqRi8n9dnFV20lvi/PKGjx9Yoxyw DJpzc6E9tJdr2pPOTdAEGo1pyLNeQMy3W9wDAvS2JTfsd6NwOdbqhyxObMECe2kBKlbM onJpDXSpojdOk8+mjKim/3LiSZRIZLY9qm9WPNTspHjTbw6rrSsPcdiaWK/nrY+jlJ2f Nu1A== X-Forwarded-Encrypted: i=1; AFNElJ+RCmh9OX+j/Mpey4g7hcquoY74Hm4Xttv6ONYX2pyCu84mlGggILhp4Bk9cp35h9GBrkSpbqp0+0BeHJs=@vger.kernel.org X-Gm-Message-State: AOJu0YyBLUPyyCtjNT8zYMdY/pO3oo15IJj3RemkM0F9c3kDwfxIrfHS 6g9wze71ifevvba/gLXQg8mrqOjUY0zOf7wJWwf5uSTxyEki+TMYz0An X-Gm-Gg: Acq92OEvsF+CE3QTLfGXyLMFilfl+D+a0BxUYQSWNK/XA6Pt/x8htpysi6Q6uS0clxF 9Gok7XYPsjnXwb1TOQzPPGjQRyaEGQ7XrZZD6XUXCMNgI9yg0PpEolBZp1AK+PK1fSiVbWXjBok Uhs339l1L712pHQ8fcgnC9CHGo6vsxNjIYmRENmQ7W1e0FWAxThX+60nb3LOVWYe0wffcIwHDw5 yreBW+ALiAwaxs2RCX57faqAlrBwTMYeLj0u/s5ONcY//yAG63gy0/TFEek8ejaBE/oraaxQAEv lavn28KvZzj03/GDF0aUUdHMhMA5eaSIFKTyyrWYP/9qsXH9BUf/SbTAgASZJ0oJDiZphrSwC8s LK+dzOz/OF6aw2h6xFqRCmH2DrJ6Uv8a0x/QRmVaR1QEYEEzFwioG6VGrB+DE7GXrT/YUTCL4Qc /yHZeYb7USDIJTSXmRHO/MIpunMgxsDt0pVWYeSMSaDP6UdaUpM6XXZyz2t6uGq7s= X-Received: by 2002:a05:6a00:929e:b0:83f:250d:59c with SMTP id d2e1a72fcca58-842b0fa5602mr14958894b3a.39.1780900604162; Sun, 07 Jun 2026 23:36:44 -0700 (PDT) Received: from haichao.tail057a43.ts.net ([2001:da8:e000:1206:9a2:954d:67fe:d9c2]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-842823512b0sm17743127b3a.15.2026.06.07.23.36.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jun 2026 23:36:43 -0700 (PDT) From: Ruoyu Wang To: Alex Deucher Cc: =?UTF-8?q?Christian=20K=C3=B6nig?= , David Airlie , Simona Vetter , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Ruoyu Wang Subject: [PATCH] drm/radeon: avoid double free in r600 DPM cleanup Date: Mon, 8 Jun 2026 14:36:38 +0800 Message-ID: <20260608063638.24-1-ruoyuw560@gmail.com> X-Mailer: git-send-email 2.51.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit r600_parse_extended_power_table() uses manual kfree() calls for some early allocation failures, but the freed pointers are left in the dynamic power-management state. If device teardown later calls r600_free_extended_power_table(), those stale pointers can be freed again. Use the common extended power table cleanup helper for those early failure paths as well, and clear each pointer after freeing it so repeated cleanup stays safe. Signed-off-by: Ruoyu Wang --- drivers/gpu/drm/radeon/r600_dpm.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/radeon/r600_dpm.c b/drivers/gpu/drm/radeon/r600_dpm.c index 83f1ae31cbdbc..9755e717ca8bb 100644 --- a/drivers/gpu/drm/radeon/r600_dpm.c +++ b/drivers/gpu/drm/radeon/r600_dpm.c @@ -932,7 +932,7 @@ int r600_parse_extended_power_table(struct radeon_device *rdev) ret = r600_parse_clk_voltage_dep_table(&rdev->pm.dpm.dyn_state.vddci_dependency_on_mclk, dep_table); if (ret) { - kfree(rdev->pm.dpm.dyn_state.vddc_dependency_on_sclk.entries); + r600_free_extended_power_table(rdev); return ret; } } @@ -943,8 +943,7 @@ int r600_parse_extended_power_table(struct radeon_device *rdev) ret = r600_parse_clk_voltage_dep_table(&rdev->pm.dpm.dyn_state.vddc_dependency_on_mclk, dep_table); if (ret) { - kfree(rdev->pm.dpm.dyn_state.vddc_dependency_on_sclk.entries); - kfree(rdev->pm.dpm.dyn_state.vddci_dependency_on_mclk.entries); + r600_free_extended_power_table(rdev); return ret; } } @@ -955,9 +954,7 @@ int r600_parse_extended_power_table(struct radeon_device *rdev) ret = r600_parse_clk_voltage_dep_table(&rdev->pm.dpm.dyn_state.mvdd_dependency_on_mclk, dep_table); if (ret) { - kfree(rdev->pm.dpm.dyn_state.vddc_dependency_on_sclk.entries); - kfree(rdev->pm.dpm.dyn_state.vddci_dependency_on_mclk.entries); - kfree(rdev->pm.dpm.dyn_state.vddc_dependency_on_mclk.entries); + r600_free_extended_power_table(rdev); return ret; } } @@ -1296,17 +1293,29 @@ void r600_free_extended_power_table(struct radeon_device *rdev) struct radeon_dpm_dynamic_state *dyn_state = &rdev->pm.dpm.dyn_state; kfree(dyn_state->vddc_dependency_on_sclk.entries); + dyn_state->vddc_dependency_on_sclk.entries = NULL; kfree(dyn_state->vddci_dependency_on_mclk.entries); + dyn_state->vddci_dependency_on_mclk.entries = NULL; kfree(dyn_state->vddc_dependency_on_mclk.entries); + dyn_state->vddc_dependency_on_mclk.entries = NULL; kfree(dyn_state->mvdd_dependency_on_mclk.entries); + dyn_state->mvdd_dependency_on_mclk.entries = NULL; kfree(dyn_state->cac_leakage_table.entries); + dyn_state->cac_leakage_table.entries = NULL; kfree(dyn_state->phase_shedding_limits_table.entries); + dyn_state->phase_shedding_limits_table.entries = NULL; kfree(dyn_state->ppm_table); + dyn_state->ppm_table = NULL; kfree(dyn_state->cac_tdp_table); + dyn_state->cac_tdp_table = NULL; kfree(dyn_state->vce_clock_voltage_dependency_table.entries); + dyn_state->vce_clock_voltage_dependency_table.entries = NULL; kfree(dyn_state->uvd_clock_voltage_dependency_table.entries); + dyn_state->uvd_clock_voltage_dependency_table.entries = NULL; kfree(dyn_state->samu_clock_voltage_dependency_table.entries); + dyn_state->samu_clock_voltage_dependency_table.entries = NULL; kfree(dyn_state->acp_clock_voltage_dependency_table.entries); + dyn_state->acp_clock_voltage_dependency_table.entries = NULL; } enum radeon_pcie_gen r600_get_pcie_gen_support(struct radeon_device *rdev, -- 2.51.0