Skip to content

Commit 9704c6c

Browse files
eraykaradagaloktiwa
authored andcommitted
ext4: guard against EA inode refcount underflow in xattr update
commit 57295e835408d8d425bef58da5253465db3d6888 upstream. syzkaller found a path where ext4_xattr_inode_update_ref() reads an EA inode refcount that is already <= 0 and then applies ref_change (often -1). That lets the refcount underflow and we proceed with a bogus value, triggering errors like: EXT4-fs error: EA inode <n> ref underflow: ref_count=-1 ref_change=-1 EXT4-fs warning: ea_inode dec ref err=-117 Make the invariant explicit: if the current refcount is non-positive, treat this as on-disk corruption, emit ext4_error_inode(), and fail the operation with -EFSCORRUPTED instead of updating the refcount. Delete the WARN_ONCE() as negative refcounts are now impossible; keep error reporting in ext4_error_inode(). This prevents the underflow and the follow-on orphan/cleanup churn. Reported-by: [email protected] Fixes: https://syzbot.org/bug?extid=0be4f339a8218d2a5bb1 Cc: [email protected] Co-developed-by: Albin Babu Varghese <[email protected]> Signed-off-by: Albin Babu Varghese <[email protected]> Signed-off-by: Ahmet Eray Karadag <[email protected]> Message-ID: <[email protected]> Signed-off-by: Theodore Ts'o <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit ea39e712c2f5ae148ee5515798ae03523673e002) Signed-off-by: Alok Tiwari <[email protected]>
1 parent abae64c commit 9704c6c

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

fs/ext4/xattr.c

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1030,7 +1030,7 @@ static int ext4_xattr_inode_update_ref(handle_t *handle, struct inode *ea_inode,
10301030
int ref_change)
10311031
{
10321032
struct ext4_iloc iloc;
1033-
s64 ref_count;
1033+
u64 ref_count;
10341034
int ret;
10351035

10361036
inode_lock_nested(ea_inode, I_MUTEX_XATTR);
@@ -1040,13 +1040,17 @@ static int ext4_xattr_inode_update_ref(handle_t *handle, struct inode *ea_inode,
10401040
goto out;
10411041

10421042
ref_count = ext4_xattr_inode_get_ref(ea_inode);
1043+
if ((ref_count == 0 && ref_change < 0) || (ref_count == U64_MAX && ref_change > 0)) {
1044+
ext4_error_inode(ea_inode, __func__, __LINE__, 0,
1045+
"EA inode %lu ref wraparound: ref_count=%lld ref_change=%d",
1046+
ea_inode->i_ino, ref_count, ref_change);
1047+
ret = -EFSCORRUPTED;
1048+
goto out;
1049+
}
10431050
ref_count += ref_change;
10441051
ext4_xattr_inode_set_ref(ea_inode, ref_count);
10451052

10461053
if (ref_change > 0) {
1047-
WARN_ONCE(ref_count <= 0, "EA inode %lu ref_count=%lld",
1048-
ea_inode->i_ino, ref_count);
1049-
10501054
if (ref_count == 1) {
10511055
WARN_ONCE(ea_inode->i_nlink, "EA inode %lu i_nlink=%u",
10521056
ea_inode->i_ino, ea_inode->i_nlink);
@@ -1055,9 +1059,6 @@ static int ext4_xattr_inode_update_ref(handle_t *handle, struct inode *ea_inode,
10551059
ext4_orphan_del(handle, ea_inode);
10561060
}
10571061
} else {
1058-
WARN_ONCE(ref_count < 0, "EA inode %lu ref_count=%lld",
1059-
ea_inode->i_ino, ref_count);
1060-
10611062
if (ref_count == 0) {
10621063
WARN_ONCE(ea_inode->i_nlink != 1,
10631064
"EA inode %lu i_nlink=%u",

0 commit comments

Comments
 (0)