From nobody Sun Apr 5 13:07:28 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 DFBB6ECAAD8 for ; Fri, 16 Sep 2022 12:04:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231130AbiIPMET (ORCPT ); Fri, 16 Sep 2022 08:04:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230343AbiIPMEQ (ORCPT ); Fri, 16 Sep 2022 08:04:16 -0400 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C4A3112B for ; Fri, 16 Sep 2022 05:04:15 -0700 (PDT) Received: by mail-wr1-x432.google.com with SMTP id b5so35659100wrr.5 for ; Fri, 16 Sep 2022 05:04:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date; bh=mPLFhGHVYS4W9tS1dcvfB9NP8UzfLXVqTT8hwLQ6Qp8=; b=D5OHODgvzrWdOm7CQw9H47TsZxfYEVRdG8l5BxLnaZzAntR3XCxVdNxm32MLZTS7k2 24kxzEBVVOUCJ+ZG5/aQ7iN/IRQlybypFd0PnSfXmlw/j3nfHhTL+5tUtLvNjv7Wr0fi mqYk7IWN4ZyARHNSd8iMqU3UM0ufh7dacX7OnnVz0YNe2LdMFvtEE7zAdyNKpllfHMrd gRWNAD+Plu6iVvJ1EDq8NnhXoTY2u4ZbmbNht5v1fYM6ojWB/P3IicMMIDGwrSAQoy6H RPw7+c+RqBu6iOqlm6TKsFH3vDCc1l164K2nw/LCKxhgOHX2nGcrjeffiRtdqox1u3RV +rnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=mPLFhGHVYS4W9tS1dcvfB9NP8UzfLXVqTT8hwLQ6Qp8=; b=llBkMd8MmZPXRhbwLMWZxpqiuAYhbgaSQc82TxXknte4MemU5+JLlqvQ3zgluWsTs5 CRia8T4CdzoFqkMOVm9rp9MsMLw4ph9Jmlr0QqsCE9DZ+QFE405WDFKcJKhYIJMMR7ll kZzPl/XS5AI3H7atiryq7N83ZgIqvdka4V8VCogrP/dEqJNgkZqIE2/HqVYuTqcufHuW I8kRVYTDBFdbQk85NYoAY0wVcq/kgGZiyX9MO8VJG2yX5L269ZgATmwF6QWHEDAszBoD KJejBbBTa7UOPP3rte1/x1DzPM9bTGxIcmRmaBp7esx+m7/iwGAyjGc4NAqYDkPsk0Ze uImw== X-Gm-Message-State: ACrzQf2Fr3GhFU6n8eHssuhVWVrK5+KDstvazs27xImBuqgNvdQiZW8i MsAwWXWimFVL//A/CStK0JB2Sw== X-Google-Smtp-Source: AMsMyM6cWFe2TlELuBCJ85zIT1+UECvePc5f3DSP3FM/W9vpA5+gaADTwK9AWZjW6rj0dcUVLx3fTQ== X-Received: by 2002:a5d:5848:0:b0:22a:c104:c2f1 with SMTP id i8-20020a5d5848000000b0022ac104c2f1mr2700157wrf.699.1663329853500; Fri, 16 Sep 2022 05:04:13 -0700 (PDT) Received: from srini-hackbase.lan (cpc90716-aztw32-2-0-cust825.18-1.cable.virginm.net. [86.26.103.58]) by smtp.gmail.com with ESMTPSA id l7-20020adffe87000000b00228da396f9dsm4733168wrr.84.2022.09.16.05.04.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Sep 2022 05:04:12 -0700 (PDT) From: Srinivas Kandagatla To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, Gaosheng Cui , stable@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH] nvmem: core: Fix memleak in nvmem_register() Date: Fri, 16 Sep 2022 13:04:02 +0100 Message-Id: <20220916120402.38753-1-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Gaosheng Cui 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 keep= out regions") Cc: stable@vger.kernel.org Signed-off-by: Gaosheng Cui Signed-off-by: Srinivas Kandagatla --- Hi Greg, Here is a fix in nvmem core which can possibly go in next rc. Could you please pick this up. thanks, Srini drivers/nvmem/core.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 1e3c754efd0d..2164efd12ba9 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -829,21 +829,18 @@ struct nvmem_device *nvmem_register(const struct nvme= m_config *config) nvmem->dev.groups =3D nvmem_dev_groups; #endif =20 - if (nvmem->nkeepout) { - rval =3D 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); =20 rval =3D device_register(&nvmem->dev); if (rval) goto err_put_device; =20 + if (nvmem->nkeepout) { + rval =3D nvmem_validate_keepouts(nvmem); + if (rval) + goto err_device_del; + } + if (config->compat) { rval =3D nvmem_sysfs_setup_compat(nvmem, config); if (rval) --=20 2.25.1