Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A118046D557; Tue, 21 Jul 2026 18:30:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784658626; cv=none; b=tPXIsmMPKKaXMkTjg5ocMfzkdA//zI+0TD/UyXCc5lcei6+FW0trYO5QmD+DE8lHK/IPbcSW2AzjpO5nx9xe8CYUdcL7KRJalZpL5Wa82onwlbD/YiFe8l7KkyLjJnHXVGgqXi5GcjMliuMoUBQz3o2j5w5ClrdmpA4VwuWBSl4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784658626; c=relaxed/simple; bh=3JBxZ6kmLXBFbPTdc3MCP/8qA4jJMPOIzasevOgXK2I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=P97PLZyMRg/SR7OtyYVgea/TEnPA0cS+lBtTFdWfDCyy6LI3x8dOO1WNJdCSjw2wIltQ2qY1wWRaUlnvs81l8X+v7T0eE90fix/+b5LZ2gibfBwejykedTTgpyIsRkH3zcQyiLKM1PmFyN6vtR2HOBEbukO5TwweAcYAwPQHj64= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=0ZuD7J1Z; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="0ZuD7J1Z" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0E5D91F000E9; Tue, 21 Jul 2026 18:30:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784658625; bh=tzEd1HS/Ymz3Z67wdfw39qDe/1Q06LNcOBZR2895W1c=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=0ZuD7J1ZYUkjPUK/Y+t0cVi61ize2J8pkMs2hkc99pao77UrEri/n8kSaehkgT/9F FQfDiG95qXeoYKB9qUhEiVLUOpjhbkZ3JlJ1/NK9o3AEh3O/p03/VWMs0m781ECrRT KgJOlDHdXkmWaVkql9XRzWaSbYLKEq2ADbXDFQ9s= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Abdun Nihaal , Alison Schofield Subject: [PATCH 6.18 1215/1611] nvdimm/btt: Free arenas on btt_init() error paths Date: Tue, 21 Jul 2026 17:22:11 +0200 Message-ID: <20260721152542.763971676@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152514.750365251@linuxfoundation.org> References: <20260721152514.750365251@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Abdun Nihaal commit 1a6b6442a982d0ca5fb6a1a39b6f6dfd760eda57 upstream. The arenas allocated by discover_arenas() or create_arenas() are not freed on some error paths in btt_init(). This leaks memory when BTT initialization fails. Call free_arenas() from the affected error paths to release the allocations. [ as: commit message and log edits ] Fixes: 5212e11fde4d ("nd_btt: atomic sector updates") Cc: stable@vger.kernel.org Signed-off-by: Abdun Nihaal Reviewed-by: Alison Schofield Link: https://patch.msgid.link/20260519-nvdimmleaks-v1-2-592300fb7a43@cse.iitm.ac.in Signed-off-by: Alison Schofield Signed-off-by: Greg Kroah-Hartman --- drivers/nvdimm/btt.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) --- a/drivers/nvdimm/btt.c +++ b/drivers/nvdimm/btt.c @@ -1589,7 +1589,7 @@ static struct btt *btt_init(struct nd_bt if (btt->init_state != INIT_READY && nd_region->ro) { dev_warn(dev, "%s is read-only, unable to init btt metadata\n", dev_name(&nd_region->dev)); - return NULL; + goto err; } else if (btt->init_state != INIT_READY) { btt->num_arenas = (rawsize / ARENA_MAX_SIZE) + ((rawsize % ARENA_MAX_SIZE) ? 1 : 0); @@ -1599,25 +1599,28 @@ static struct btt *btt_init(struct nd_bt ret = create_arenas(btt); if (ret) { dev_info(dev, "init: create_arenas: %d\n", ret); - return NULL; + goto err; } ret = btt_meta_init(btt); if (ret) { dev_err(dev, "init: error in meta_init: %d\n", ret); - return NULL; + goto err; } } ret = btt_blk_init(btt); if (ret) { dev_err(dev, "init: error in blk_init: %d\n", ret); - return NULL; + goto err; } btt_debugfs_init(btt); return btt; +err: + free_arenas(btt); + return NULL; } /**