From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 97DD0C43334 for ; Mon, 18 Jul 2022 12:43:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234332AbiGRMnZ (ORCPT ); Mon, 18 Jul 2022 08:43:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235099AbiGRMnN (ORCPT ); Mon, 18 Jul 2022 08:43:13 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 71A4E25C71 for ; Mon, 18 Jul 2022 05:43:11 -0700 (PDT) Received: from kwepemi500012.china.huawei.com (unknown [172.30.72.54]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4LmhQ35clLz1M7xd; Mon, 18 Jul 2022 20:40:27 +0800 (CST) Received: from [10.67.110.176] (10.67.110.176) by kwepemi500012.china.huawei.com (7.221.188.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Mon, 18 Jul 2022 20:43:08 +0800 Subject: Re: [PATCH -next,v4] nvmem: core: Fix memleak in nvmem_register() To: Srinivas Kandagatla , CC: , , References: <20220718122120.3103545-1-cuigaosheng1@huawei.com> From: cuigaosheng Message-ID: Date: Mon, 18 Jul 2022 20:43:08 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 8bit X-Originating-IP: [10.67.110.176] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemi500012.china.huawei.com (7.221.188.12) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > > What changed since v3? I adjusted the commit message because the implementation of the code has changed. > > Unnecessary braces here. Already fixed. Thanks, 在 2022/7/18 20:24, Srinivas Kandagatla 写道: > > > On 18/07/2022 13:21, Gaosheng Cui wrote: >> dev_set_name will alloc memory for nvmem->dev.kobj.name in >> nvmem_register, when nvmem_validate_keepouts failed, nvmem's >> memory will be freed and return, but nobody will free memory >> for nvmem->dev.kobj.name, there will be memleak, so moving >> nvmem_validate_keepouts() after device_register() and let >> the device core deal with cleaning name in error cases. >> >> Fixes: de0534df9347 ("nvmem: core: fix error handling while >> validating keepout regions") >> Signed-off-by: Gaosheng Cui >> --- > > What changed since v3? > >>   drivers/nvmem/core.c | 16 +++++++--------- >>   1 file changed, 7 insertions(+), 9 deletions(-) >> >> diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c >> index 1e3c754efd0d..6067d3bbff5d 100644 >> --- a/drivers/nvmem/core.c >> +++ b/drivers/nvmem/core.c >> @@ -829,21 +829,19 @@ struct nvmem_device *nvmem_register(const >> struct nvmem_config *config) >>       nvmem->dev.groups = nvmem_dev_groups; >>   #endif >>   -    if (nvmem->nkeepout) { >> -        rval = nvmem_validate_keepouts(nvmem); >> -        if (rval) { >> -            ida_free(&nvmem_ida, nvmem->id); >> -            kfree(nvmem); >> -            return ERR_PTR(rval); >> -        } >> -    } >> - >>       dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", >> config->name); >>         rval = device_register(&nvmem->dev); >>       if (rval) >>           goto err_put_device; >>   +    if (nvmem->nkeepout) { >> +        rval = nvmem_validate_keepouts(nvmem); >> +        if (rval) { > > Unnecessary braces here. > > --srini >> +            goto err_device_del; >> +        } >> +    } >> + >>       if (config->compat) { >>           rval = nvmem_sysfs_setup_compat(nvmem, config); >>           if (rval) > .