Message-ID: <e644fa2a-8000-f83b-7480-efdfa3f4af00@amd.com>
Date:   Wed, 8 Mar 2023 12:42:46 -0500
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.7.1
Subject: Re: [PATCH] drm/amdkfd: fix a potential double free in
 pqm_create_queue
Content-Language: en-US
To:     Chia-I Wu <olvaffe@gmail.com>, dri-devel@lists.freedesktop.org
Cc:     Alex Deucher <alexander.deucher@amd.com>,
        =?UTF-8?Q?Christian_K=c3=b6nig?= <christian.koenig@amd.com>,
        "Pan, Xinhui" <Xinhui.Pan@amd.com>,
        David Airlie <airlied@gmail.com>,
        Daniel Vetter <daniel@ffwll.ch>, amd-gfx@lists.freedesktop.org,
        linux-kernel@vger.kernel.org
References: <20230308001903.2841087-1-olvaffe@gmail.com>
From:   Felix Kuehling <felix.kuehling@amd.com>
Organization: AMD Inc.
In-Reply-To: <20230308001903.2841087-1-olvaffe@gmail.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?WFY5MkY5Z3dmRW84K05sNE03NElxU3k3Tm43ZEFlbTNoVGJ5bjZTN21NK2dO?=
 =?utf-8?B?YnZTTCtpS0ZadXJIMTBGblNHUWdGakJISjZZSERUUVR1cm4vTmlvRlg0Rk5j?=
 =?utf-8?B?TG92S2JKL2FKYVlIUGh2cFNhVmpsbGYrY1J1ZGVGSVlaNDlVYTlOcVJRRGFm?=
 =?utf-8?B?VmF2T0dodU9FbElhV1RWUWZYVTdEOXRUazFieHRpQXFXbk4vMWJ1TmkwRWo3?=
 =?utf-8?B?WSt5UmpvdHVTT1J2Zm5RaThWRlhmankxamY1TWh3anJybXI5SkJGUXVKdnRq?=
 =?utf-8?B?VTJKWUJNVy96TGxxNHlvZGV6YTk0bEpoNk5VczlaQUNtVUxmdXlIaGNEdm53?=
 =?utf-8?B?WWl4WjM5SnFTV1RYc1I5Sy9OT3JNa1FGekJpVjZYaktZd05YcmpCVUlRdm5S?=
 =?utf-8?B?M3FOTnFIQmhoZE01N0lyaTJHSUw3My9UWFRXdllmaTI1dGQ5R1d5NGdnV1VP?=
 =?utf-8?B?dGpKZmdxdldHK2x0KzhKWGwzTm9weWRlcWZsalUzRmplOWQ3ajdZREpWR2RD?=
 =?utf-8?B?eGovS2hTbmNTb3g3eXcvMFpjYllXYVdUcHpWMTBNeGRMRHFlejV5YTNpK0xJ?=
 =?utf-8?B?VHlLeDg1NGV0SStTamVkYUJtL2FZNEpUeXhhc2xleUJsaFNkalkwSngyWVpJ?=
 =?utf-8?B?WlRaK3dDYkNMVlc3SXpVYUJ2bXA4aUl0UmNxRUUvUW1acUhNQ09aMDRPVnlK?=
 =?utf-8?B?TTZONHVpMVJpeXJEMmI2SHhic1RXZUZuZmd0MzM1SHBqWmJjWVdEUFRzcGE3?=
 =?utf-8?B?Yk10UVRuRjkvRC8xN0lzaVlLeHVnQkZ1Zmw0QWhaSUhHQVZOSFF0QzFtUHoz?=
 =?utf-8?B?Vm1qamZTR2ZKQ2xCTDF3c2pSMDRjUTVHZHpLUGRYblE0amdiVkVrVVhGZVMv?=
 =?utf-8?B?ZC9QZXZsQ3gzOGEwT3hVZXZ4Q2VJMHlmelM4ZWdlS3ZYczdFaHJqaDlNZGNU?=
 =?utf-8?B?ZVhFMlA2Q0FWRWNmYjNFNGJTNWMvQXZsbDQ5a2dHcEdrWHcrTks4Ylc5Y3Vi?=
 =?utf-8?B?eVdQSlp4SUJIeEs1cW1wdm9rc0RnRnlDa202Ni85VlEya2ljOGJLQXZyWUtM?=
 =?utf-8?B?Ri9oUTBUbllDcGJ6L0ZNeUtzUEJnTEhpeG9NN25zbFo1MkJYSTlHbWp4UjZm?=
 =?utf-8?B?eE43dXBMRXp4MjJaQW5ZeXoxN0p6NzI4Nm5TQ1JUaFFqRzVYL1JVbVB4ZVdJ?=
 =?utf-8?B?V21IN25UZ3ZucEVWM0ZDd21HNldNZW1PdmRtMklvZDZIM1czWWt3VlN1aXIy?=
 =?utf-8?B?cUl3aXNFTVJBdytjNXBoY3dYbDF4Q2U5ZUlmN1dFTFRZVS9HNkRra0YyU0tq?=
 =?utf-8?B?TVFIb0IwTXRxOWtpSzVLcnBwZnZYS2I1N3hTd1c4djZiZVQvMDVueEp3RHNy?=
 =?utf-8?B?bXNmT2pzdllPT21mN2Q4SWxhUW9DWFlRWEhFODNxTjdoaU5TM1F3WTJ0TGI1?=
 =?utf-8?B?cU1YQXhDSWdLYnoxU2JFcU4xYTBrOXkxYjc0L2NldEpPUEU4YUFSU01nYmlv?=
 =?utf-8?B?ZGhuU2JvUzFLMDdCRVpLYkRkRnpxMm5kcjBRQytWZ3FoeEo1cG9uNFEyT00w?=
 =?utf-8?B?UzJzUUpwNWl1aDVXeVV3Q1NPOTZlWmQ5ekhuZWJhNVVPNXp5SG9JTkIzcFhU?=
 =?utf-8?B?bWlib2xkRXZyeERuUlM5dGo2a0pjK2VXcXFudjF5b1UvMVJSbjAzeG9iQjVY?=
 =?utf-8?B?Y0tOaUFuYno3TGNmYW4yNE01TGxNbFJiTEZ5bExrQ0g5WmhzckliT2llT05m?=
 =?utf-8?B?cGQ4QWNwTWxKQmtzZHk1OE4rZ3lUb2NQZ0NuYzR5am13SldjTTNuWmIybXlr?=
 =?utf-8?B?NHFBTDFyTzEzT1VxUTJ3ZVFGUXQ0N0Q3UEhFREdtSHhzR3NnTmwxWjdnU0hv?=
 =?utf-8?B?RUFHbzVFTCtiYnVXN3ROWGFVekVyTzFRcnI1N0NBZTJjNm15d1poZGNFejFM?=
 =?utf-8?B?Wkh4YU5IL0JxdnQ4VVNKcWhIWTBxaGxabHh6QjExSmt0NnQ0c1hnVUN4bXhE?=
 =?utf-8?B?bGJsWDd3b01LcGFQbjVyMGZxVklmbisrUEVSN2NTaGVOK1NnVDVZT1BCZDdR?=
 =?utf-8?B?U0pJRTA1TTFTOWplbFdRQk1iWGd4RmthOVBNZ0FIS1lDV2JWSnpHclpHdHpE?=
 =?utf-8?Q?8ku75tm3KtRIZTRKtjglPwayF?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b4ea1461-bfcd-4ee4-9a34-08db1ffc88dd
X-MS-Exchange-CrossTenant-AuthSource: BN9PR12MB5115.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2023 17:42:49.3063
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: no3bL7MYUVhgO1BNlHVujFNazceIA0MAb52shxXgkwAskWWzGY1hE5zIiB/Zn9vUeZjwtnIS65jzB1oAYK9NOA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8269
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 2023-03-07 19:19, Chia-I Wu wrote:
> Set *q to NULL on errors, otherwise pqm_create_queue would free it
> again.
>
> Signed-off-by: Chia-I Wu <olvaffe@gmail.com>

Thank you! I'm applying this patch to amd-staging-drm-next.

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


> ---
>   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 5137476ec18e6..4236539d9f932 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;
>   }
>