* [RFC RFT PATCH] ocfs2: Invalidate inode if i_mode is zero after block read
@ 2025-10-22 22:27 Ahmet Eray Karadag
2025-10-23 0:34 ` Joseph Qi
` (3 more replies)
0 siblings, 4 replies; 10+ messages in thread
From: Ahmet Eray Karadag @ 2025-10-22 22:27 UTC (permalink / raw)
To: mark, jlbec, joseph.qi
Cc: ocfs2-devel, linux-kernel, david.hunter.linux, skhan,
Ahmet Eray Karadag, syzbot+55c40ae8a0e5f3659f2b,
Albin Babu Varghese
A panic occurs in ocfs2_unlink due to WARN_ON(inode->i_nlink == 0) when
handling a corrupted inode with i_mode=0 and i_nlink=0 in memory.
This "zombie" inode is created because ocfs2_read_locked_inode proceeds
even after ocfs2_validate_inode_block successfully validates a block
that structurally looks okay (passes checksum, signature etc.) but
contains semantically invalid data (specifically i_mode=0). The current
validation function doesn't check for i_mode being zero.
This results in an in-memory inode with i_mode=0 being added to the VFS
cache, which later triggers the panic during unlink.
Prevent this by adding an explicit check for i_mode == 0 within
ocfs2_validate_inode_block. If i_mode is zero, return -EFSCORRUPTED to signal
corruption. This causes the caller (ocfs2_read_locked_inode) to invoke
make_bad_inode(), correctly preventing the zombie inode from entering
the cache.
---
[RFC]:
The current fix handles i_mode=0 corruption detected during inode read
by returning -EFSCORRUPTED from ocfs2_validate_inode_block, which leads to
make_bad_inode() being called, preventing the corrupted inode from
entering the cache. This approach avoids immediately forcing the entire
filesystem read-only, assuming the corruption might be localized to
this inode.
Is this less aggressive error handling strategy appropriate for i_mode=0
corruption? Or is this condition considered severe enough that we *should*
explicitly call ocfs2_error() within the validation function to guarantee
the filesystem is marked read-only immediately upon detection?
Feedback and testing on the correct severity assessment and error
handling for this type of corruption would be appreciated.
---
Reported-by: syzbot+55c40ae8a0e5f3659f2b@syzkaller.appspotmail.com
Fixes: https://syzkaller.appspot.com/bug?extid=55c40ae8a0e5f3659f2b
Co-developed-by: Albin Babu Varghese <albinbabuvarghese20@gmail.com>
Signed-off-by: Albin Babu Varghese <albinbabuvarghese20@gmail.com>
Signed-off-by: Ahmet Eray Karadag <eraykrdg1@gmail.com>
---
fs/ocfs2/inode.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index 14bf440ea4df..d4142ff9ce65 100644
--- a/fs/ocfs2/inode.c
+++ b/fs/ocfs2/inode.c
@@ -1456,6 +1456,12 @@ int ocfs2_validate_inode_block(struct super_block *sb,
goto bail;
}
+ if (unlikely(le16_to_cpu(di->i_mode) == 0)) {
+ mlog(ML_ERROR, "Invalid dinode #%llu: i_mode is zero!\n",
+ (unsigned long long)bh->b_blocknr);
+ rc = -EFSCORRUPTED;
+ goto bail;
+ }
/*
* Errors after here are fatal.
*/
--
2.43.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [RFC RFT PATCH] ocfs2: Invalidate inode if i_mode is zero after block read
2025-10-22 22:27 [RFC RFT PATCH] ocfs2: Invalidate inode if i_mode is zero after block read Ahmet Eray Karadag
@ 2025-10-23 0:34 ` Joseph Qi
2025-10-24 2:30 ` [PATCH v2] " Ahmet Eray Karadag
` (2 subsequent siblings)
3 siblings, 0 replies; 10+ messages in thread
From: Joseph Qi @ 2025-10-23 0:34 UTC (permalink / raw)
To: Ahmet Eray Karadag, mark, jlbec, Heming Zhao
Cc: ocfs2-devel, linux-kernel, david.hunter.linux, skhan,
syzbot+55c40ae8a0e5f3659f2b, Albin Babu Varghese
On 2025/10/23 06:27, Ahmet Eray Karadag wrote:
> A panic occurs in ocfs2_unlink due to WARN_ON(inode->i_nlink == 0) when
> handling a corrupted inode with i_mode=0 and i_nlink=0 in memory.
>
> This "zombie" inode is created because ocfs2_read_locked_inode proceeds
> even after ocfs2_validate_inode_block successfully validates a block
> that structurally looks okay (passes checksum, signature etc.) but
> contains semantically invalid data (specifically i_mode=0). The current
> validation function doesn't check for i_mode being zero.
>
> This results in an in-memory inode with i_mode=0 being added to the VFS
> cache, which later triggers the panic during unlink.
>
> Prevent this by adding an explicit check for i_mode == 0 within
> ocfs2_validate_inode_block. If i_mode is zero, return -EFSCORRUPTED to signal
> corruption. This causes the caller (ocfs2_read_locked_inode) to invoke
> make_bad_inode(), correctly preventing the zombie inode from entering
> the cache.
>
> ---
> [RFC]:
> The current fix handles i_mode=0 corruption detected during inode read
> by returning -EFSCORRUPTED from ocfs2_validate_inode_block, which leads to
> make_bad_inode() being called, preventing the corrupted inode from
> entering the cache. This approach avoids immediately forcing the entire
> filesystem read-only, assuming the corruption might be localized to
> this inode.
>
> Is this less aggressive error handling strategy appropriate for i_mode=0
> corruption? Or is this condition considered severe enough that we *should*
> explicitly call ocfs2_error() within the validation function to guarantee
> the filesystem is marked read-only immediately upon detection?
> Feedback and testing on the correct severity assessment and error
> handling for this type of corruption would be appreciated.
> ---
>
> Reported-by: syzbot+55c40ae8a0e5f3659f2b@syzkaller.appspotmail.com
> Fixes: https://syzkaller.appspot.com/bug?extid=55c40ae8a0e5f3659f2b
> Co-developed-by: Albin Babu Varghese <albinbabuvarghese20@gmail.com>
> Signed-off-by: Albin Babu Varghese <albinbabuvarghese20@gmail.com>
> Signed-off-by: Ahmet Eray Karadag <eraykrdg1@gmail.com>
> ---
> fs/ocfs2/inode.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
> index 14bf440ea4df..d4142ff9ce65 100644
> --- a/fs/ocfs2/inode.c
> +++ b/fs/ocfs2/inode.c
> @@ -1456,6 +1456,12 @@ int ocfs2_validate_inode_block(struct super_block *sb,
> goto bail;
> }
>
> + if (unlikely(le16_to_cpu(di->i_mode) == 0)) {
It seems the buggy image is carefully crafted so that it can pass the
OCFS2_VALID_FL check.
Checking i_mode here looks wried. Could we check i_links_count instead?
Thanks,
Joseph
> + mlog(ML_ERROR, "Invalid dinode #%llu: i_mode is zero!\n",
> + (unsigned long long)bh->b_blocknr);
> + rc = -EFSCORRUPTED;
> + goto bail;
> + }
> /*
> * Errors after here are fatal.
> */
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH v2] ocfs2: Invalidate inode if i_mode is zero after block read
2025-10-22 22:27 [RFC RFT PATCH] ocfs2: Invalidate inode if i_mode is zero after block read Ahmet Eray Karadag
2025-10-23 0:34 ` Joseph Qi
@ 2025-10-24 2:30 ` Ahmet Eray Karadag
2025-10-24 9:05 ` Joseph Qi
2025-10-25 11:13 ` [PATCH v3] " Ahmet Eray Karadag
2025-10-25 14:39 ` [PATCH v4] " Ahmet Eray Karadag
3 siblings, 1 reply; 10+ messages in thread
From: Ahmet Eray Karadag @ 2025-10-24 2:30 UTC (permalink / raw)
To: mark, jlbec, joseph.qi
Cc: ocfs2-devel, linux-kernel, david.hunter.linux, skhan,
Ahmet Eray Karadag, syzbot+55c40ae8a0e5f3659f2b,
Albin Babu Varghese
A panic occurs in ocfs2_unlink due to WARN_ON(inode->i_nlink == 0) when
handling a corrupted inode with i_mode=0 and i_nlink=0 in memory.
This "zombie" inode is created because ocfs2_read_locked_inode proceeds
even after ocfs2_validate_inode_block successfully validates a block
that structurally looks okay (passes checksum, signature etc.) but
contains semantically invalid data (specifically i_mode=0). The current
validation function doesn't check for i_mode being zero.
This results in an in-memory inode with i_mode=0 being added to the VFS
cache, which later triggers the panic during unlink.
Prevent this by adding an explicit check for i_mode == 0 within
ocfs2_validate_inode_block. If i_mode is zero, return -EFSCORRUPTED to signal
corruption. This causes the caller (ocfs2_read_locked_inode) to invoke
make_bad_inode(), correctly preventing the zombie inode from entering
the cache.
---
[RFC]:
The current fix handles i_mode=0 corruption detected during inode read
by returning -EFSCORRUPTED from ocfs2_validate_inode_block, which leads to
make_bad_inode() being called, preventing the corrupted inode from
entering the cache. This approach avoids immediately forcing the entire
filesystem read-only, assuming the corruption might be localized to
this inode.
Is this less aggressive error handling strategy appropriate for i_mode=0
corruption? Or is this condition considered severe enough that we *should*
explicitly call ocfs2_error() within the validation function to guarantee
the filesystem is marked read-only immediately upon detection?
Feedback and testing on the correct severity assessment and error
handling for this type of corruption would be appreciated.
---
v2:
- Reviewed how ext4 handling same situation and we come up with this
solution
---
Reported-by: syzbot+55c40ae8a0e5f3659f2b@syzkaller.appspotmail.com
Fixes: https://syzkaller.appspot.com/bug?extid=55c40ae8a0e5f3659f2b
Co-developed-by: Albin Babu Varghese <albinbabuvarghese20@gmail.com>
Signed-off-by: Albin Babu Varghese <albinbabuvarghese20@gmail.com>
Signed-off-by: Ahmet Eray Karadag <eraykrdg1@gmail.com>
---
fs/ocfs2/inode.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index 14bf440ea4df..6c936f62b169 100644
--- a/fs/ocfs2/inode.c
+++ b/fs/ocfs2/inode.c
@@ -1455,7 +1455,15 @@ int ocfs2_validate_inode_block(struct super_block *sb,
(unsigned long long)bh->b_blocknr);
goto bail;
}
-
+ if (di->i_links_count == 0) {
+ if (le16_to_cpu(di->i_mode) == 0 ||
+ !(le32_to_cpu(di->i_flags) & OCFS2_ORPHANED_FL)) {
+ mlog(ML_ERROR, "Invalid dinode #%llu: i_mode is zero!\n",
+ (unsigned long long)bh->b_blocknr);
+ rc = -EFSCORRUPTED;
+ goto bail;
+ }
+ }
/*
* Errors after here are fatal.
*/
--
2.43.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH v2] ocfs2: Invalidate inode if i_mode is zero after block read
2025-10-24 2:30 ` [PATCH v2] " Ahmet Eray Karadag
@ 2025-10-24 9:05 ` Joseph Qi
0 siblings, 0 replies; 10+ messages in thread
From: Joseph Qi @ 2025-10-24 9:05 UTC (permalink / raw)
To: Ahmet Eray Karadag, mark, jlbec
Cc: ocfs2-devel, linux-kernel, david.hunter.linux, skhan,
syzbot+55c40ae8a0e5f3659f2b, Albin Babu Varghese
On 2025/10/24 10:30, Ahmet Eray Karadag wrote:
> A panic occurs in ocfs2_unlink due to WARN_ON(inode->i_nlink == 0) when
> handling a corrupted inode with i_mode=0 and i_nlink=0 in memory.
>
> This "zombie" inode is created because ocfs2_read_locked_inode proceeds
> even after ocfs2_validate_inode_block successfully validates a block
> that structurally looks okay (passes checksum, signature etc.) but
> contains semantically invalid data (specifically i_mode=0). The current
> validation function doesn't check for i_mode being zero.
>
> This results in an in-memory inode with i_mode=0 being added to the VFS
> cache, which later triggers the panic during unlink.
>
> Prevent this by adding an explicit check for i_mode == 0 within
> ocfs2_validate_inode_block. If i_mode is zero, return -EFSCORRUPTED to signal
> corruption. This causes the caller (ocfs2_read_locked_inode) to invoke
> make_bad_inode(), correctly preventing the zombie inode from entering
> the cache.
>
> ---
> [RFC]:
> The current fix handles i_mode=0 corruption detected during inode read
> by returning -EFSCORRUPTED from ocfs2_validate_inode_block, which leads to
> make_bad_inode() being called, preventing the corrupted inode from
> entering the cache. This approach avoids immediately forcing the entire
> filesystem read-only, assuming the corruption might be localized to
> this inode.
>
> Is this less aggressive error handling strategy appropriate for i_mode=0
> corruption? Or is this condition considered severe enough that we *should*
> explicitly call ocfs2_error() within the validation function to guarantee
> the filesystem is marked read-only immediately upon detection?
> Feedback and testing on the correct severity assessment and error
> handling for this type of corruption would be appreciated.
> ---
> v2:
> - Reviewed how ext4 handling same situation and we come up with this
> solution
> ---
The version change log should be after your SOB.
> Reported-by: syzbot+55c40ae8a0e5f3659f2b@syzkaller.appspotmail.com
> Fixes: https://syzkaller.appspot.com/bug?extid=55c40ae8a0e5f3659f2b
> Co-developed-by: Albin Babu Varghese <albinbabuvarghese20@gmail.com>
> Signed-off-by: Albin Babu Varghese <albinbabuvarghese20@gmail.com>
> Signed-off-by: Ahmet Eray Karadag <eraykrdg1@gmail.com>
> ---
> fs/ocfs2/inode.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
> index 14bf440ea4df..6c936f62b169 100644
> --- a/fs/ocfs2/inode.c
> +++ b/fs/ocfs2/inode.c
> @@ -1455,7 +1455,15 @@ int ocfs2_validate_inode_block(struct super_block *sb,
> (unsigned long long)bh->b_blocknr);
> goto bail;
> }
> -
> + if (di->i_links_count == 0) {
> + if (le16_to_cpu(di->i_mode) == 0 ||
> + !(le32_to_cpu(di->i_flags) & OCFS2_ORPHANED_FL)) {
Why not put those in a single check?
BTW, i_links_count is little endian and should convert to host endian first.
And we'd prefer the following alignment:
if (!le16_to_cpu(di->i_links_count) && !le16_to_cpu(di->i_mode) &&
!(le32_to_cpu(di->i_flags) & OCFS2_ORPHANED_FL))
......
Thanks,
Joseph
> + mlog(ML_ERROR, "Invalid dinode #%llu: i_mode is zero!\n",
> + (unsigned long long)bh->b_blocknr);
> + rc = -EFSCORRUPTED;
> + goto bail;
> + }
> + }
> /*
> * Errors after here are fatal.
> */
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v3] ocfs2: Invalidate inode if i_mode is zero after block read
2025-10-22 22:27 [RFC RFT PATCH] ocfs2: Invalidate inode if i_mode is zero after block read Ahmet Eray Karadag
2025-10-23 0:34 ` Joseph Qi
2025-10-24 2:30 ` [PATCH v2] " Ahmet Eray Karadag
@ 2025-10-25 11:13 ` Ahmet Eray Karadag
2025-10-25 12:24 ` Joseph Qi
2025-10-25 14:39 ` [PATCH v4] " Ahmet Eray Karadag
3 siblings, 1 reply; 10+ messages in thread
From: Ahmet Eray Karadag @ 2025-10-25 11:13 UTC (permalink / raw)
To: mark, jlbec, joseph.qi
Cc: ocfs2-devel, linux-kernel, david.hunter.linux, skhan,
Ahmet Eray Karadag, syzbot+55c40ae8a0e5f3659f2b,
Albin Babu Varghese
A panic occurs in ocfs2_unlink due to WARN_ON(inode->i_nlink == 0) when
handling a corrupted inode with i_mode=0 and i_nlink=0 in memory.
This "zombie" inode is created because ocfs2_read_locked_inode proceeds
even after ocfs2_validate_inode_block successfully validates a block
that structurally looks okay (passes checksum, signature etc.) but
contains semantically invalid data (specifically i_mode=0). The current
validation function doesn't check for i_mode being zero.
This results in an in-memory inode with i_mode=0 being added to the VFS
cache, which later triggers the panic during unlink.
Prevent this by adding an explicit check for i_mode == 0 within
ocfs2_validate_inode_block. If i_mode is zero, return -EFSCORRUPTED to signal
corruption. This causes the caller (ocfs2_read_locked_inode) to invoke
make_bad_inode(), correctly preventing the zombie inode from entering
the cache.
---
[RFC]:
The current fix handles i_mode=0 corruption detected during inode read
by returning -EFSCORRUPTED from ocfs2_validate_inode_block, which leads to
make_bad_inode() being called, preventing the corrupted inode from
entering the cache. This approach avoids immediately forcing the entire
filesystem read-only, assuming the corruption might be localized to
this inode.
Is this less aggressive error handling strategy appropriate for i_mode=0
corruption? Or is this condition considered severe enough that we *should*
explicitly call ocfs2_error() within the validation function to guarantee
the filesystem is marked read-only immediately upon detection?
Feedback and testing on the correct severity assessment and error
handling for this type of corruption would be appreciated.
Reported-by: syzbot+55c40ae8a0e5f3659f2b@syzkaller.appspotmail.com
Fixes: https://syzkaller.appspot.com/bug?extid=55c40ae8a0e5f3659f2b
Co-developed-by: Albin Babu Varghese <albinbabuvarghese20@gmail.com>
Signed-off-by: Albin Babu Varghese <albinbabuvarghese20@gmail.com>
Signed-off-by: Ahmet Eray Karadag <eraykrdg1@gmail.com>
---
v2:
- Reviewed how ext4 handling same situation and we come up with this
solution
---
v3:
- Implement combined check for nlink=0, mode=0 and non-orphan
as requested.
---
fs/ocfs2/inode.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index 14bf440ea4df..3feeaa475b62 100644
--- a/fs/ocfs2/inode.c
+++ b/fs/ocfs2/inode.c
@@ -1455,7 +1455,14 @@ int ocfs2_validate_inode_block(struct super_block *sb,
(unsigned long long)bh->b_blocknr);
goto bail;
}
-
+ if (!le16_to_cpu(di->i_links_count) && !le16_to_cpu(di->i_mode) &&
+ !(le32_to_cpu(di->i_flags) & OCFS2_ORPHANED_FL)) {
+ mlog(ML_ERROR, "Invalid dinode #%llu: "
+ "Corrupt state (nlink=0, mode=0, !orphan) detected!\n",
+ (unsigned long long)bh->b_blocknr);
+ rc = -EFSCORRUPTED;
+ goto bail;
+ }
/*
* Errors after here are fatal.
*/
--
2.43.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH v3] ocfs2: Invalidate inode if i_mode is zero after block read
2025-10-25 11:13 ` [PATCH v3] " Ahmet Eray Karadag
@ 2025-10-25 12:24 ` Joseph Qi
0 siblings, 0 replies; 10+ messages in thread
From: Joseph Qi @ 2025-10-25 12:24 UTC (permalink / raw)
To: Ahmet Eray Karadag, mark, jlbec
Cc: ocfs2-devel, linux-kernel, david.hunter.linux, skhan,
syzbot+55c40ae8a0e5f3659f2b, Albin Babu Varghese
On 2025/10/25 19:13, Ahmet Eray Karadag wrote:
> A panic occurs in ocfs2_unlink due to WARN_ON(inode->i_nlink == 0) when
> handling a corrupted inode with i_mode=0 and i_nlink=0 in memory.
>
> This "zombie" inode is created because ocfs2_read_locked_inode proceeds
> even after ocfs2_validate_inode_block successfully validates a block
> that structurally looks okay (passes checksum, signature etc.) but
> contains semantically invalid data (specifically i_mode=0). The current
> validation function doesn't check for i_mode being zero.
>
> This results in an in-memory inode with i_mode=0 being added to the VFS
> cache, which later triggers the panic during unlink.
>
> Prevent this by adding an explicit check for i_mode == 0 within
> ocfs2_validate_inode_block. If i_mode is zero, return -EFSCORRUPTED to signal
> corruption. This causes the caller (ocfs2_read_locked_inode) to invoke
> make_bad_inode(), correctly preventing the zombie inode from entering
> the cache.
>
> ---
> [RFC]:
> The current fix handles i_mode=0 corruption detected during inode read
> by returning -EFSCORRUPTED from ocfs2_validate_inode_block, which leads to
> make_bad_inode() being called, preventing the corrupted inode from
> entering the cache. This approach avoids immediately forcing the entire
> filesystem read-only, assuming the corruption might be localized to
> this inode.
>
> Is this less aggressive error handling strategy appropriate for i_mode=0
> corruption? Or is this condition considered severe enough that we *should*
> explicitly call ocfs2_error() within the validation function to guarantee
> the filesystem is marked read-only immediately upon detection?
> Feedback and testing on the correct severity assessment and error
> handling for this type of corruption would be appreciated.
>
> Reported-by: syzbot+55c40ae8a0e5f3659f2b@syzkaller.appspotmail.com
> Fixes: https://syzkaller.appspot.com/bug?extid=55c40ae8a0e5f3659f2b
> Co-developed-by: Albin Babu Varghese <albinbabuvarghese20@gmail.com>
> Signed-off-by: Albin Babu Varghese <albinbabuvarghese20@gmail.com>
> Signed-off-by: Ahmet Eray Karadag <eraykrdg1@gmail.com>
> ---
> v2:
> - Reviewed how ext4 handling same situation and we come up with this
> solution
> ---
> v3:
> - Implement combined check for nlink=0, mode=0 and non-orphan
> as requested.
> ---
> fs/ocfs2/inode.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
> index 14bf440ea4df..3feeaa475b62 100644
> --- a/fs/ocfs2/inode.c
> +++ b/fs/ocfs2/inode.c
> @@ -1455,7 +1455,14 @@ int ocfs2_validate_inode_block(struct super_block *sb,
> (unsigned long long)bh->b_blocknr);
> goto bail;
> }
> -
> + if (!le16_to_cpu(di->i_links_count) && !le16_to_cpu(di->i_mode) &&
> + !(le32_to_cpu(di->i_flags) & OCFS2_ORPHANED_FL)) {
^Better to align here.
> + mlog(ML_ERROR, "Invalid dinode #%llu: "
One tab is engough.
Joseph
> + "Corrupt state (nlink=0, mode=0, !orphan) detected!\n",
> + (unsigned long long)bh->b_blocknr);
> + rc = -EFSCORRUPTED;
> + goto bail;
> + }
> /*
> * Errors after here are fatal.
> */
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v4] ocfs2: Invalidate inode if i_mode is zero after block read
2025-10-22 22:27 [RFC RFT PATCH] ocfs2: Invalidate inode if i_mode is zero after block read Ahmet Eray Karadag
` (2 preceding siblings ...)
2025-10-25 11:13 ` [PATCH v3] " Ahmet Eray Karadag
@ 2025-10-25 14:39 ` Ahmet Eray Karadag
3 siblings, 0 replies; 10+ messages in thread
From: Ahmet Eray Karadag @ 2025-10-25 14:39 UTC (permalink / raw)
To: mark, jlbec, joseph.qi
Cc: ocfs2-devel, linux-kernel, david.hunter.linux, skhan,
Ahmet Eray Karadag, syzbot+55c40ae8a0e5f3659f2b,
Albin Babu Varghese
A panic occurs in ocfs2_unlink due to WARN_ON(inode->i_nlink == 0) when
handling a corrupted inode with i_mode=0 and i_nlink=0 in memory.
This "zombie" inode is created because ocfs2_read_locked_inode proceeds
even after ocfs2_validate_inode_block successfully validates a block
that structurally looks okay (passes checksum, signature etc.) but
contains semantically invalid data (specifically i_mode=0). The current
validation function doesn't check for i_mode being zero.
This results in an in-memory inode with i_mode=0 being added to the VFS
cache, which later triggers the panic during unlink.
Prevent this by adding an explicit check for i_mode == 0 within
ocfs2_validate_inode_block. If i_mode is zero, return -EFSCORRUPTED to signal
corruption. This causes the caller (ocfs2_read_locked_inode) to invoke
make_bad_inode(), correctly preventing the zombie inode from entering
the cache.
---
[RFC]:
The current fix handles i_mode=0 corruption detected during inode read
by returning -EFSCORRUPTED from ocfs2_validate_inode_block, which leads to
make_bad_inode() being called, preventing the corrupted inode from
entering the cache. This approach avoids immediately forcing the entire
filesystem read-only, assuming the corruption might be localized to
this inode.
Is this less aggressive error handling strategy appropriate for i_mode=0
corruption? Or is this condition considered severe enough that we *should*
explicitly call ocfs2_error() within the validation function to guarantee
the filesystem is marked read-only immediately upon detection?
Feedback and testing on the correct severity assessment and error
handling for this type of corruption would be appreciated.
Reported-by: syzbot+55c40ae8a0e5f3659f2b@syzkaller.appspotmail.com
Fixes: https://syzkaller.appspot.com/bug?extid=55c40ae8a0e5f3659f2b
Co-developed-by: Albin Babu Varghese <albinbabuvarghese20@gmail.com>
Signed-off-by: Albin Babu Varghese <albinbabuvarghese20@gmail.com>
Signed-off-by: Ahmet Eray Karadag <eraykrdg1@gmail.com>
---
v2:
- Reviewed how ext4 handling same situation and we come up with this
solution
---
v3:
- Implement combined check for nlink=0, mode=0 and non-orphan
as requested.
---
v4:
- Fix code alignment issues
---
fs/ocfs2/inode.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index 14bf440ea4df..d966df3aa605 100644
--- a/fs/ocfs2/inode.c
+++ b/fs/ocfs2/inode.c
@@ -1455,7 +1455,14 @@ int ocfs2_validate_inode_block(struct super_block *sb,
(unsigned long long)bh->b_blocknr);
goto bail;
}
-
+ if (!le16_to_cpu(di->i_links_count) && !le16_to_cpu(di->i_mode) &&
+ !(le32_to_cpu(di->i_flags) & OCFS2_ORPHANED_FL)) {
+ mlog(ML_ERROR, "Invalid dinode #%llu: "
+ "Corrupt state (nlink=0, mode=0, !orphan) detected!\n",
+ (unsigned long long)bh->b_blocknr);
+ rc = -EFSCORRUPTED;
+ goto bail;
+ }
/*
* Errors after here are fatal.
*/
--
2.43.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [RFT PATCH] ocfs2: Invalidate inode if i_mode is zero after block read
@ 2025-11-08 12:01 Ahmet Eray Karadag
2025-12-02 0:32 ` [PATCH v4] " Ahmet Eray Karadag
0 siblings, 1 reply; 10+ messages in thread
From: Ahmet Eray Karadag @ 2025-11-08 12:01 UTC (permalink / raw)
To: mark, jlbec, joseph.qi
Cc: ocfs2-devel, linux-kernel, david.hunter.linux, skhan,
Ahmet Eray Karadag, syzbot+55c40ae8a0e5f3659f2b,
Albin Babu Varghese
A panic occurs in ocfs2_unlink due to WARN_ON(inode->i_nlink == 0) when
handling a corrupted inode with i_mode=0 and i_nlink=0 in memory.
This "zombie" inode is created because ocfs2_read_locked_inode proceeds
even after ocfs2_validate_inode_block successfully validates a block
that structurally looks okay (passes checksum, signature etc.) but
contains semantically invalid data (specifically i_mode=0). The current
validation function doesn't check for i_mode being zero.
This results in an in-memory inode with i_mode=0 being added to the VFS
cache, which later triggers the panic during unlink.
Prevent this by adding an explicit check for (i_mode == 0, i_nlink == 0, non-orphan)
within ocfs2_validate_inode_block. If the check is true, return -EFSCORRUPTED to signal
corruption. This causes the caller (ocfs2_read_locked_inode) to invoke
make_bad_inode(), correctly preventing the zombie inode from entering
the cache.
Reported-by: syzbot+55c40ae8a0e5f3659f2b@syzkaller.appspotmail.com
Fixes: https://syzkaller.appspot.com/bug?extid=55c40ae8a0e5f3659f2b
Co-developed-by: Albin Babu Varghese <albinbabuvarghese20@gmail.com>
Signed-off-by: Albin Babu Varghese <albinbabuvarghese20@gmail.com>
Signed-off-by: Ahmet Eray Karadag <eraykrdg1@gmail.com>
Previous link: https://lore.kernel.org/all/20251022222752.46758-2-eraykrdg1@gmail.com/T/
---
fs/ocfs2/inode.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index 14bf440ea4df..d966df3aa605 100644
--- a/fs/ocfs2/inode.c
+++ b/fs/ocfs2/inode.c
@@ -1455,7 +1455,14 @@ int ocfs2_validate_inode_block(struct super_block *sb,
(unsigned long long)bh->b_blocknr);
goto bail;
}
-
+ if (!le16_to_cpu(di->i_links_count) && !le16_to_cpu(di->i_mode) &&
+ !(le32_to_cpu(di->i_flags) & OCFS2_ORPHANED_FL)) {
+ mlog(ML_ERROR, "Invalid dinode #%llu: "
+ "Corrupt state (nlink=0, mode=0, !orphan) detected!\n",
+ (unsigned long long)bh->b_blocknr);
+ rc = -EFSCORRUPTED;
+ goto bail;
+ }
/*
* Errors after here are fatal.
*/
--
2.43.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH v4] ocfs2: Invalidate inode if i_mode is zero after block read
2025-11-08 12:01 [RFT PATCH] " Ahmet Eray Karadag
@ 2025-12-02 0:32 ` Ahmet Eray Karadag
2025-12-02 2:44 ` Joseph Qi
0 siblings, 1 reply; 10+ messages in thread
From: Ahmet Eray Karadag @ 2025-12-02 0:32 UTC (permalink / raw)
To: mark, jlbec, joseph.qi
Cc: ocfs2-devel, linux-kernel, david.hunter.linux, skhan,
Ahmet Eray Karadag, syzbot+55c40ae8a0e5f3659f2b,
Albin Babu Varghese
A panic occurs in ocfs2_unlink due to WARN_ON(inode->i_nlink == 0) when
handling a corrupted inode with i_mode=0 and i_nlink=0 in memory.
This "zombie" inode is created because ocfs2_read_locked_inode proceeds
even after ocfs2_validate_inode_block successfully validates a block
that structurally looks okay (passes checksum, signature etc.) but
contains semantically invalid data (specifically i_mode=0). The current
validation function doesn't check for i_mode being zero.
This results in an in-memory inode with i_mode=0 being added to the VFS
cache, which later triggers the panic during unlink.
Prevent this by adding an explicit check for (i_mode == 0, i_nlink == 0, non-orphan)
within ocfs2_validate_inode_block. If the check is true, return -EFSCORRUPTED to signal
corruption. This causes the caller (ocfs2_read_locked_inode) to invoke
make_bad_inode(), correctly preventing the zombie inode from entering
the cache.
Reported-by: syzbot+55c40ae8a0e5f3659f2b@syzkaller.appspotmail.com
Fixes: https://syzkaller.appspot.com/bug?extid=55c40ae8a0e5f3659f2b
Co-developed-by: Albin Babu Varghese <albinbabuvarghese20@gmail.com>
Signed-off-by: Albin Babu Varghese <albinbabuvarghese20@gmail.com>
Signed-off-by: Ahmet Eray Karadag <eraykrdg1@gmail.com>
Previous link: https://lore.kernel.org/all/20251022222752.46758-2-eraykrdg1@gmail.com/T/
---
v2:
- Only checking either i_links_count == 0 or i_mode == 0
- Not performing le16_to_cpu() anymore
- Tested with ocfs2-test
---
v3:
- Add checking both high and low bits of i_links_count
---
v4:
- Reading i_links_count hi and low bits without helper function
to save few cpu cycles
---
fs/ocfs2/inode.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index 14bf440ea4df..34c2882273ae 100644
--- a/fs/ocfs2/inode.c
+++ b/fs/ocfs2/inode.c
@@ -1455,7 +1455,13 @@ int ocfs2_validate_inode_block(struct super_block *sb,
(unsigned long long)bh->b_blocknr);
goto bail;
}
-
+ if (!(di->i_links_count | di->i_links_count_hi) || !di->i_mode) {
+ mlog(ML_ERROR, "Invalid dinode #%llu: "
+ "Corrupt state (nlink=0 or mode=0,) detected!\n",
+ (unsigned long long)bh->b_blocknr);
+ rc = -EFSCORRUPTED;
+ goto bail;
+ }
/*
* Errors after here are fatal.
*/
--
2.43.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH v4] ocfs2: Invalidate inode if i_mode is zero after block read
2025-12-02 0:32 ` [PATCH v4] " Ahmet Eray Karadag
@ 2025-12-02 2:44 ` Joseph Qi
2025-12-02 2:52 ` Heming Zhao
0 siblings, 1 reply; 10+ messages in thread
From: Joseph Qi @ 2025-12-02 2:44 UTC (permalink / raw)
To: Ahmet Eray Karadag, mark, jlbec, Heming Zhao
Cc: ocfs2-devel, linux-kernel, david.hunter.linux, skhan,
syzbot+55c40ae8a0e5f3659f2b, Albin Babu Varghese
On 2025/12/2 08:32, Ahmet Eray Karadag wrote:
> A panic occurs in ocfs2_unlink due to WARN_ON(inode->i_nlink == 0) when
> handling a corrupted inode with i_mode=0 and i_nlink=0 in memory.
>
> This "zombie" inode is created because ocfs2_read_locked_inode proceeds
> even after ocfs2_validate_inode_block successfully validates a block
> that structurally looks okay (passes checksum, signature etc.) but
> contains semantically invalid data (specifically i_mode=0). The current
> validation function doesn't check for i_mode being zero.
>
> This results in an in-memory inode with i_mode=0 being added to the VFS
> cache, which later triggers the panic during unlink.
>
> Prevent this by adding an explicit check for (i_mode == 0, i_nlink == 0, non-orphan)
> within ocfs2_validate_inode_block. If the check is true, return -EFSCORRUPTED to signal
> corruption. This causes the caller (ocfs2_read_locked_inode) to invoke
> make_bad_inode(), correctly preventing the zombie inode from entering
> the cache.
>
> Reported-by: syzbot+55c40ae8a0e5f3659f2b@syzkaller.appspotmail.com
> Fixes: https://syzkaller.appspot.com/bug?extid=55c40ae8a0e5f3659f2b
> Co-developed-by: Albin Babu Varghese <albinbabuvarghese20@gmail.com>
> Signed-off-by: Albin Babu Varghese <albinbabuvarghese20@gmail.com>
> Signed-off-by: Ahmet Eray Karadag <eraykrdg1@gmail.com>
> Previous link: https://lore.kernel.org/all/20251022222752.46758-2-eraykrdg1@gmail.com/T/
> ---
> v2:
> - Only checking either i_links_count == 0 or i_mode == 0
> - Not performing le16_to_cpu() anymore
> - Tested with ocfs2-test
> ---
> v3:
> - Add checking both high and low bits of i_links_count
> ---
> v4:
> - Reading i_links_count hi and low bits without helper function
> to save few cpu cycles
> ---
> fs/ocfs2/inode.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
> index 14bf440ea4df..34c2882273ae 100644
> --- a/fs/ocfs2/inode.c
> +++ b/fs/ocfs2/inode.c
> @@ -1455,7 +1455,13 @@ int ocfs2_validate_inode_block(struct super_block *sb,
> (unsigned long long)bh->b_blocknr);
> goto bail;
> }
> -
> + if (!(di->i_links_count | di->i_links_count_hi) || !di->i_mode) {
"(di->i_links_count | di->i_links_count_hi)" looks meaningless.
So if we don't want to introduce the endian coversion here, how about:
if ((!di->i_links_count && !di->i_links_count_hi) || !di->i_mode) {
...
}
Heming, what's your opinion?
> + mlog(ML_ERROR, "Invalid dinode #%llu: "
> + "Corrupt state (nlink=0 or mode=0,) detected!\n",
Better to log the actual i_nlink/i_mode. e.g.
"corrupted i_nlink %u or i_mode %u\n"
...
Joseph
> + (unsigned long long)bh->b_blocknr);
> + rc = -EFSCORRUPTED;
> + goto bail;
> + }
> /*
> * Errors after here are fatal.
> */
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH v4] ocfs2: Invalidate inode if i_mode is zero after block read
2025-12-02 2:44 ` Joseph Qi
@ 2025-12-02 2:52 ` Heming Zhao
0 siblings, 0 replies; 10+ messages in thread
From: Heming Zhao @ 2025-12-02 2:52 UTC (permalink / raw)
To: Joseph Qi
Cc: Ahmet Eray Karadag, mark, jlbec, ocfs2-devel, linux-kernel,
david.hunter.linux, skhan, syzbot+55c40ae8a0e5f3659f2b,
Albin Babu Varghese
On Tue, Dec 02, 2025 at 10:44:21AM +0800, Joseph Qi wrote:
>
>
> On 2025/12/2 08:32, Ahmet Eray Karadag wrote:
> > A panic occurs in ocfs2_unlink due to WARN_ON(inode->i_nlink == 0) when
> > handling a corrupted inode with i_mode=0 and i_nlink=0 in memory.
> >
> > This "zombie" inode is created because ocfs2_read_locked_inode proceeds
> > even after ocfs2_validate_inode_block successfully validates a block
> > that structurally looks okay (passes checksum, signature etc.) but
> > contains semantically invalid data (specifically i_mode=0). The current
> > validation function doesn't check for i_mode being zero.
> >
> > This results in an in-memory inode with i_mode=0 being added to the VFS
> > cache, which later triggers the panic during unlink.
> >
> > Prevent this by adding an explicit check for (i_mode == 0, i_nlink == 0, non-orphan)
> > within ocfs2_validate_inode_block. If the check is true, return -EFSCORRUPTED to signal
> > corruption. This causes the caller (ocfs2_read_locked_inode) to invoke
> > make_bad_inode(), correctly preventing the zombie inode from entering
> > the cache.
> >
> > Reported-by: syzbot+55c40ae8a0e5f3659f2b@syzkaller.appspotmail.com
> > Fixes: https://syzkaller.appspot.com/bug?extid=55c40ae8a0e5f3659f2b
> > Co-developed-by: Albin Babu Varghese <albinbabuvarghese20@gmail.com>
> > Signed-off-by: Albin Babu Varghese <albinbabuvarghese20@gmail.com>
> > Signed-off-by: Ahmet Eray Karadag <eraykrdg1@gmail.com>
> > Previous link: https://lore.kernel.org/all/20251022222752.46758-2-eraykrdg1@gmail.com/T/
> > ---
> > v2:
> > - Only checking either i_links_count == 0 or i_mode == 0
> > - Not performing le16_to_cpu() anymore
> > - Tested with ocfs2-test
> > ---
> > v3:
> > - Add checking both high and low bits of i_links_count
> > ---
> > v4:
> > - Reading i_links_count hi and low bits without helper function
> > to save few cpu cycles
> > ---
> > fs/ocfs2/inode.c | 8 +++++++-
> > 1 file changed, 7 insertions(+), 1 deletion(-)
> >
> > diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
> > index 14bf440ea4df..34c2882273ae 100644
> > --- a/fs/ocfs2/inode.c
> > +++ b/fs/ocfs2/inode.c
> > @@ -1455,7 +1455,13 @@ int ocfs2_validate_inode_block(struct super_block *sb,
> > (unsigned long long)bh->b_blocknr);
> > goto bail;
> > }
> > -
> > + if (!(di->i_links_count | di->i_links_count_hi) || !di->i_mode) {
>
> "(di->i_links_count | di->i_links_count_hi)" looks meaningless.
> So if we don't want to introduce the endian coversion here, how about:
>
> if ((!di->i_links_count && !di->i_links_count_hi) || !di->i_mode) {
> ...
> }
>
> Heming, what's your opinion?
clearer, looks good to me.
>
> > + mlog(ML_ERROR, "Invalid dinode #%llu: "
> > + "Corrupt state (nlink=0 or mode=0,) detected!\n",
>
> Better to log the actual i_nlink/i_mode. e.g.
>
> "corrupted i_nlink %u or i_mode %u\n"
> ...
>
> Joseph
agree.
- Heming
>
> > + (unsigned long long)bh->b_blocknr);
> > + rc = -EFSCORRUPTED;
> > + goto bail;
> > + }
> > /*
> > * Errors after here are fatal.
> > */
>
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2025-12-02 2:53 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-10-22 22:27 [RFC RFT PATCH] ocfs2: Invalidate inode if i_mode is zero after block read Ahmet Eray Karadag
2025-10-23 0:34 ` Joseph Qi
2025-10-24 2:30 ` [PATCH v2] " Ahmet Eray Karadag
2025-10-24 9:05 ` Joseph Qi
2025-10-25 11:13 ` [PATCH v3] " Ahmet Eray Karadag
2025-10-25 12:24 ` Joseph Qi
2025-10-25 14:39 ` [PATCH v4] " Ahmet Eray Karadag
-- strict thread matches above, loose matches on Subject: below --
2025-11-08 12:01 [RFT PATCH] " Ahmet Eray Karadag
2025-12-02 0:32 ` [PATCH v4] " Ahmet Eray Karadag
2025-12-02 2:44 ` Joseph Qi
2025-12-02 2:52 ` Heming Zhao
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.