Skip to content

Commit 91b6672

Browse files
committed
Fix prebuilt glibc ancestor directory identity
Compare ancestor directories by device, inode, and type while retaining full leaf-file identity. Add deterministic entry and inode replacement controls and update preflight collection counts.
1 parent bd1fa2f commit 91b6672

3 files changed

Lines changed: 91 additions & 5 deletions

File tree

‎scripts/check_prebuilt_glibc.py‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,11 @@ def identity(info: os.stat_result) -> dict:
104104
}
105105

106106

107+
def ancestor_identity(info: os.stat_result) -> tuple[int, int, int]:
108+
# Ancestors can gain unrelated entries without being replaced.
109+
return info.st_dev, info.st_ino, stat.S_IFMT(info.st_mode)
110+
111+
107112
def directory_flags() -> int:
108113
return os.O_RDONLY | os.O_DIRECTORY | os.O_NOFOLLOW | os.O_CLOEXEC
109114

@@ -124,7 +129,7 @@ def open_root(root: Path) -> int:
124129
child = os.open(name, directory_flags(), dir_fd=descriptor)
125130
os.close(descriptor)
126131
descriptor = child
127-
if identity(os.fstat(descriptor)) != identity(info):
132+
if ancestor_identity(os.fstat(descriptor)) != ancestor_identity(info):
128133
raise InspectionError(f"root component changed while opening: {current}")
129134
return descriptor
130135
except BaseException:

‎scripts/test_check_prebuilt_glibc.py‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -508,6 +508,83 @@ def test_root_and_directory_symlinks_are_rejected(self):
508508
records = self.assert_verdict(self.run_checker(), False)
509509
self.assert_issue(records, link, "symlink")
510510

511+
def test_ancestor_entry_added_between_stat_and_open_is_accepted(self):
512+
ancestor = self.root
513+
self.root = ancestor / "payload"
514+
declare(self.root)
515+
self.generated(self.root).mkdir()
516+
path = self.shared("lib/good.so")
517+
entry = ancestor / "parallel ctest entry"
518+
declare(entry)
519+
self.generated(entry)
520+
module = self.load_checker()
521+
original = os.open
522+
mutations = []
523+
524+
def add_entry(name, flags, *args, **kwargs):
525+
if (name == ancestor.name and flags & os.O_DIRECTORY
526+
and kwargs.get("dir_fd") is not None and not mutations
527+
and os.path.samestat(os.fstat(kwargs["dir_fd"]), self.area.stat())):
528+
# open_root has already statted this ancestor, but has not
529+
# opened it yet. The entry is outside the staged payload.
530+
before = ancestor.stat()
531+
entry.mkdir()
532+
# Force distinct metadata even on a coarse timestamp clock.
533+
os.utime(ancestor, ns=(before.st_atime_ns,
534+
before.st_mtime_ns + 1_000_000_000))
535+
mutations.append((before, ancestor.stat()))
536+
return original(name, flags, *args, **kwargs)
537+
538+
with mock.patch.object(module.os, "open", side_effect=add_entry):
539+
outcome = self.in_process(module)
540+
self.assertEqual(len(mutations), 1)
541+
before, after = mutations[0]
542+
self.assertTrue(entry.is_dir())
543+
self.assertEqual((before.st_dev, before.st_ino, before.st_mode),
544+
(after.st_dev, after.st_ino, after.st_mode))
545+
self.assertNotEqual(before.st_mtime_ns, after.st_mtime_ns)
546+
records = self.assert_verdict(outcome, True)
547+
self.assertTrue(self.targets(records)[str(path)]["inspected"])
548+
549+
def test_ancestor_inode_replaced_between_stat_and_open_is_refused(self):
550+
ancestor = self.root
551+
self.root = ancestor / "payload"
552+
declare(self.root)
553+
self.generated(self.root).mkdir()
554+
path = self.shared("lib/good.so")
555+
replacement = self.area / "replacement ancestor"
556+
retired = self.area / "original ancestor"
557+
declare(replacement, retired)
558+
self.generated(retired)
559+
# Keep a valid payload in the replacement so a weakened identity
560+
# check cannot pass this control by failing on missing libraries.
561+
self.copy(path, replacement / path.relative_to(ancestor))
562+
module = self.load_checker()
563+
original = os.open
564+
mutations = []
565+
566+
def replace_ancestor(name, flags, *args, **kwargs):
567+
if (name == ancestor.name and flags & os.O_DIRECTORY
568+
and kwargs.get("dir_fd") is not None and not mutations
569+
and os.path.samestat(os.fstat(kwargs["dir_fd"]), self.area.stat())):
570+
before = ancestor.stat()
571+
ancestor.rename(retired)
572+
replacement.rename(ancestor)
573+
mutations.append((before, ancestor.stat()))
574+
return original(name, flags, *args, **kwargs)
575+
576+
with mock.patch.object(module.os, "open", side_effect=replace_ancestor):
577+
outcome = self.in_process(module)
578+
self.assertEqual(len(mutations), 1)
579+
before, after = mutations[0]
580+
self.assertEqual(before.st_dev, after.st_dev)
581+
self.assertEqual(before.st_mode, after.st_mode)
582+
self.assertNotEqual(before.st_ino, after.st_ino)
583+
records = self.assert_verdict(outcome, False)
584+
self.assert_issue(records, self.root, "root component changed")
585+
self.assertEqual(records[-1]["inspected"], 0)
586+
self.assertFalse(any(row["event"] == "command" for row in records))
587+
511588
def test_protected_entry_and_library_named_directory_fail_without_content_reads(self):
512589
self.shared("lib/good.so")
513590
protected = self.root / ".env"

‎scripts/test_ci_preflight.py‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4506,9 +4506,13 @@ def test_registered_full_collection_and_planted_assertion_propagate(self):
45064506
script = ROOT / 'scripts/test_check_prebuilt_glibc.py'
45074507
ids = discover_test_ids(script)
45084508
names = {test_id.rsplit('.', 1)[-1] for test_id in ids}
4509-
self.assertEqual(len(ids), 33)
4510-
self.assertEqual(len(names), 33)
4511-
self.assertTrue({'test_version_policy_mutation_breaks_real_rejection_assertion',
4509+
# expectation corrected: 33 -> 35, because the ancestor-entry and
4510+
# inode-replacement controls extend the complete existing collection.
4511+
self.assertEqual(len(ids), 35)
4512+
self.assertEqual(len(names), 35)
4513+
self.assertTrue({'test_ancestor_entry_added_between_stat_and_open_is_accepted',
4514+
'test_ancestor_inode_replaced_between_stat_and_open_is_refused',
4515+
'test_version_policy_mutation_breaks_real_rejection_assertion',
45124516
'test_isoc23_policy_mutation_breaks_real_rejection_assertion'} <= names)
45134517
area = Path(tempfile.mkdtemp(prefix='prebuilt-glibc-registration-'))
45144518
print(f'prebuilt GLIBC registration evidence: {area}', flush=True)
@@ -4535,7 +4539,7 @@ def test_registered_full_collection_and_planted_assertion_propagate(self):
45354539
expected_code, False)])
45364540
rows = re.findall(r'^(test_\w+) \([^\n]+\) \.\.\. (ok|FAIL)$', log, re.MULTILINE)
45374541
self.assertEqual(sorted(name for name, _ in rows), sorted(names), log)
4538-
self.assertRegex(log, r'Ran 33 tests in ')
4542+
self.assertRegex(log, r'Ran 35 tests in ')
45394543
failed = [name for name, status in rows if status == 'FAIL']
45404544
self.assertEqual(failed, [] if expected_code == 0 else
45414545
['test_complete_inventory_members_spaces_and_content_identity'])

0 commit comments

Comments
 (0)