From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 196D4606EE94 for ; Sat, 7 Nov 2026 10:16:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=SZedqmgQ; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=x/4IdBOw DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Unsubscribe-Post:List-Owner; bh=X9hEUmFldhnfyWIrxDZuj9JeNDqshibzRSM3JN3lvo4=; b=SZedqmgQ+WuzSMUJOogbZjXTN4 ZC3ZB3VSfETWn1UV9WqfKZkYgGzJs51AouqrAqk3gGurZpuaGsfZ7FOts0IVnN7D5V482uG14hvgn UBgSvM97lALzDtgctCa+NImUKpxniuyux1q1DPpVSJzyJbuSah77PZLUtElNUb7O3bqCKfEsOR9wm AAT5h9LpzwwIKYk06vzf3y1BP02p892G+FDuT2kzeYVV3Z5yCOSPo6ShfzKWR3e4QhTNDzyHmVg2x CuYynNaeVm75/uvUlAkghCBdxh5m7QHUei2x03e0SpYFLlkj4CdGOhiVnIsvj1b9G8sopdYjILESq IGbzAKuQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.100.1 #2 (Red Hat Linux)) id 1xPdTP-0000000ESh6-177u; Sat, 07 Nov 2026 10:16:35 +0000 Received: from mail-ot1-x330.google.com ([2607:f8b0:4864:20::330]) by bombadil.infradead.org with esmtps (Exim 4.100.1 #2 (Red Hat Linux)) id 1xPdTI-0000000ESb4-2P7H for linux-amlogic@lists.infradead.org; Sat, 07 Nov 2026 10:16:33 +0000 Received: by mail-ot1-x330.google.com with SMTP id 46e09a7af769-82109f51565so590242a34.2 for ; Sat, 07 Nov 2026 02:16:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794046587; x=1794651387; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=/qFqvbFurN4PEJpXMJPKtOAq4hdCyVwSYAR6O028L8Y=; b=x/4IdBOwOZFUgtoFLBB6+JQOVKr5eiGYaMt/A2iMzvzbBVjTIWHqRevouCNYTe0sMW iJZqFRGVMKlVZcVCut1dJJmiNsY49AJGeOeyPi+Ufs+E1P1GnE+pM/f9ShBaqgK2J/s4 yedGwaZ6Qy2siuXl6eTXG5hrnxMVdF53wMAWh5JqjH2AcY5MJOrUe/UI4F2PNbqVJWTQ 2nRP5fFlHOtlh8hnsvu1X1DhGGjJg0e7YFCr3vn6BINbjoel2196bEdNwOAsd65EZVLk aLUr5JRTWM6UxZTfSuRD9NdHmXsgxN/x6kFmVGg9JSoeMUKn7bkhmxljp3p3hRt2cV3z EPEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794046587; x=1794651387; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=/qFqvbFurN4PEJpXMJPKtOAq4hdCyVwSYAR6O028L8Y=; b=XN6HcEQW6MYvf86WqDn3i/9F0Yyi8b3CB6M3cy9UBs7rMVBsatb/ypxAbCVL3RItrH 1NLVl+nurLsWcSgnKTwuy0V8IPlrFRXgmT9rXa2qfg4zlRt06zbeJJhd/2QYPLDNoltH CQAASoupPNv7/3fkWI+ORRVrTPMkYWzeR72xHkMYe8HXE73E4d35j7qC+9iPkedj4GRD edp4kJeUVtmBIISW/aOlDu3rdwD3/CPNEA7i1a1Lit2NVl6PY9LpHypSdwiGfcnEMaQP zi+6swBXSVI1WJzP/dhh4/yGxnry/nM6Bf4hXpkrNor/X8CcbS14f6nEsnbTxz/Br45m +VtA== X-Forwarded-Encrypted: i=1; AKwUvBy9/oLIflcXgff5e3W1YwaVdkqt96rgtinK7g1oEiEcYjWXxzxwtiJi4T4QK40TtJxHn0oCrnz7EMovCIux@lists.infradead.org X-Gm-Message-State: APuU4Z/dfrMOih9zoNUid4DQv3Nkcc6/wBRXl9Lrrp0K8CMP+lKszMX0 EoWI2LRmXhvefRPXwbnQqher2YZiiZEaD1CFjDzjqCMbwww222n2eWTX X-Gm-Gg: AYBFou2CCOwU8alAvuX7EXbc1sTgmxAwgUGb/y2Kc2Yxrk/ndWrZyRGwzj0nTp7usUo +biJ7oqBemrzl/f6Ys37ZfdKwn8LMH6opa4VKUw75d7XfXyl9q5VlTOBHCmwcTAfpF86PnUz8b7 N/LOoE/ctCoo3BgG78NkxvIL4SpWCgjRELV6cyCf4gbkTVN9WBN4Vl+m3/yESL8VM0haFirikv3 z6ef4eo8qTek7Wyft5ZIeUE2djE9jwSezfmNuLRJv0Bu9oXsvjMtxV4cJOr1/a4WmQv3vDNY8PQ 3vMHyz6b1NU5xkKWIip/2jYLFG4AHvn3rNs1LQYYHqV3VRWbW3GlJAjNEkJUi+8XFhNhTiY09hE CkmbGqM2JUFF4JU+YUCGiClWx3p69u3L5iczo/XNfb+OFTlkfQB3735CNaouTEgGNeTgA48RIIW ubTdOjGUKPqOWpy8FKEKzl0fLvNpSemFH/H+MSZlhZQ+SvnflNFPEUvxmB0VyEWKRrcGjtfOH6d tuE4u9I1xK6vFWYJoo6ed3/Ui6vR9uFn0ceJju2URL9f6XjtWhKnVmq5bM2/n1a337d16dc98VK ZmuB4DZtPZ9nSI8ioCirWKiqx78vN2l/De4BG6Od87Ka7jT0nhhBi4LkuD9U1nNfBdQd6ct+64h Id8YAiCrHQ20I9LuzHCbwSCI4OeDTRMjMZIuOzLdbeossyPMcK9NYCBT265+KH2rQ8ZEQqGDzou 7Wndjd11L0DLXjXH9su/t4eR5+uFnJsMu2HN8xyCKc0d/GVAqCgjmZ X-Received: by 2002:a05:6830:4101:b0:844:4959:e856 with SMTP id 46e09a7af769-85f1cf2dfcbmr4924112a34.11.1794046587358; Sat, 07 Nov 2026 02:16:27 -0800 (PST) Received: from [127.0.1.1] (174-29-1-49.hlrn.qwest.net. [174.29.1.49]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-85f1dbef224sm3990269a34.12.2026.11.07.02.16.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Nov 2026 02:16:26 -0800 (PST) From: James Hilliard Date: Sat, 07 Nov 2026 03:15:58 -0700 Subject: [PATCH 01/58] mtd: clear OTP provider pointers after unregistering them X-Archived-By: MIME-Version: 1.0 Message-Id: <20261107-submit-rawnand-retained-handle-lifetime-v1-v1-1-0181ef0cc4c8@gmail.com> References: <20261107-submit-rawnand-retained-handle-lifetime-v1-v1-0-0181ef0cc4c8@gmail.com> In-Reply-To: <20261107-submit-rawnand-retained-handle-lifetime-v1-v1-0-0181ef0cc4c8@gmail.com> To: Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Brian Norris , Boris Brezillon , Arseniy Krasnov , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Thomas Gleixner , Vitaly Wool , David Woodhouse , Russell King , David Woodhouse , Mike Rapoport , Maxime Coquelin , Alexandre Torgue , Christophe Kerello , Jason Roberts , Michal Simek , Boris Brezillon , Mason Yang , Ramuthevar Vadivel Murugan , Stefan Agner , Lucas Stach , Thierry Reding , Jonathan Hunter , Dmitry Osipenko , Matthias Brugger , AngeloGioacchino Del Regno , Jorge Ramirez-Ortiz , Heiko Stuebner , Yifeng Zhao , Nicolas Ferre , Alexandre Belloni , Claudiu Beznea , Keguang Zhang , Jacky Huang , Shan-Chun Hung , Frank Li , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Han Xu , Liang Yang , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Manivannan Sadhasivam , Kamal Dasu , Broadcom internal kernel review list , Vladimir Zapolskiy , Piotr Wojtaszczyk , Paul Cercueil , Harvey Hunt , Maxim Levitsky , Michael Walle , Srinivas Kandagatla Cc: Tze Yee Ng , linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-tegra@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-mips@vger.kernel.org, imx@lists.linux.dev, linux-renesas-soc@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-msm@vger.kernel.org, James Hilliard , stable@vger.kernel.org X-Mailer: b4 0.15.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20261107_021631_834332_835C6046 X-CRM114-Status: GOOD ( 14.21 ) X-Spam-Score: -1.9 (-) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-amlogic" X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 If factory OTP discovery or registration fails after user OTP was registered, mtd_otp_nvmem_add() unregisters the user provider but leaves its pointer set. mtd_device_parse_register() then unregisters it again while unwinding the error, accessing a freed provider or dropping a reference still owned by a consumer. The same stale pointer survives when the factory OTP error is -EOPNOTSUPP, which mtd_otp_nvmem_add() treats as success. In that case mtd_device_unregister() can release the provider a second time later. Centralize removal of the OTP providers and clear each pointer after unregistering it so subsequent cleanup cannot repeat the put. Fixes: e0489f6e221f ("mtd: core: fix error path for nvmem provider") Cc: stable@vger.kernel.org Signed-off-by: James Hilliard --- drivers/mtd/mtdcore.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index 8efa2d88556e..558a605ba749 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -1016,6 +1016,14 @@ static int mtd_nvmem_fact_otp_reg_read(void *priv, unsigned int offset, return retlen == bytes ? 0 : -EIO; } +static void mtd_otp_nvmem_remove(struct mtd_info *mtd) +{ + nvmem_unregister(mtd->otp_user_nvmem); + mtd->otp_user_nvmem = NULL; + nvmem_unregister(mtd->otp_factory_nvmem); + mtd->otp_factory_nvmem = NULL; +} + static int mtd_otp_nvmem_add(struct mtd_info *mtd) { struct device *dev = mtd->dev.parent; @@ -1082,7 +1090,7 @@ static int mtd_otp_nvmem_add(struct mtd_info *mtd) return 0; err: - nvmem_unregister(mtd->otp_user_nvmem); + mtd_otp_nvmem_remove(mtd); /* Don't report error if OTP is not supported. */ if (err == -EOPNOTSUPP) return 0; @@ -1180,10 +1188,8 @@ int mtd_device_parse_register(struct mtd_info *mtd, const char * const *types, } out: - if (ret) { - nvmem_unregister(mtd->otp_user_nvmem); - nvmem_unregister(mtd->otp_factory_nvmem); - } + if (ret) + mtd_otp_nvmem_remove(mtd); if (ret && device_is_registered(&mtd->dev)) { err = del_mtd_device(mtd); @@ -1210,8 +1216,7 @@ int mtd_device_unregister(struct mtd_info *master) memset(&master->reboot_notifier, 0, sizeof(master->reboot_notifier)); } - nvmem_unregister(master->otp_user_nvmem); - nvmem_unregister(master->otp_factory_nvmem); + mtd_otp_nvmem_remove(master); if (IS_REACHABLE(CONFIG_MTD_VIRT_CONCAT)) { err = mtd_virt_concat_destroy(master); -- 2.53.0 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic