Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <95c1cc02-cd5d-c454-7c29-e4c42a6bd54c@amd.com>
Date:   Wed, 7 Jun 2023 19:56:51 +0530
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Thunderbird/91.8.1
Subject: Re: [PATCH] iommu/amd: Fix possible memory leak of 'domain'
Content-Language: en-US
To:     Jason Gunthorpe <jgg@ziepe.ca>, Su Hui <suhui@nfschina.com>
Cc:     Joerg Roedel <joro@8bytes.org>,
        Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>,
        Will Deacon <will@kernel.org>,
        Robin Murphy <robin.murphy@arm.com>, kevin.tian@intel.com,
        iommu@lists.linux.dev, linux-kernel@vger.kernel.org
References: <20230606070742.139575-1-suhui@nfschina.com>
 <ZICSskXNlR+ckKvC@ziepe.ca>
From:   Vasant Hegde <vasant.hegde@amd.com>
In-Reply-To: <ZICSskXNlR+ckKvC@ziepe.ca>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?b1BzeDU2YndUbkR0ZlY2R1hLRVBYamFZZkVjd0pQbXM3alNZVCtLSzdEbGY4?=
 =?utf-8?B?em5pM3U3UTROb2kySFJmMDlhays2MGRDL3FSM1BhekVUWFBuajVYUWhNeXQr?=
 =?utf-8?B?bXNRNGhwRHh1V1JzbDRBT05pU2hnbzlJWUdvczhJZWhPWmFWNUxFTFV5TFVC?=
 =?utf-8?B?eXpHbEZmVi80NXBLRVFIMTlIam1FbG9VWm1wWm9yemxGbURnMnRReDNUNDBV?=
 =?utf-8?B?TDVZSE10bmZ4d0tOb2ZDcW5JRm0yaU9QUTNJRC9lemtNam9rL0t6MVRSTzVx?=
 =?utf-8?B?bjJrSnN3SVFrS3hCRTAxa1d2Yjk3eDdKYUlKM1dnNTlPM1VKVDZmQzdjWitS?=
 =?utf-8?B?RzhKL2pnbXAxNFM0T09lS04yc2lUVkFDcVFySXNZejZTdDlXN3VZNnp4Q1l3?=
 =?utf-8?B?Sk0venBmcFpuSmtPMC9DdjQzUkJYNW1QVFAvR0FWZzFuNWszNndoR0lWTzQx?=
 =?utf-8?B?TjI0WmJXQzIxaDEyeXBkMTMySDdBNzRtOWhiVXRPcUxoMVZuWXlrM1VpQWNo?=
 =?utf-8?B?WkpEWWIwTUdEczhxb0ZObUVnQVZ2azl6T3c3OVlwMzUzWnBPS2pERWV6eGpS?=
 =?utf-8?B?WXJqaGlsdzBTZ1BTQlRTdHh2MzBvT2pleGtORldqaExZN0FMa3BCUDE5VHMr?=
 =?utf-8?B?ajduOGhvdGlsYUhLU3RBVE1hTFh1NW5qWlBjMmVWQXZqWjFKQnV5enBEZXN2?=
 =?utf-8?B?SjJ4RmU4UnFNRDU0b2haS1RLT2xjNVRuSTR2dUVkaGtpZm0wTHRXMndCRG8x?=
 =?utf-8?B?dnBCOVlFVWJoenk3ZjJsS2huaWg4WFNmVXF4eS9Ca1hNZGlraEVtYm9URUhU?=
 =?utf-8?B?M2xJd1U3YnB6ZTBvOGttMTlkRlp4dVNuaS8yUVA0eWFIcncyeDhRUzZKSjhJ?=
 =?utf-8?B?Vk5adkkydkFxdENuUDU0TFZNcTlXK0VJOXZBalo3ZEpEcWcvNUkvY01FY1Ni?=
 =?utf-8?B?d3Q2VFZ2L3pCZ3EyZjNWQlN1RTlBSXMybTVvK2hTMThYaDFBcWFqdUZZMEN2?=
 =?utf-8?B?TUIvb3JQbHhvV3l0YVY0TWlLd1YxMTArUmxwWnkvU04xaU5aOUpsRXMraUt0?=
 =?utf-8?B?YW02T3hnK2g1cnJaU1dyUzVZNzg5UFdWYkJvbjhTQy9Ga0x0VXZQcnVqdHBY?=
 =?utf-8?B?UmxxbFhDcXhPeGZ6T29kMWF4NGhiTWxyYzNOZHBpdjlIeDJnRjZwR0ZPSlpq?=
 =?utf-8?B?a1J3a1N6dkVFN0NrN1FDV2t5WWY1anFFamlLMXJtNzhCU1JVUVRxMWd0N3JT?=
 =?utf-8?B?R1A2U240bDJzOUFJNkxpVFhKSlk3aktYaW1QMHI2VjY2L000TEY4VUdZV2RR?=
 =?utf-8?B?WTdsT0VnVFdQQkVraGRwTDBNN1JiK1BlZVpvc1A3aTZmUWptVlpjakdUQm02?=
 =?utf-8?B?QzgvN1lqZ0NpaVNUak5MQWtkZzhyY3MrZWErSzhqZXRhelltTWFuZGwyZjZV?=
 =?utf-8?B?NzNFSXdKZ2liL1dIOHh6TEhNUDF1bUFueVQ3bCtTN2dZSzA5SUlUSHZQVzdU?=
 =?utf-8?B?V09DU1p0L0p0L2R5UjVycFgrOHNHNC9manAxcWJiM3BVS1FqZkhHVlgyWkp6?=
 =?utf-8?B?MWhUWTk3NEZQM0Y4S3I2ejF0clZNUURzUGZpZGhCQ2tCR0ZEeDNsRUFvZTk2?=
 =?utf-8?B?RWpkWS85WFNFQzd2K3ZHeWV4NnNEYzZUVnd3Rk0vMXQ1aVZ1MURPQTB0dXFN?=
 =?utf-8?B?bWRBUTh4TCtEQ1Q0UnZsbFFSd1BSUXZReTF0engxZXYzT0oxVFBSY1grL2Z5?=
 =?utf-8?B?amZVOUcrUnlMVVY3UWJBcGlwUjRXQW5FOFl1Y1dtSlpGWm5TUDhJWWJsOVFm?=
 =?utf-8?B?UEdHNC9idGVIb3ljaFNNWXRhbjY5amp1SVozK25PMW5pQkhXVHIwSWh4aHhY?=
 =?utf-8?B?SjA0MWNkVXZoV3ZzM1pseU5ybjVIU0J6QWF5TEhWZkJKN1JBemxnVmVUUFBy?=
 =?utf-8?B?MU8wSEgxZ1haY2l5alQxNGJhR1RaeFlweXR2Sm1vTzNYSWt1U2NBM3FTK296?=
 =?utf-8?B?QndYNWVjRlZFcXhhRlAzdVJmSU02UGZlN0dBeCtMTnAwSkFiVjV6VUJkNzZH?=
 =?utf-8?B?eU1VMlh4SEVpaEhrUTdwOEVSTFcvbEJPVzh2SFREd3czVXBiNTBzaG1NeVFP?=
 =?utf-8?Q?6LNKCn4/QNgpQzoQZOKaIf7j7?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 84f1317f-d4aa-4138-116e-08db6763432f
X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB6048.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jun 2023 14:27:03.5186
 (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: 4qXKvytFNkd/RJ0x6WwabkcfPDky3v3oetcG9s+lazgOTKf7R4ts+d7sVT1qWGcWNIN/j7aBhLVoa37EUlWdZA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5318
X-Spam-Status: No, score=-1.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,NICE_REPLY_A,
        RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE,
        T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no
        version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Jason,


On 6/7/2023 7:52 PM, Jason Gunthorpe wrote:
> On Tue, Jun 06, 2023 at 03:07:42PM +0800, Su Hui wrote:
>> free memory of domain before return NULL.
>>
>> Fixes: 29f54745f245 ("iommu/amd: Add missing domain type checks")
>> Signed-off-by: Su Hui <suhui@nfschina.com>
>> ---
>>  drivers/iommu/amd/iommu.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
>> index dc1ec6849775..f08e65629c74 100644
>> --- a/drivers/iommu/amd/iommu.c
>> +++ b/drivers/iommu/amd/iommu.c
>> @@ -2094,7 +2094,7 @@ static struct protection_domain *protection_domain_alloc(unsigned int type)
>>  	} else if (type == IOMMU_DOMAIN_DMA || type == IOMMU_DOMAIN_DMA_FQ) {
>>  		pgtable = amd_iommu_pgtable;
>>  	} else {
>> -		return NULL;
>> +		goto out_err;
>>  	}
> 
> It might be nicer to order to allocation after the type checks, it is
> more consistent with the other drivers
> 
> This is fine too

Right. We are working on cleaning up/re-arranging this code path.
Hopefully I will have patches soon.


-Vasant