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=1795058423; b=Ulq34YXOBEIOo8s7e4h/hhY0U1N2ypqa2qgeKCLu9fqa6LTxc6KkELNZY7UTStvatKl0 WkFrahdI+gHHyxdquYju4lQfgCV3RGZF1lLzlveH393ZFKdCYK/LaEGaJImsi1hO7MUhx vlf7YV7qagvKCko84QzXrWYR3R27+uCkIqQEhvXA7NcOswtB+GTNfz6keOHYz1zfHxZUx ldUAaudEaFCHfNjJ9CnMbD9Ucx1RMr0y7DyNbcGtLSFCYPF3gaTGsFJf08sbxNs/6ctuA LXdyKeTQdGllhXGavmmhFlTMrz3Zbu26H5zyrfwR0kBF4SwqYgJj03mS/KSzZnTEYhQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795058423; 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=dWcn6jHwStw0XXf3KMp8uGAO49To2LtEjQwXvDpLi70=; b=YCyelN/no5KOwtd/ZP95XuT7CTTt4RGKwGykqu7sKZKoU2tKhzZCX74xXqzpZml1L3rR L3ygFwK7F6B0Iabl7Bebk0zqe56NBotYGvAEoXREeo6tEmxGiwrxtePOFNXiSXmJ6XIWZ OsMnclSxrcm/8nM14n1r5sOvDg/VVMTniKihpwyZ3hINaMhWDv7wutfsLNMJCWLR8JiTb 8FWig/AFNhpYsjMKJTjAKN04ZNjQcOEFFqgSvbGgZekJoA4a4hwoJXl8IlKp9jjK30FXp BBtsLgZ5AWIwPHsXJvXBKZ1VOJ4GRAfdSbekBGgiaTdyfeUAq41RSRvKBu1BCRnOywA== 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=2taBCbtu; 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 5DF6A606A32F; Thu, 19 Nov 2026 03:20:23 +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=2taBCbtu Received: by smtp.kernel.org (Postfix) with ESMTPSA id 83D211F000C4; Thu, 19 Nov 2026 03:20:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795058423; bh=dWcn6jHwStw0XXf3KMp8uGAO49To2LtEjQwXvDpLi70=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=2taBCbtuD/FVYenkEYG7lxtQ6UvulFhjGVqLGm7UDbekoeM/gy8mfh1qtKmv7rWL7 UZYXxi1WQozzgOJo9Adg/mSxJdN+qxkRNfyh+le5GhnjgHgDHwJYtr3hjIfpw79Y5H m40vEFxWl6aY46V9nyf+6OBNmrOPSXYvfMr3GLqM= 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 5.10 0479/1848] ocfs2: free replay slots in ocfs2_recovery_exit() Date: Wed, 18 Nov 2026 15:41:57 +0100 Message-ID: <20261118145934.293556223@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118145911.150052362@linuxfoundation.org> References: <20261118145911.150052362@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-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 35ba403de17b1..9809ae9debb54 100644 --- a/fs/ocfs2/journal.c +++ b/fs/ocfs2/journal.c @@ -159,7 +159,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; @@ -250,6 +250,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 141182422eabc..4199d73bebf4d 100644 --- a/fs/ocfs2/journal.h +++ b/fs/ocfs2/journal.h @@ -153,7 +153,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 fd5c20ed4ec76..3cb235a196126 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c @@ -1167,7 +1167,6 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent) 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; @@ -1842,14 +1841,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