From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794063234; b=kOq+GDJwprbUItNJcE4/WfQ2pTf2ocxg2sfV8JlFaweAilGzMxKfNqYImSsJ6utW49bS khsZ9txq9AskDUmzKC1nsTbDjnGmdg5fvr1gOMYevlAVqNDmKVczYCm50fL92b0AEe9Iy f6M5AcEDHoEMo/HGs25k8jxj+GenPtAmFZORQE+YChdGf4krgNbJ1sK2SbJzyFs6ZSCz3 TZz1lmxnFeFvj//AY4UO+p5+SwekqIPmFxdzoWJFflma3MpbzN5y4S067qaW6+12EdiIw onEbr5XDtODjsLsGkULlNTSmkj9Y8L/rMD/Q3hT+r5CYJWCLZWn80tqcxiqH61eajjw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794063234; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=DtNUgwRDaBcG63uSuw35ic/XZkomzRtHrTyiug28Lhk=; b=gCVtw6uk9cFULJnMnyKQUyZjRHRk6mydtwGZCwERhNXSFvXoP9Dec1AOCOlR0jziBKxZ x4Cco3w52nGSzfKAPod3lPUKxSqyOSZPKRZvWNIWn8msOl0UN5q5g4cSbsO6pcAwp5xDi BEMUhuVhmKOHt2KMmENZd/QBxW/dgA5TpnGgN1IumIc0g3cLXGHfzIA1zGHZ0zvUgu7Hm 8DBsAN1l/2ciDYmrRLbsGDoftj6jFyaZjP/DxWOSl9/ilkKQFhFkIufQvOe0qXnJYVMrS r07NARX/+QmGq/MGYnHuGpFtjEfiZWxHCKEZWRdv/46FzpAHn6Kj8s95pST3aUE0zFw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=eTACeDP2; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EAF74606D805; Sat, 7 Nov 2026 14:53:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=eTACeDP2 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9BFF21F0089F; Sat, 7 Nov 2026 14:53:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794063233; bh=DtNUgwRDaBcG63uSuw35ic/XZkomzRtHrTyiug28Lhk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=eTACeDP2DdO945vippPei119KKbmijMdlBv49Ns6+2nUtFUlSotE6fYaiugeXDoyH xvuqBrcqd4uG1Iyx97b7AbKAymQOABPI9RQ8o/V6U71vNU0r7H2gsGQ47LTQQFeNPT 09t5PevJxD7VcAE55+QCLtx2pYIw8RDJraGCoOuI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Joseph Qi , Andrew Morton , Heming Zhao , Changwei Ge , Joel Becker , Jun Piao , Junxiao Bi , Mark Fasheh , Sasha Levin Subject: [PATCH 6.18 392/869] ocfs2: free replay slots in ocfs2_recovery_exit() Date: Sat, 7 Nov 2026 08:51:14 -0500 Message-ID: <20261107134906.717387464@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261107134852.069646174@linuxfoundation.org> References: <20261107134852.069646174@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Joseph Qi [ Upstream commit 1ddadc6d41c1a29fd8fad1891bdcd2956e08b7f0 ] Commit ce2fcf1516d6 ("ocfs2: fix memory leak in ocfs2_mount_volume()") added ocfs2_free_replay_slots() calls to the mount error paths out_dismount and out_check_volume to fix a leak of osb->replay_map. However these calls are unlocked while the bail path of the recovery thread, which is woken up by out_dismount right before the call, also frees the replay slots under osb->recovery_lock. Both sides can thus observe a non-NULL osb->replay_map and trigger a double free. Fix this by moving ocfs2_free_replay_slots() into ocfs2_recovery_exit() after ocfs2_recovery_disable(), which waits for a running recovery thread to exit under osb->recovery_lock, and drop the unlocked call sites. Both ocfs2_dismount_volume() and the out_super path of ocfs2_fill_super() call ocfs2_recovery_exit(), so the replay slots are freed on every path. Since super.c no longer references it, make ocfs2_free_replay_slots() static again. Link: https://lore.kernel.org/20260828112825.666097-2-joseph.qi@linux.alibaba.com Fixes: ce2fcf1516d6 ("ocfs2: fix memory leak in ocfs2_mount_volume()") Signed-off-by: Joseph Qi Signed-off-by: Andrew Morton Reviewed-by: Heming Zhao Cc: Changwei Ge Cc: Joel Becker Cc: Jun Piao Cc: Junxiao Bi Cc: Mark Fasheh Cc: Signed-off-by: Sasha Levin --- fs/ocfs2/journal.c | 3 ++- fs/ocfs2/journal.h | 1 - fs/ocfs2/super.c | 5 +---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c index 8c07610692d06..2b8b57e914f08 100644 --- a/fs/ocfs2/journal.c +++ b/fs/ocfs2/journal.c @@ -158,7 +158,7 @@ static void ocfs2_queue_replay_slots(struct ocfs2_super *osb, replay_map->rm_state = REPLAY_DONE; } -void ocfs2_free_replay_slots(struct ocfs2_super *osb) +static void ocfs2_free_replay_slots(struct ocfs2_super *osb) { struct ocfs2_replay_map *replay_map = osb->replay_map; @@ -246,6 +246,7 @@ void ocfs2_recovery_exit(struct ocfs2_super *osb) /* XXX: Should we bug if there are dirty entries? */ kfree(rm); + ocfs2_free_replay_slots(osb); } static int __ocfs2_recovery_map_test(struct ocfs2_super *osb, diff --git a/fs/ocfs2/journal.h b/fs/ocfs2/journal.h index f8b3b2a3d6309..19fc920d26b1c 100644 --- a/fs/ocfs2/journal.h +++ b/fs/ocfs2/journal.h @@ -151,7 +151,6 @@ void ocfs2_recovery_exit(struct ocfs2_super *osb); void ocfs2_recovery_disable_quota(struct ocfs2_super *osb); int ocfs2_compute_replay_slots(struct ocfs2_super *osb); -void ocfs2_free_replay_slots(struct ocfs2_super *osb); /* * Journal Control: * Initialize, Load, Shutdown, Wipe a journal. diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index 433b673ae5158..fe4ab1659e0d9 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c @@ -1163,7 +1163,6 @@ static int ocfs2_fill_super(struct super_block *sb, struct fs_context *fc) out_dismount: atomic_set(&osb->vol_state, VOLUME_DISABLED); wake_up(&osb->osb_mount_event); - ocfs2_free_replay_slots(osb); ocfs2_dismount_volume(sb, 1); goto out; @@ -1778,14 +1777,12 @@ static int ocfs2_mount_volume(struct super_block *sb) status = ocfs2_truncate_log_init(osb); if (status < 0) { mlog_errno(status); - goto out_check_volume; + goto out_system_inodes; } ocfs2_super_unlock(osb, 1); return 0; -out_check_volume: - ocfs2_free_replay_slots(osb); out_system_inodes: if (osb->local_alloc_state == OCFS2_LA_ENABLED) ocfs2_shutdown_local_alloc(osb); -- 2.53.0