Fix fail-open ZIP iteration in _iterate_models (BadZipFile bypass)#355
Open
AAtomical wants to merge 1 commit into
Open
Fix fail-open ZIP iteration in _iterate_models (BadZipFile bypass)#355AAtomical wants to merge 1 commit into
AAtomical wants to merge 1 commit into
Conversation
_iterate_models() wrapped the entire inner-ZIP entry loop in a single `except (zipfile.BadZipFile, RuntimeError)`. If any one entry raised BadZipFile on `zip.open()` (e.g. a corrupted local file header), the exception aborted enumeration of the whole archive: every entry after the bad one was silently dropped and never scanned. A crafted archive can exploit this by placing a corrupted entry before `archive/data.pkl` in the namelist. modelscan aborts on the corrupted entry and reports 0 issues (CLEAN), while a consumer (`torch.load` / `pickle.load`) reads `archive/data.pkl` directly by name from the intact central directory and executes the malicious pickle -> RCE. Move the per-entry handling into its own try/except so a single unreadable entry is recorded as skipped (with its source) and iteration continues to the remaining entries. The outer handler is kept for an archive whose central directory itself is unreadable. Fixes protectai#354
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
_iterate_models() wrapped the entire inner-ZIP entry loop in a single
except (zipfile.BadZipFile, RuntimeError). If any one entry raised BadZipFile onzip.open()(e.g. a corrupted local file header), the exception aborted enumeration of the whole archive: every entry after the bad one was silently dropped and never scanned.A crafted archive can exploit this by placing a corrupted entry before
archive/data.pklin the namelist. modelscan aborts on the corrupted entry and reports 0 issues (CLEAN), while a consumer (torch.load/pickle.load) readsarchive/data.pkldirectly by name from the intact central directory and executes the malicious pickle -> RCE.Move the per-entry handling into its own try/except so a single unreadable entry is recorded as skipped (with its source) and iteration continues to the remaining entries. The outer handler is kept for an archive whose central directory itself is unreadable.
Fixes #354