diff --git a/quest/m1/fuzz-findings/README.md b/quest/m1/fuzz-findings/README.md index 30e2a7d8848..e53ce9edbaa 100644 --- a/quest/m1/fuzz-findings/README.md +++ b/quest/m1/fuzz-findings/README.md @@ -36,7 +36,7 @@ fixed the MKV block-header panic; its input is ## Required -- [moq-mux on a fixed mp4-atom](/quest/m1/fuzz-findings/mp4-atom-bump.md) - waiting on a 0.17.x release containing kixelated/mp4-atom#264, then moq-mux bumps to it and commits the `sgpd` and `iref` regressions +- [moq-mux on a fixed mp4-atom](/quest/m1/fuzz-findings/mp4-atom-bump.md) - waiting on a 0.17.x release containing kixelated/mp4-atom#264 and #267, then moq-mux bumps to it and commits the `sgpd`, `iref` and `iloc` regressions - [SPS fields cannot overflow](/quest/m1/fuzz-findings/sps-overflow.md) - hostile H.264 and H.265 SPS crop and size fields are refused instead of wrapping -- [mp4-atom iloc is bounded](/quest/m1/fuzz-findings/mp4-atom-iloc.md) - zero-size `iloc` extents cannot allocate megabytes from a few bytes +- [mp4-atom iloc is bounded](/quest/m1/fuzz-findings/mp4-atom-iloc.md) - zero-size `iloc` extents cannot allocate megabytes from a few bytes; fixed upstream by kixelated/mp4-atom#267, finished by the mp4-atom bump - [A catalog update reuses its encoder](/quest/m1/fuzz-findings/catalog-encoder.md) - republishing a compressed catalog or HLS group stops allocating a fresh DEFLATE encoder (about 200 KB) each time diff --git a/quest/m1/fuzz-findings/mp4-atom-bump.md b/quest/m1/fuzz-findings/mp4-atom-bump.md index 5f57fb053a0..aaf79e1397a 100644 --- a/quest/m1/fuzz-findings/mp4-atom-bump.md +++ b/quest/m1/fuzz-findings/mp4-atom-bump.md @@ -3,26 +3,37 @@ ## Goal moq-mux depends on an mp4-atom release with the `sgpd` entry-count bound -from [kixelated/mp4-atom#264](https://github.com/kixelated/mp4-atom/pull/264), -so the 22-byte init that grows a Vec past 3 GB in 0.17.0 fails to decode. -The `cmaf` and `fmp4` targets' `sgpd` and `iref` inputs are committed under +from [kixelated/mp4-atom#264](https://github.com/kixelated/mp4-atom/pull/264) +and the `iloc` zero-size extent bound from +[kixelated/mp4-atom#267](https://github.com/kixelated/mp4-atom/pull/267), so +the 22-byte init that grows a Vec past 3 GB and the 31 bytes of `iloc` that +allocate about 6 MB in 0.17.0 fail to decode. The `cmaf` and `fmp4` targets' +`sgpd`, `iref` and `iloc` inputs are committed under `rs/moq-mux/fuzz/regressions/`. ## Plan #264 merged on 2026-10-30 as kixelated/mp4-atom@06a532aabe47ea108343557fec4cf6c646c2a980, after 0.17.0 -was published, so 0.17.0 lacks it. +was published, so 0.17.0 lacks it. #267 merged on 2026-11-03 as +kixelated/mp4-atom@2f1936206579b4c64d1d90538989246044e42ed6; the pending +release PR [kixelated/mp4-atom#260](https://github.com/kixelated/mp4-atom/pull/260) +picks up both. moq-mux is already on 0.17.0 ([moq-dev/moq#7308](https://github.com/moq-dev/moq/pull/7308)), which fixes the `meta/iref.rs` subtract overflow (kixelated/mp4-atom#219), so what remains -is a move within 0.17 and the regression inputs. If the -[iloc fix](/quest/m1/fuzz-findings/mp4-atom-iloc.md) merges before the -release, the same bump covers it. +is a move within 0.17 and the regression inputs. The `iloc` input is the +31-byte `cmaf` one from +[moq-dev/moq#7313's comment](https://github.com/moq-dev/moq/pull/7313#issuecomment-6520535160) +(`AB0AAAAcaWxvYwAAcwAAACAAyP////8AAAD///8AAA==`), committed as +`rs/moq-mux/fuzz/regressions/cmaf/mp4-atom-iloc`; on 0.17.0 the replay +reports 6,291,464 bytes allocated, and with #267 it passes. This quest's PR +also completes the [iloc quest](/quest/m1/fuzz-findings/mp4-atom-iloc.md) and +deletes it. Public API: none expected in moq-mux. Wire: none. ## Waiting -- Maintainer: cut an mp4-atom 0.17.x release that contains kixelated/mp4-atom@06a532aabe47ea108343557fec4cf6c646c2a980 (agents do not cut it); check that crates.io's latest mp4-atom is above 0.17.0 and that its tag contains that commit +- Maintainer: cut an mp4-atom 0.17.x release that contains kixelated/mp4-atom@06a532aabe47ea108343557fec4cf6c646c2a980 and kixelated/mp4-atom@2f1936206579b4c64d1d90538989246044e42ed6 (agents do not cut it); check that crates.io's latest mp4-atom is above 0.17.0 and that its tag contains both commits diff --git a/quest/m1/fuzz-findings/mp4-atom-iloc.md b/quest/m1/fuzz-findings/mp4-atom-iloc.md index a91e56f1183..3a00dd0b3ad 100644 --- a/quest/m1/fuzz-findings/mp4-atom-iloc.md +++ b/quest/m1/fuzz-findings/mp4-atom-iloc.md @@ -1,4 +1,4 @@ -# [S] mp4-atom iloc is bounded +# [XS] mp4-atom iloc is bounded ## Goal @@ -7,21 +7,27 @@ target, 31 bytes of `iloc` no longer allocate about 6 MB. ## Plan -`src/meta/iloc.rs` decodes `extent_count` extents per item. When the +`src/meta/iloc.rs` decoded `extent_count` extents per item. When the offset, length and index sizes are all 0, each extent consumes no input, so -every 6-byte item can push 65,535 extents (about 1.5 MB), and the item count -repeats that. +every 6-byte item could push 65,535 extents (about 1.5 MB), and the item +count repeated that. -Fix it in [kixelated/mp4-atom](https://github.com/kixelated/mp4-atom), as -[#264](https://github.com/kixelated/mp4-atom/pull/264) did for `sgpd`. A -plain count-versus-remaining-bytes check, which `sgpd` and `evte` use, would -refuse a valid single zero-size extent at the end of the box. Instead, decode -fails on a zero-size extent (one that takes no bytes of the box) after an -item's first extent, so a valid single zero-size extent still decodes -(decided 2026-10-30, maintainer). The fix does not cut a release. +[kixelated/mp4-atom#267](https://github.com/kixelated/mp4-atom/pull/267) +fixed it, merging on 2026-11-03 as +kixelated/mp4-atom@2f1936206579b4c64d1d90538989246044e42ed6: decode fails +with `OutOfBounds` on a zero-size extent after an item's first extent, so a +valid single zero-size extent still decodes (decided 2026-10-30, +maintainer). The pending release PR +[kixelated/mp4-atom#260](https://github.com/kixelated/mp4-atom/pull/260) +picks it up. -Then bump moq-mux with the -[mp4-atom bump](/quest/m1/fuzz-findings/mp4-atom-bump.md), or its own bump if -that has landed, and commit the input under `rs/moq-mux/fuzz/regressions/`. +What remains is moq-mux's move to that release and the 31-byte `cmaf` +regression input, both tracked in the +[mp4-atom bump](/quest/m1/fuzz-findings/mp4-atom-bump.md); its PR completes +this quest and deletes this file. Public API: none expected in moq-mux. Wire: none. + +## Waiting + +- Maintainer: cut an mp4-atom 0.17.x release that contains kixelated/mp4-atom@2f1936206579b4c64d1d90538989246044e42ed6 (agents do not cut it); check that crates.io's latest mp4-atom is above 0.17.0 and that its tag contains that commit