diff options
| author | Armin Wolf <W_Armin@gmx.de> | 2024-02-13 01:50:50 +0100 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2024-02-22 12:26:59 -0500 |
| commit | bae67893578d608e35691dcdfa90c4957debf1d3 (patch) | |
| tree | 8203322944d4e529b82bb69ab4f81b673780eb64 | |
| parent | 27a6c49394b1a203beeb94752c9a1d6318f24ddf (diff) | |
| download | linux-bae67893578d608e35691dcdfa90c4957debf1d3.tar.gz | |
drm/amd/display: Fix memory leak in dm_sw_fini()
After destroying dmub_srv, the memory associated with it is
not freed, causing a memory leak:
unreferenced object 0xffff896302b45800 (size 1024):
comm "(udev-worker)", pid 222, jiffies 4294894636
hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace (crc 6265fd77):
[<ffffffff993495ed>] kmalloc_trace+0x29d/0x340
[<ffffffffc0ea4a94>] dm_dmub_sw_init+0xb4/0x450 [amdgpu]
[<ffffffffc0ea4e55>] dm_sw_init+0x15/0x2b0 [amdgpu]
[<ffffffffc0ba8557>] amdgpu_device_init+0x1417/0x24e0 [amdgpu]
[<ffffffffc0bab285>] amdgpu_driver_load_kms+0x15/0x190 [amdgpu]
[<ffffffffc0ba09c7>] amdgpu_pci_probe+0x187/0x4e0 [amdgpu]
[<ffffffff9968fd1e>] local_pci_probe+0x3e/0x90
[<ffffffff996918a3>] pci_device_probe+0xc3/0x230
[<ffffffff99805872>] really_probe+0xe2/0x480
[<ffffffff99805c98>] __driver_probe_device+0x78/0x160
[<ffffffff99805daf>] driver_probe_device+0x1f/0x90
[<ffffffff9980601e>] __driver_attach+0xce/0x1c0
[<ffffffff99803170>] bus_for_each_dev+0x70/0xc0
[<ffffffff99804822>] bus_add_driver+0x112/0x210
[<ffffffff99807245>] driver_register+0x55/0x100
[<ffffffff990012d1>] do_one_initcall+0x41/0x300
Fix this by freeing dmub_srv after destroying it.
Fixes: 743b9786b14a ("drm/amd/display: Hook up the DMUB service in DM")
Signed-off-by: Armin Wolf <W_Armin@gmx.de>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Notes
Fixes: 743b9786b14a ("drm/amd/display: Hook up the DMUB service in DM") # v5.6-rc1
Stable: 10c6b90e9753 # v6.6.19
Stable: 58168005337e # v6.1.80
Stable: 33f649f1b1ce # v5.15.150
Stable: b49b022f7dfc # v5.10.211
Lore: https://lore.kernel.org/r/20240213005050.4442-1-W_Armin@gmx.de # amd-gfx, dri-devel, lkml
Lore: https://lore.kernel.org/r/20240227131602.562736053@linuxfoundation.org # linux-patches, stable
Lore: https://lore.kernel.org/r/20240227131616.446566361@linuxfoundation.org # linux-patches, stable
Lore: https://lore.kernel.org/r/20240227131622.840452253@linuxfoundation.org # linux-patches, stable
Lore: https://lore.kernel.org/r/20240227131634.973839157@linuxfoundation.org # linux-patches, stable
Lore: https://lore.kernel.org/r/20240227131641.686561443@linuxfoundation.org # linux-patches, stable
| -rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 377d532ca7618a..ef27dd71cbbc59 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -2278,6 +2278,7 @@ static int dm_sw_fini(void *handle) if (adev->dm.dmub_srv) { dmub_srv_destroy(adev->dm.dmub_srv); + kfree(adev->dm.dmub_srv); adev->dm.dmub_srv = NULL; } |