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 16:49:52 -0700
From:   Dan Williams <dan.j.williams@intel.com>
To:     Chenyuan Mi <michenyuan@huawei.com>, <dan.j.williams@intel.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: <64b5d3a033e5c_45a6294f1@dwillia2-xfh.jf.intel.com.notmuch>
References: <20230717041609.1162445-1-michenyuan@huawei.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20230717041609.1162445-1-michenyuan@huawei.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?bzm9+tx59GgtSUUO3ojnKY6Vcgj3s1RTOzPnHPbvUcx1r27ZaI8UgRMC6San?=
 =?us-ascii?Q?q8F2uHPtrXum2H0WdCR3JgZxddcGvR+8U4aK9pOiQHzvA+ICj+BN2ETLXQVR?=
 =?us-ascii?Q?xKmgw4mLgo59WPSOwxRBFry+6I+BSUEVb3rt/LJfBdJnmyf9w2HlRlziMIod?=
 =?us-ascii?Q?co9fFw/ATpGge65eeyDYJJ6/f8N5byu6hEqexTLyrrGjnagCdM7KYottTSrW?=
 =?us-ascii?Q?Lp8NHBJnkl+ekbWE2ZZB6ZAHk1z8JvFCdM8x3wquCKOSEWcc9GLS6ee+4FdZ?=
 =?us-ascii?Q?4ZsKHYIXGsrHAl+DsuxuAf8JGJ0xW49saLgF7oEJm4OMCB1CQze3Tlm8wi5o?=
 =?us-ascii?Q?qo64X+ROR8OUggKFnGzoQAUSIrbpYtalOw3aRKBi4/GgxWERkPkltMykU0vX?=
 =?us-ascii?Q?ljwpvBiBmBHjOChpxvlsOv4f3yKM/FqpTSk6utB+6FknMXunppDW6Xf05/fw?=
 =?us-ascii?Q?YOA0zbhRx/pj7FJukVz3NSSEvHzJJEUUlOQjWnzCo91biaUa9aeUQE3OkEJL?=
 =?us-ascii?Q?OCZlDMaDK18lrJwFi/VMEF/8E9xnc5szFqCeX/ylRDmtaFixtJFZhQ9AqeeV?=
 =?us-ascii?Q?0mHLOm7W6jJaw2I3cbKJMT6xqH9b1oi/RQH9yHjI9EYYwm3/HKuHeMslJ6RY?=
 =?us-ascii?Q?Bwp7jP68j/V/erC2VdR1hTcC+9fNTc/RR9mau7d2rPNxzf/ZA6shBWrGNaOh?=
 =?us-ascii?Q?VCg16zdXoIDRm49YEZ4OqcOA61JqzE52f5h3wmrtfTKI9ztu1GQ/x9s/kU5N?=
 =?us-ascii?Q?fAv/knbyampLtYMpENk2RnDLn8FQgyOSwxjq5Ii5o7IYoeitvVaVAqdK5w4o?=
 =?us-ascii?Q?t19C+mUe1zOMi8qvPvjKmeIHA3ewk38aDhd9tClRcGh3Xj8D9RgH+gz4g1We?=
 =?us-ascii?Q?5K6yqaOkEzYKtehOG3WU8Ei+H+xLwpjY38SglH3k94iKRlz+qFkS9JqBboYa?=
 =?us-ascii?Q?pPOdzUJdRFi7xc+FIGZ09m40eZz5yxSi3UF0u6Hw4DEWBnQJDRF3WLuLWEer?=
 =?us-ascii?Q?2b/7sWJ+Oay4BFX1V7Ep4LMe4JN0Fi/HbL50pgOZ48c9n28Tc26UmazJG+6d?=
 =?us-ascii?Q?pti/W09s0e393L43v6Ca5KSCcHZLpgqfhSMecqN1BjY6j3iC75JEU9bgtlS7?=
 =?us-ascii?Q?gCjsFh73XW7gw55yvXc/Yv+MK8HlWI9UTm62j4gBWl7K1QdRjE1N1KuVJHU8?=
 =?us-ascii?Q?62MDNpnMj8I8gYP7ZUMlOWZcguOpkTYkIFNoC3TeinyGZqBJ3c2tXwzT7zD8?=
 =?us-ascii?Q?sd6HyIXkQj8P8pETFm7j+Mi4cwTUoCp8ZhvMdcx8475ct3cw//crss4J7EIU?=
 =?us-ascii?Q?rsWJeZh8XvfQBoygAQi5OMTbFaFTcXCWE7MIL5u4LnxYZClzjwadq6tYNhPF?=
 =?us-ascii?Q?vM/HxZ8Y3tK437o0+e2TmqggNp9bbCLeEDS50i/fLeiroEFdCmIfjrHGU4lU?=
 =?us-ascii?Q?lClYmvaOVMJe1peRGHsLKks3slyK5X8eouoDC1DVJOVpMBCPemXfLV3fX1DP?=
 =?us-ascii?Q?TARBHarVya6Wmcg/VkpzJHpa7D3HFSILEyyu7WrTVaGZWcqYjGxcCp1tG1mU?=
 =?us-ascii?Q?FoDGzVcReTjCX4lT/n98BFRHy9mL+c1UyNO5hTyRIYPpvEx31+IWaD5f6Yyr?=
 =?us-ascii?Q?Mg=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: ba069380-9b79-4675-73eb-08db87208610
X-MS-Exchange-CrossTenant-AuthSource: PH8PR11MB8107.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jul 2023 23:49:56.2578
 (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: ildRdWF6RceYq2EkjTJNWhjegnglICW/0ehaGzaCVgclwF89OrCYBcKNS/nG74qZFXvf4QmkziANkIGB8SjIeLtG5Q8uTp+MZBlcY4ejVcw=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB7712
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
        RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,
        T_SCC_BODY_TEXT_LINE 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

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:

-- >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)