Skip to content

Commit 4b90f16

Browse files
P2GONEaalexandrovich
authored andcommitted
fs: ntfs3: fix infinite loop in attr_load_runs_range on inconsistent metadata
We found an infinite loop bug in the ntfs3 file system that can lead to a Denial-of-Service (DoS) condition. A malformed NTFS image can cause an infinite loop when an attribute header indicates an empty run list, while directory entries reference it as containing actual data. In NTFS, setting evcn=-1 with svcn=0 is a valid way to represent an empty run list, and run_unpack() correctly handles this by checking if evcn + 1 equals svcn and returning early without parsing any run data. However, this creates a problem when there is metadata inconsistency, where the attribute header claims to be empty (evcn=-1) but the caller expects to read actual data. When run_unpack() immediately returns success upon seeing this condition, it leaves the runs_tree uninitialized with run->runs as a NULL. The calling function attr_load_runs_range() assumes that a successful return means that the runs were loaded and sets clen to 0, expecting the next run_lookup_entry() call to succeed. Because runs_tree remains uninitialized, run_lookup_entry() continues to fail, and the loop increments vcn by zero (vcn += 0), leading to an infinite loop. This patch adds a retry counter to detect when run_lookup_entry() fails consecutively after attr_load_runs_vcn(). If the run is still not found on the second attempt, it indicates corrupted metadata and returns -EINVAL, preventing the Denial-of-Service (DoS) vulnerability. Co-developed-by: Seunghun Han <kkamagui@gmail.com> Signed-off-by: Seunghun Han <kkamagui@gmail.com> Co-developed-by: Jihoon Kwon <kjh010315@gmail.com> Signed-off-by: Jihoon Kwon <kjh010315@gmail.com> Signed-off-by: Jaehun Gou <p22gone@gmail.com> Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
1 parent fac760f commit 4b90f16

1 file changed

Lines changed: 12 additions & 3 deletions

File tree

fs/ntfs3/attrib.c

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1354,19 +1354,28 @@ int attr_load_runs_range(struct ntfs_inode *ni, enum ATTR_TYPE type,
13541354
CLST vcn;
13551355
CLST vcn_last = (to - 1) >> cluster_bits;
13561356
CLST lcn, clen;
1357-
int err;
1357+
int err = 0;
1358+
int retry = 0;
13581359

13591360
for (vcn = from >> cluster_bits; vcn <= vcn_last; vcn += clen) {
13601361
if (!run_lookup_entry(run, vcn, &lcn, &clen, NULL)) {
1362+
if (retry != 0) { /* Next run_lookup_entry(vcn) also failed. */
1363+
err = -EINVAL;
1364+
break;
1365+
}
13611366
err = attr_load_runs_vcn(ni, type, name, name_len, run,
13621367
vcn);
13631368
if (err)
1364-
return err;
1369+
break;
1370+
13651371
clen = 0; /* Next run_lookup_entry(vcn) must be success. */
1372+
retry++;
13661373
}
1374+
else
1375+
retry = 0;
13671376
}
13681377

1369-
return 0;
1378+
return err;
13701379
}
13711380

13721381
#ifdef CONFIG_NTFS3_LZX_XPRESS

0 commit comments

Comments
 (0)