From: Chia-I Wu <olvaffe@gmail.com>

Date: Tue, 7 Mar 2023 16:19:02 -0800

Subject: [PATCH] drm/amdkfd: fix a potential double free in pqm_create_queue

References: bsc#1012628

Patch-mainline: 6.2.10

Git-commit: b2ca5c5d416b4e72d1e9d0293fc720e2d525fd42

[ Upstream commit b2ca5c5d416b4e72d1e9d0293fc720e2d525fd42 ]

Set *q to NULL on errors, otherwise pqm_create_queue would free it

again.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>

Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>

Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

Signed-off-by: Sasha Levin <sashal@kernel.org>

Signed-off-by: Jiri Slaby <jslaby@suse.cz>

---

 drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c

index 5137476e..4236539d 100644

--- a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c

+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c

@@ -218,8 +218,8 @@ static int init_user_queue(struct process_queue_manager *pqm,

 	return 0;

 cleanup:

-	if (dev->shared_resources.enable_mes)

-		uninit_queue(*q);

+	uninit_queue(*q);

+	*q = NULL;

 	return retval;

 }

-- 

2.35.3