From nobody Sat Apr 18 05:56:20 2026 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 1B9E6C433EF for ; Sat, 16 Jul 2022 09:53:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231893AbiGPJxC (ORCPT ); Sat, 16 Jul 2022 05:53:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43102 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229521AbiGPJxB (ORCPT ); Sat, 16 Jul 2022 05:53:01 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C56D1EC72 for ; Sat, 16 Jul 2022 02:53:00 -0700 (PDT) Received: from kwepemi500012.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4LlNl55TYRzkWWq; Sat, 16 Jul 2022 17:50:41 +0800 (CST) Received: from dggphis33418.huawei.com (10.244.148.83) 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; Sat, 16 Jul 2022 17:52:57 +0800 From: Gaosheng Cui To: , , CC: , , Subject: [PATCH -next,v2] nvmem: core: Fix memleak in nvmem_register() Date: Sat, 16 Jul 2022 17:52:57 +0800 Message-ID: <20220716095257.2752110-1-cuigaosheng1@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.244.148.83] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) 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 Content-Type: text/plain; charset="utf-8" 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 dev_set_name after nvmem_validate_keepouts to fix it. Fixes: de0534df9347 ("nvmem: core: fix error handling while validating keep= out regions") Signed-off-by: Gaosheng Cui --- drivers/nvmem/core.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 1e3c754efd0d..a5d75edf509d 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -808,20 +808,6 @@ struct nvmem_device *nvmem_register(const struct nvmem= _config *config) else if (!config->no_of_node) nvmem->dev.of_node =3D config->dev->of_node; =20 - switch (config->id) { - case NVMEM_DEVID_NONE: - dev_set_name(&nvmem->dev, "%s", config->name); - break; - case NVMEM_DEVID_AUTO: - dev_set_name(&nvmem->dev, "%s%d", config->name, nvmem->id); - break; - default: - dev_set_name(&nvmem->dev, "%s%d", - config->name ? : "nvmem", - config->name ? config->id : nvmem->id); - break; - } - nvmem->read_only =3D device_property_present(config->dev, "read-only") || config->read_only || !nvmem->reg_write; =20 @@ -838,6 +824,20 @@ struct nvmem_device *nvmem_register(const struct nvmem= _config *config) } } =20 + switch (config->id) { + case NVMEM_DEVID_NONE: + dev_set_name(&nvmem->dev, "%s", config->name); + break; + case NVMEM_DEVID_AUTO: + dev_set_name(&nvmem->dev, "%s%d", config->name, nvmem->id); + break; + default: + dev_set_name(&nvmem->dev, "%s%d", + config->name ? : "nvmem", + config->name ? config->id : nvmem->id); + break; + } + dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name); =20 rval =3D device_register(&nvmem->dev); --=20 2.25.1