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:   Tue, 20 Jun 2023 09:04:36 -0700
From:   Ira Weiny <ira.weiny@intel.com>
To:     Ira Weiny <ira.weiny@intel.com>,
        Jiasheng Jiang <jiasheng@iscas.ac.cn>,
        <dan.j.williams@intel.com>, <vishal.l.verma@intel.com>,
        <dave.jiang@intel.com>, <oohall@gmail.com>,
        <aneesh.kumar@linux.ibm.com>
CC:     <nvdimm@lists.linux.dev>, <linux-kernel@vger.kernel.org>,
        Jiasheng Jiang <jiasheng@iscas.ac.cn>
Subject: Re: [PATCH] libnvdimm/of_pmem: Add check and kfree for kstrdup
Message-ID: <6491ce14cc4b4_483a29487@iweiny-mobl.notmuch>
References: <20230619033623.11044-1-jiasheng@iscas.ac.cn>
 <6491ad03658ff_28e7294a5@iweiny-mobl.notmuch>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <6491ad03658ff_28e7294a5@iweiny-mobl.notmuch>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?3Y9gU8yFFOqWziYgs6NUcgiUnXWL0OJZtemI0IDQyzjVVDIdI2awTO28O1Oh?=
 =?us-ascii?Q?eQHIlzCMFC1dwDRIHkr16ua+76wNMtm5LLYKSfRlHRSvzpb6LT0rrNT7cBeG?=
 =?us-ascii?Q?5CzrLMqqPsjYhx69LdauuaGkdv1eDzK26DJeiyy5AILxm8H7HMt9fV4F/e7o?=
 =?us-ascii?Q?9dI6Dk1UzROYCs/HnXoYqlI1VBw5pESrbBNe31gTbNDCbp50r0rCsUHeHyBV?=
 =?us-ascii?Q?WY9yEEH9QkV5DECOVu8OHEnehMR1jIANooZgXSE/wlfN59lAmWXoY5R88QHC?=
 =?us-ascii?Q?z7Stq0ImHgmgF5CS6CD0fK5kaE3MUKUGUuLbFTUb2/14keZNS/C+J75dgs3h?=
 =?us-ascii?Q?1QfXfeYSZZXqG53WbwYPK+vgcPQyENvmF/B/m4Qczgoho/n3IhHaIC1CeGlf?=
 =?us-ascii?Q?y8SWDdBAHlKhvuz27gI8CWzdCWgGJ+TNf/2JB1MEeeTKMG/xfCo2JVgczrWs?=
 =?us-ascii?Q?NUNAqQPshtwDSzhzA/OJfY7/MQD3TOE2v6P+NyElN/91LEdtKvJ7WxeIOjzW?=
 =?us-ascii?Q?ntTGMfPD9/jyG5qSZERzy35wFmriecFEVA3u5JSzgU/+T41C+1LdQu8I6Jw6?=
 =?us-ascii?Q?LS7jBd/EmvjhFubct4GaDNQfBNEI975PYt5uohKmYKuff+TJdSc2yBuXW9pZ?=
 =?us-ascii?Q?RVZ8j9ffNlB8tdDU+PnG7xtW8rPN+6lrIp1Q+6xLqLXrchJZpeWdJzeALjr+?=
 =?us-ascii?Q?nDS+XMSgJZ3AQCxYGHS0dSebDdXZIoDDkUUVbZcR4N03iHjM+xdg8E58J7JO?=
 =?us-ascii?Q?eaLs4xkSt20AIEgiHzOUt6Eb4XHx4EH8mpwKkRnmja45uUW5R0REfjwDEIYM?=
 =?us-ascii?Q?CvGT2uH1jFmKjOWA9Xn2fMEYQnDZ1ftHDQvPT77jZBycDln6uOyBD0q6usC/?=
 =?us-ascii?Q?ti61tjylFHS4Ey5dvHBkSKct3nG4QH7SnD0IxoKvEStOvPbHI+dfla4tJxR3?=
 =?us-ascii?Q?AyGdzx3UvvDJfd2C0qtJn1GaeCaxVkGr71284tDzSZTmwa6mznqRBIMjMo+w?=
 =?us-ascii?Q?gNObhlHt7mj5F4h8iP7up3D2djwfO5MJnOxeRDBB+SmdB6Z32UWN/9FVF86W?=
 =?us-ascii?Q?7AtxNXfUmgAVpmdH/xoWx/DEp8yB9u0fJ9qZEBIamqCkl0vVYpildgg81dl0?=
 =?us-ascii?Q?zWuDjueGnTdsOrwfIN+eviFmaX7aAQBZiRbAUg6mvp/xlh5llh00AL0jXa65?=
 =?us-ascii?Q?ZuOdBkZIxicOezV/yzwqT1jrWCY3HMNRQ9qbyBJojNNTOu2TpeTYbCUkl8Lp?=
 =?us-ascii?Q?+4NMvvJORn7GnLUEniMTgkgKF4iwVLUJ1kVwPVweCS2+vyFgdVoTd+4uWeL5?=
 =?us-ascii?Q?m7mpzonZZgho7AL2KyEOFrtAXdYEGyh0zAFZM7l21opOgdBE/gcXM+R+s+jf?=
 =?us-ascii?Q?ktB/UXYng+BEKsWqa81Chx1JRYvvOd7aYzAQ7rAae3UNSrhnbuhZ8zJQnOQc?=
 =?us-ascii?Q?6LXUv5imumtSR/XFtSCRiFXqFcSV9na1QKwbFBuLArPuJ0DPAAO3JRmUeT2u?=
 =?us-ascii?Q?g6soWvAYQIx/sFpQNGc1u4Yc/vgVBqokXmGwgUkk1WhCZWCocLbmYzS/rklI?=
 =?us-ascii?Q?SQgZoBy6XRsU7LH/OiTUNc8WfDqXRrl1gfuHD2Ib?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 584af83c-0381-42d0-23a1-08db71a80f49
X-MS-Exchange-CrossTenant-AuthSource: SA1PR11MB6733.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jun 2023 16:04:43.3343
 (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: qzSXX6wy9JKFKb2dJ4IlF2jdLP5C5LhRvNkim1wOlmhsCUZng18Ej7Lc/5G4nQRKNgyfnSmLubtafeQdPnuOkw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4678
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,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

Ira Weiny wrote:
> Jiasheng Jiang wrote:
> > Add check for the return value of kstrdup() and return the error
> > if it fails in order to avoid NULL pointer dereference.
> > Moreover, use kfree() in the later error handling in order to avoid
> > memory leak.
> > 
> > Fixes: 49bddc73d15c ("libnvdimm/of_pmem: Provide a unique name for bus provider")
> > Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
> > ---
> >  drivers/nvdimm/of_pmem.c | 6 ++++++
> >  1 file changed, 6 insertions(+)
> > 
> > diff --git a/drivers/nvdimm/of_pmem.c b/drivers/nvdimm/of_pmem.c
> > index 10dbdcdfb9ce..fe6edb7e6631 100644
> > --- a/drivers/nvdimm/of_pmem.c
> > +++ b/drivers/nvdimm/of_pmem.c
> > @@ -31,11 +31,17 @@ static int of_pmem_region_probe(struct platform_device *pdev)
> >  		return -ENOMEM;
> >  
> >  	priv->bus_desc.provider_name = kstrdup(pdev->name, GFP_KERNEL);
> > +	if (!priv->bus_desc.provider_name) {
> > +		kfree(priv);
> > +		return -ENOMEM;
> > +	}
> > +
> >  	priv->bus_desc.module = THIS_MODULE;
> >  	priv->bus_desc.of_node = np;
> >  
> >  	priv->bus = bus = nvdimm_bus_register(&pdev->dev, &priv->bus_desc);
> >  	if (!bus) {
> > +		kfree(priv->bus_desc.provider_name);
> 
> Nice catch!
> 
> However, this free needs to happen in of_pmem_region_remove() as well.

Looks like the mail from my phone had html in it.  Sorry for that.

This would be better with devm_kstrdup() and then we don't have to worry
about the kfree at all.

Ira