pureboot v9: seal every command, and stop guarding what the seal covers
'W' handed the loader a whole page with no ack inside it and sp_spm handed any wire byte to SPMCSR, so a dropped byte re-aligned the stream and page data arrived where commands belong. That is how a page-address byte became BLBSET|SELFPRGEN on the tempmon board and programmed its lock bits. The first answer was to refuse that one command. It was the wrong shape twice over: it forbade a lock-bit write the owner may want, and it left every other command decided by bytes nobody checked. v9 checks them instead. One header for every command — opcode, selector, address, count, seal — folded and compared before the command is decoded, and *answered* before any payload moves: '+' accepts, 0xd4 (the ack inverted) refuses and nothing happened. An ack cannot do this job; it reports a command that has already run. It is smaller than v8 everywhere: 1284P 506→480, m8 498→480, 328P 484→468, t13A 474→460. The seal costs 14 bytes; bit opcodes in place of the letters pay for it twice over, since a letter costs a compare and a branch where a bit costs a skip. Both guards go — the lock-bit refusal because the seal covers it, the running-slot write guard because what it defended against was a wire fault naming an address and a wire fault can no longer name one. That one is a real trade: a host bug aimed at the running slot now lands. It buys a resident copy that can write its own slot, which is the only self-update route on a chip whose boot section *is* the slot. Two things the tests caught, both introduced here. Removing the invalid-opcode arm made every byte a command, so the knock stopped being harmless against a loader already in session and ate the five bytes behind it — identify moves to bit 5, which both 'p' and 'b' carry, so the knock is inert again and version discovery still works before the version is known. And the SPM value rides the count field because a data byte would arrive after the seal was checked. pbselfwrite and pbglitch are the new gates, both red-green: the same erase of the running page refused unsealed and performed sealed, and every header byte damaged after sealing refused where the identical damage before sealing is obeyed. Both judge by the simulator's flash, not the loader's opinion of it. pbreloc and pbrehome lose their write-guard probes, which is what those two gates replace. Defeating the seal in the loader turns seven tests red. 37 of 37 chips green with the exhaustive size matrix; README protocol section and every size row rewritten. pbhw gains an adversarial --seal-rounds sweep for the bench. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
@@ -161,7 +161,7 @@ class Suite:
|
||||
self.check("application flash reads back", rc == 0 and len(got) == info.base,
|
||||
f"{len(got)} B of {info.base}")
|
||||
|
||||
def erase_and_guard(self, info, loader_image: pathlib.Path | None) -> None:
|
||||
def erase_and_slot(self, info, loader_image: pathlib.Path | None) -> None:
|
||||
rc, out = self.rig.pureboot("--erase-flash")
|
||||
self.check("application region erases", rc == 0, self._brief(out))
|
||||
|
||||
@@ -188,6 +188,80 @@ class Suite:
|
||||
else:
|
||||
print(" skip loader slot comparison (pass --loader <image.bin>)")
|
||||
|
||||
def seal(self, info, rounds: int = 1) -> None:
|
||||
"""The seal, adversarially, over the real link.
|
||||
|
||||
pureboot 9 has no running-slot guard: what stops a mangled command from
|
||||
erasing the loader is the seal and nothing else. So this aims the worst
|
||||
command the protocol has — an SPM erase at the loader's own first page —
|
||||
and damages one header byte at a time. Every one must come back NAK with
|
||||
the slot untouched and the session still in step.
|
||||
|
||||
On a board whose link drops or mangles bytes of its own accord this is
|
||||
also the stress test: `--seal-rounds` repeats it, and a link fault
|
||||
during a round is indistinguishable to the loader from the damage being
|
||||
injected, which is the point.
|
||||
"""
|
||||
module = pbrig.load_pureboot(self.rig.d.pureboot)
|
||||
self.rig.reset()
|
||||
port = self.rig.open_port()
|
||||
try:
|
||||
loader = module.Loader(port)
|
||||
if self.rig.d.autobaud:
|
||||
loader.connect_autobaud(self.rig.d.wait)
|
||||
else:
|
||||
loader.connect(self.rig.d.wait)
|
||||
if loader.info.version < module.SEALED_LOADER:
|
||||
print(f" skip seal checks (loader is pureboot {loader.info.version})")
|
||||
return
|
||||
|
||||
head_of = lambda dmg: self._sealed(module, module.OP_WRITE, module.SP_SPM,
|
||||
info.base, module.SPM_ERASE, dmg)
|
||||
refused = 0
|
||||
attempts = 0
|
||||
for _ in range(rounds):
|
||||
for index in range(6):
|
||||
attempts += 1
|
||||
port.write(head_of((index, 0x01)))
|
||||
verdict = port.read_exact(1, 5.0)
|
||||
if verdict != module.NAK:
|
||||
self.check(f"damaged byte {index} refused", False,
|
||||
f"verdict {verdict.hex()}")
|
||||
return
|
||||
if port.read_exact(1, 5.0) != module.PROMPT:
|
||||
self.check(f"re-prompt after byte {index}", False, "no prompt")
|
||||
return
|
||||
refused += 1
|
||||
self.check("damaged headers refused", refused == attempts,
|
||||
f"{refused}/{attempts}, every header byte")
|
||||
self.check("session still in step", loader.identity().raw == info.raw)
|
||||
|
||||
# And the slot itself, read back over the link: the loader is the
|
||||
# thing that would have been erased, so its own account of its
|
||||
# first bytes is a real witness — an erased page reads all 0xff.
|
||||
head = loader.read_flash(info.base, 16)
|
||||
self.check("loader slot intact", set(head) != {0xFF}, head[:8].hex())
|
||||
except Exception as error: # noqa: BLE001 — a dead link is a result
|
||||
self.check("seal checks", False, str(error)[:70])
|
||||
finally:
|
||||
try:
|
||||
port.close()
|
||||
except Exception: # noqa: BLE001
|
||||
pass
|
||||
|
||||
@staticmethod
|
||||
def _sealed(module, op, space, address, count, damage=None):
|
||||
"""A sealed header, damaged after sealing — the shape a link fault has."""
|
||||
head = bytearray((op, module.selector(space, address), address & 0xFF,
|
||||
(address >> 8) & 0xFF, count & 0xFF))
|
||||
seal = module.SEAL
|
||||
for byte in head:
|
||||
seal ^= byte
|
||||
out = bytearray(head + bytes((seal,)))
|
||||
if damage:
|
||||
out[damage[0]] ^= damage[1]
|
||||
return bytes(out)
|
||||
|
||||
def refusals(self, info) -> None:
|
||||
# One word too many: a patched-vector part spends the slot's last word
|
||||
# on the trampoline, so its application stops two bytes short.
|
||||
@@ -200,7 +274,7 @@ class Suite:
|
||||
# ------------------------------------------------------------------- run
|
||||
|
||||
def run(self, app: pathlib.Path | None, loader_image: pathlib.Path | None,
|
||||
marker: str, marker_wait: float = 2.5) -> int:
|
||||
marker: str, marker_wait: float = 2.5, seal_rounds: int = 1) -> int:
|
||||
print("identity")
|
||||
info = self.identity()
|
||||
if info is None:
|
||||
@@ -220,8 +294,11 @@ class Suite:
|
||||
else:
|
||||
print("\nskip application checks (pass --app <image.hex>)")
|
||||
|
||||
print("\nerase and the write guard")
|
||||
self.erase_and_guard(info, loader_image)
|
||||
print("\nerase and the slot boundary")
|
||||
self.erase_and_slot(info, loader_image)
|
||||
|
||||
print("\nthe seal")
|
||||
self.seal(info, seal_rounds)
|
||||
|
||||
print("\nrefusals")
|
||||
self.refusals(info)
|
||||
@@ -240,6 +317,8 @@ def main(argv: list[str] | None = None) -> int:
|
||||
help="application image to flash (test/pbapp.cpp built for this deployment)")
|
||||
parser.add_argument("--loader", type=pathlib.Path,
|
||||
help="the resident loader's .bin, to prove the slot survives an erase")
|
||||
parser.add_argument("--seal-rounds", type=int, default=1,
|
||||
help="repeat the adversarial seal sweep N times (a lossy board's stress test)")
|
||||
parser.add_argument("--marker", default="",
|
||||
help="text the application emits when it runs, e.g. APP")
|
||||
parser.add_argument("--marker-wait", type=float, default=2.5,
|
||||
@@ -254,7 +333,7 @@ def main(argv: list[str] | None = None) -> int:
|
||||
print("this overwrites the application flash and EEPROM\n")
|
||||
with tempfile.TemporaryDirectory(prefix="pbhw-") as temporary:
|
||||
return Suite(rig, pathlib.Path(temporary)).run(args.app, args.loader, args.marker,
|
||||
args.marker_wait)
|
||||
args.marker_wait, args.seal_rounds)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
Reference in New Issue
Block a user