From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 703163BBA00 for ; Thu, 2 Apr 2026 16:31:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775147500; cv=none; b=UrApFDb7kDbeLrxrtp71JVh9ZKKOf7rm3kBRQLby0CaFURWyL+7/WOxT4QGs7cFHsOyUAxArLO185/QpvWIAm5uUsDRuLPgURHtmlnLOwUaaGyW9QsRLkKQ7KIrmAS+btcOkNTvurpOPrR84CXn9/mhu9GUAcaxoPQNfhQoDRc0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775147500; c=relaxed/simple; bh=PPdDJqPj7+Ci1lErVOIq4Z6SWxYqxPChucieXMPHTfw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sJyWYT73yJ1360yk8FJWXpQxD7+E63vPn8MBUlTFEIdRz5wN3snad9ShlT3M0t+C26zQHnjXIWgTFYdx0yCuuueqILN6xwd4w1KTQ065jugD9VUSypTRRoqoliPq+h526X2QqqM223kXZSUUFtToR9iCyUG3YYkPwSj055xQp2Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=l3q/Jlxy; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="l3q/Jlxy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4EB6AC116C6; Thu, 2 Apr 2026 16:31:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775147500; bh=PPdDJqPj7+Ci1lErVOIq4Z6SWxYqxPChucieXMPHTfw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l3q/JlxyWiOLq7fah/ena2XYq7VHC7t2GCmeSk3WT0quM4pxwDETLfmUSSk9nhQN9 UEOt3bRvLe7ojpiHGzEcONMuw00GfjztYkc1611hJVCtuZ6OYlPw+tb5ZO99C6yKvQ 2PtcyDYz6pfAMGYicy2zGVf/w24sJoWUNTYOU2ZSOIm144EV4/tjbhebPvGw1ZvFIv BUXzKJyMPcXOw59ZFANrovWoTStMpRoUeNITBpEpZAeEat7Rq9Ysk7Vs9BqkSCBjrK 9KXedOBYzryZCyD/E/g9yAsSWWn4NnTt1N5Z2fJEgMWEn2vTj5ExBGgJvHhZtpDKTY byh+ZXlD9sFYw== From: Sasha Levin To: stable@vger.kernel.org Cc: Jiayuan Chen , Jiayuan Chen , Jan Kara , "Ritesh Harjani (IBM)" , Theodore Ts'o , stable@kernel.org, Sasha Levin Subject: [PATCH 6.1.y] ext4: fix use-after-free in update_super_work when racing with umount Date: Thu, 2 Apr 2026 12:31:37 -0400 Message-ID: <20260402163137.1387692-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026033053-amazingly-deface-0a51@gregkh> References: <2026033053-amazingly-deface-0a51@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Jiayuan Chen [ Upstream commit d15e4b0a418537aafa56b2cb80d44add83e83697 ] Commit b98535d09179 ("ext4: fix bug_on in start_this_handle during umount filesystem") moved ext4_unregister_sysfs() before flushing s_sb_upd_work to prevent new error work from being queued via /proc/fs/ext4/xx/mb_groups reads during unmount. However, this introduced a use-after-free because update_super_work calls ext4_notify_error_sysfs() -> sysfs_notify() which accesses the kobject's kernfs_node after it has been freed by kobject_del() in ext4_unregister_sysfs(): update_super_work ext4_put_super ----------------- -------------- ext4_unregister_sysfs(sb) kobject_del(&sbi->s_kobj) __kobject_del() sysfs_remove_dir() kobj->sd = NULL sysfs_put(sd) kernfs_put() // RCU free ext4_notify_error_sysfs(sbi) sysfs_notify(&sbi->s_kobj) kn = kobj->sd // stale pointer kernfs_get(kn) // UAF on freed kernfs_node ext4_journal_destroy() flush_work(&sbi->s_sb_upd_work) Instead of reordering the teardown sequence, fix this by making ext4_notify_error_sysfs() detect that sysfs has already been torn down by checking s_kobj.state_in_sysfs, and skipping the sysfs_notify() call in that case. A dedicated mutex (s_error_notify_mutex) serializes ext4_notify_error_sysfs() against kobject_del() in ext4_unregister_sysfs() to prevent TOCTOU races where the kobject could be deleted between the state_in_sysfs check and the sysfs_notify() call. Fixes: b98535d09179 ("ext4: fix bug_on in start_this_handle during umount filesystem") Cc: Jiayuan Chen Suggested-by: Jan Kara Signed-off-by: Jiayuan Chen Reviewed-by: Ritesh Harjani (IBM) Reviewed-by: Jan Kara Link: https://patch.msgid.link/20260319120336.157873-1-jiayuan.chen@linux.dev Signed-off-by: Theodore Ts'o Cc: stable@kernel.org [ adapted mutex_init placement ] Signed-off-by: Sasha Levin --- fs/ext4/ext4.h | 1 + fs/ext4/super.c | 1 + fs/ext4/sysfs.c | 10 +++++++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 7449777fabc36..b0a579084163f 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -1557,6 +1557,7 @@ struct ext4_sb_info { struct proc_dir_entry *s_proc; struct kobject s_kobj; struct completion s_kobj_unregister; + struct mutex s_error_notify_mutex; /* protects sysfs_notify vs kobject_del */ struct super_block *s_sb; struct buffer_head *s_mmp_bh; diff --git a/fs/ext4/super.c b/fs/ext4/super.c index fa5642838c79c..c260f2cd4d917 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -5256,6 +5256,7 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb) timer_setup(&sbi->s_err_report, print_daily_error_info, 0); spin_lock_init(&sbi->s_error_lock); + mutex_init(&sbi->s_error_notify_mutex); INIT_WORK(&sbi->s_error_work, flush_stashed_error_work); /* Register extent status tree shrinker */ diff --git a/fs/ext4/sysfs.c b/fs/ext4/sysfs.c index e2b8b3437c589..6facefe42c064 100644 --- a/fs/ext4/sysfs.c +++ b/fs/ext4/sysfs.c @@ -515,7 +515,10 @@ static struct kobj_type ext4_feat_ktype = { void ext4_notify_error_sysfs(struct ext4_sb_info *sbi) { - sysfs_notify(&sbi->s_kobj, NULL, "errors_count"); + mutex_lock(&sbi->s_error_notify_mutex); + if (sbi->s_kobj.state_in_sysfs) + sysfs_notify(&sbi->s_kobj, NULL, "errors_count"); + mutex_unlock(&sbi->s_error_notify_mutex); } static struct kobject *ext4_root; @@ -528,8 +531,10 @@ int ext4_register_sysfs(struct super_block *sb) int err; init_completion(&sbi->s_kobj_unregister); + mutex_lock(&sbi->s_error_notify_mutex); err = kobject_init_and_add(&sbi->s_kobj, &ext4_sb_ktype, ext4_root, "%s", sb->s_id); + mutex_unlock(&sbi->s_error_notify_mutex); if (err) { kobject_put(&sbi->s_kobj); wait_for_completion(&sbi->s_kobj_unregister); @@ -562,7 +567,10 @@ void ext4_unregister_sysfs(struct super_block *sb) if (sbi->s_proc) remove_proc_subtree(sb->s_id, ext4_proc_root); + + mutex_lock(&sbi->s_error_notify_mutex); kobject_del(&sbi->s_kobj); + mutex_unlock(&sbi->s_error_notify_mutex); } int __init ext4_init_sysfs(void) -- 2.53.0