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;
Date:   Mon, 17 Jul 2023 19:53:58 -0700
From:   Dan Williams <dan.j.williams@intel.com>
To:     Dan Williams <dan.j.williams@intel.com>,
        Chenyuan Mi <michenyuan@huawei.com>
CC:     <Jonathan.Cameron@huawei.com>, <dave.jiang@intel.com>,
        <rrichter@amd.com>, <alison.schofield@intel.com>,
        <linux-kernel@vger.kernel.org>, <linux-cxl@vger.kernel.org>
Subject: RE: [PATCH] cxl: Fix memory leak bug in alloc_mock_res()
Message-ID: <64b5fec6800a4_45a6294cf@dwillia2-xfh.jf.intel.com.notmuch>
References: <20230717041609.1162445-1-michenyuan@huawei.com>
 <64b5d3a033e5c_45a6294f1@dwillia2-xfh.jf.intel.com.notmuch>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <64b5d3a033e5c_45a6294f1@dwillia2-xfh.jf.intel.com.notmuch>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?VY7T1KR90OEVU3cGDYpzs4toYy0ACW+AXSSa8C8fxKoLtYH7nE3AMACrbH/7?=
 =?us-ascii?Q?FhSSi98oNZP8kyazbSgS1UK5OdJHfl4FTyLDUp+d26WwoaxdK6bt7laWt7hB?=
 =?us-ascii?Q?FXJ18scYJG3qFzIIiWxCGh2HlbUznfP8zMBibXvzAXEqpZbxPPPgR2yhpvKA?=
 =?us-ascii?Q?oTaRsG4jF1mdg1AB+lD12NIKTgHgoBqKlaqCS2hJ41zRC6JFphp+/RUwB2en?=
 =?us-ascii?Q?jBAzWnhd4qKFCrmbx0h9RfjKRPBNA/TUyaohcn+mpxV1jRHAeshtWv099Dib?=
 =?us-ascii?Q?YeBnUwdFd71McSr4WabwXkcx2coozjlUBNBfqPHn1SODzd0z96j1yYWz4wHf?=
 =?us-ascii?Q?oXhQQQl/qHj04KCktiTCVnw5gEbdyp0JkbWyF0TgObwYndDDr7TVlb/ee0Lg?=
 =?us-ascii?Q?fExuEr6d9ci/G4NG7qUuN7jEHjDd0IJyYvbTplFZE5deBc+gzfKVoAaps1xH?=
 =?us-ascii?Q?a8dl6K4FJdtv0BwGMtVZFohsajWlNMdGCzCjCqoF1Jwtz1ZAT1hxelTqYrsc?=
 =?us-ascii?Q?iDqsxl97J2i7YXNm8aJDqkLsm9DCRP9+2/7MPhppORBmDV0zuZQSfdNiq9l0?=
 =?us-ascii?Q?vftgwctEpmv3LnWIdVncbL4nW5wQgIP6Dun7HkPSaaEGQPrAlg8cTp0oox2y?=
 =?us-ascii?Q?m30XsGEXoQFNxnc+CP4PP7QWlXURpsWTNAXyrgsc1+5k9mr8lKPmZq9kiHty?=
 =?us-ascii?Q?CVWr/tBWleXFlN06RvysiaibOWyesxT1t3kbgUEOybI6OCEs+SjqKUEw93bT?=
 =?us-ascii?Q?EOFB5TIKEXMGf+2WnycMI+Apy78MM6p0gbWm30EduwTmxcCS/2gThWRYp1/f?=
 =?us-ascii?Q?BtlDlFGTgE1zCXdl4iwAVBcWc9kS0lz4+MbTAGhqBbNtLuF/C9xcYT3jUR2A?=
 =?us-ascii?Q?G4AU9wJfAt3xov/it9i4+j4kZOoPi1ZDn1A0gJTARkTODEyyZKpqa5fdLAwL?=
 =?us-ascii?Q?NcZh//zfjSkmtaX51K0SFRlLsC9rdHmPRkoeoWXm5ImlIg7B3xLbfXSLPpkC?=
 =?us-ascii?Q?Arb1hNoOHih8o1k58MRjs8N6AHNsL9x+szeB7VKTb9db51+qUIs88EQ9S7e5?=
 =?us-ascii?Q?lqoI3y4m2lzUJCdHzwGj6K3jCf7PQQQY2ChytKxcZPL7U9zQrKAihSVxy7aq?=
 =?us-ascii?Q?d1tX8lWd/Kk70iI33/d0vl4C8o+8+rkyOu4elnxX0r6VvX94aNoK8Bw0ct6Y?=
 =?us-ascii?Q?btmFzAV54ZtIsrIkbujHTeXu0DFgKQg0DARKq/ytmxaTk+ocQLQFbvBPCkDr?=
 =?us-ascii?Q?DnKPgsUQllfgu5t7wD96y0VzKqsiZHPIEw9+LytAkPpSuIM+WATYmM1QlwdG?=
 =?us-ascii?Q?4Z8HEzhvlukOXxSczvquOJKO8cUY9zesXx4Sy27s25ftflUuParQofFKGJM1?=
 =?us-ascii?Q?M1t8tv1cj0xiGaJEJDD3S4tIFHGdJsYgtHNwt+T0kK54kZgR1sYx8m2jrS52?=
 =?us-ascii?Q?MfKNvVKDA5XA/bPRqD7GAfqOgC006mEEQUXE7OaheyZi62PoxMVoMHsG847J?=
 =?us-ascii?Q?JeQUY5zU416339Ug0h3j3tSDKRiZNC/et6fLW5tfma9U8R0kTLqpWwQI6F5i?=
 =?us-ascii?Q?/CoYtAJtTC0qk00HH4Rz2iWAvgynGnAh09aReTsRcpDP3H0t9qZLtc9j5nTO?=
 =?us-ascii?Q?Bg=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 465450b5-2edf-4bdc-cde9-08db873a3d4f
X-MS-Exchange-CrossTenant-AuthSource: PH8PR11MB8107.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2023 02:54:01.0804
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 2LCH5bQUM9o19JymxqW6XnciivYZRj7UZv9uEWTVesFss+QCU8eCEI92CiMLlsyg8WowXnTXFfIACBf0nHGRjcwCdJh/bImFn1HFz+su7dU=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR11MB4699
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,
        RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED autolearn=ham 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

Dan Williams wrote:
> Chenyuan Mi wrote:
> > When gen_pool_alloc_algo() fails, the error handling path
> > forgets to free 'res'. It would cause a memory leak bug.
> > 
> > Fix it by add kfree() in error handling path.
> 
> Going forward I want to set the policy that any error path resource leaks be
> fixed by converting to using __free() and associated helpers.
> 
> So in this case it would be:

...and to be clear I do think the fix should be applied in a backportable
fashion and then followed up with a conversion for the next merge window.

> 
> -- >8 --
> diff --git a/tools/testing/cxl/test/cxl.c b/tools/testing/cxl/test/cxl.c
> index 0e78d8e19895..ea04995fe42c 100644
> --- a/tools/testing/cxl/test/cxl.c
> +++ b/tools/testing/cxl/test/cxl.c
> @@ -396,7 +396,8 @@ static void depopulate_all_mock_resources(void)
>  
>  static struct cxl_mock_res *alloc_mock_res(resource_size_t size, int align)
>  {
> -	struct cxl_mock_res *res = kzalloc(sizeof(*res), GFP_KERNEL);
> +	struct cxl_mock_res *res __free(kfree) =
> +		kzalloc(sizeof(*res), GFP_KERNEL);
>  	struct genpool_data_align data = {
>  		.align = align,
>  	};
> @@ -416,7 +417,7 @@ static struct cxl_mock_res *alloc_mock_res(resource_size_t size, int align)
>  	list_add(&res->list, &mock_res);
>  	mutex_unlock(&mock_res_lock);
>  
> -	return res;
> +	return_ptr(res);
>  }
>  
>  static int populate_cedt(void)