e2fsprogs: backport fix for e2fsck skipping checks with orphan_file f… - #18338
Open
Ankita Pareek (Ankita13-code) wants to merge 1 commit into
Open
e2fsprogs: backport fix for e2fsck skipping checks with orphan_file f…#18338Ankita Pareek (Ankita13-code) wants to merge 1 commit into
Ankita Pareek (Ankita13-code) wants to merge 1 commit into
Conversation
…eature After an unclean reboot, e2fsck could skip filesystem checks even when orphan inodes are present on filesystems with the orphan_file feature enabled. This caused the kernel to reject mounting with 'bad orphan inode' errors, dropping the system into emergency mode. Backport upstream commit a8df015009e7cd71b411f21e7d6f0797a28cba5c which adds a check in check_if_skip() to not skip when both orphan_file and orphan_present features are set. This fix was confirmed working by Fedora (1.47.1-6) and SUSE. Reference: https://bugzilla.redhat.com/show_bug.cgi?id=2318710 Reference: https://bugzilla.suse.com/show_bug.cgi?id=1226043 Upstream: tytso/e2fsprogs@a8df015 Signed-off-by: Ankita Pareek <ankitapareek@microsoft.com>
Ankita Pareek (Ankita13-code)
force-pushed
the
fix/e2fsprogs-orphan-file-skip-check
branch
from
August 6, 2026 11:55
e57927f to
6fb069e
Compare
Ankita Pareek (Ankita13-code)
marked this pull request as ready for review
August 6, 2026 12:21
| if (ctx->options & E2F_OPT_JOURNAL_ONLY) | ||
| goto skip; | ||
|
|
||
| + if (ext2fs_has_feature_orphan_file(fs->super) && |
There was a problem hiding this comment.
Patch looks good w.r.t upstream.
How have we verified this ?
There was a problem hiding this comment.
Adding to what Muhammad Falak R Wani (@mfrw) said about testing, upstream patch has added tests for this fix. Can we check if we can apply that patch and run ptest?
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge Checklist
*-staticsubpackages, etc.) have had theirReleasetag incremented.*.signatures.jsonfilessudo make go-tidy-allandsudo make go-test-coveragepassSummary
Backport upstream fix for e2fsck incorrectly skipping filesystem checks when the
orphan_filefeature is enabled and orphan inodes are present. After an unclean reboot, this causes the kernel to reject mounting with "bad orphan inode" errors, dropping the system into emergency mode.The fix is a minimal 4-line backport of upstream commit a8df015 which adds a check in
check_if_skip()to force e2fsck to run when bothorphan_fileandorphan_presentsuperblock features are set.This same fix was validated by Fedora (e2fsprogs-1.47.1-6) and SUSE, and confirmed working by multiple independent testers.
Change Log
CVE-2024-e2fsck-orphan-file-skip-check.patch)Does this affect the toolchain?
YES
Associated issues
Links to CVEs
Test Methodology