-
Notifications
You must be signed in to change notification settings - Fork 692
e2fsprogs: backport fix for e2fsck skipping checks with orphan_file f… #18338
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Ankita Pareek (Ankita13-code)
wants to merge
1
commit into
3.0-dev
Choose a base branch
from
fix/e2fsprogs-orphan-file-skip-check
base: 3.0-dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+62
−17
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
38 changes: 38 additions & 0 deletions
38
SPECS/e2fsprogs/CVE-2024-e2fsck-orphan-file-skip-check.patch
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| From a8df015009e7cd71b411f21e7d6f0797a28cba5c Mon Sep 17 00:00:00 2001 | ||
| From: Luis Henriques (SUSE) <luis.henriques@linux.dev> | ||
| Date: Tue, 11 Jun 2024 15:27:04 +0100 | ||
| Subject: [PATCH] e2fsck: don't skip checks if the orphan file is present in | ||
| the filesystem | ||
|
|
||
| If the filesystem supports the orphan file feature and that file is present | ||
| then don't skip the filesystem checks as that file may need to be | ||
| cleaned up. | ||
|
|
||
| Signed-off-by: Luis Henriques (SUSE) <luis.henriques@linux.dev> | ||
| Link: https://lore.kernel.org/r/20240611142704.14307-2-luis.henriques@linux.dev | ||
| Signed-off-by: Theodore Ts'o <tytso@mit.edu> | ||
|
|
||
| Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2318710 | ||
| Addresses: https://bugzilla.suse.com/show_bug.cgi?id=1226043 | ||
| --- | ||
| e2fsck/unix.c | 4 ++++ | ||
| 1 file changed, 4 insertions(+) | ||
|
|
||
| diff --git a/e2fsck/unix.c b/e2fsck/unix.c | ||
| index 7f0f77f..b3a1234 100644 | ||
| --- a/e2fsck/unix.c | ||
| +++ b/e2fsck/unix.c | ||
| @@ -370,6 +370,10 @@ static void check_if_skip(e2fsck_t ctx) | ||
| if (ctx->options & E2F_OPT_JOURNAL_ONLY) | ||
| goto skip; | ||
|
|
||
| + if (ext2fs_has_feature_orphan_file(fs->super) && | ||
| + ext2fs_has_feature_orphan_present(fs->super)) | ||
| + return; | ||
| + | ||
| lastcheck = fs->super->s_lastcheck; | ||
| if (lastcheck > ctx->now) | ||
| lastcheck -= ctx->time_fudge; | ||
| -- | ||
| 2.39.2 | ||
|
|
||
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
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
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Patch looks good w.r.t upstream.
How have we verified this ?
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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?