embeddedfs/vmdk: cap stream marker data size and footer sector count to prevent OOM#1998
Open
adilburaksen wants to merge 1 commit intogoogle:mainfrom
Open
Conversation
|
Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). View this failed invocation of the CLA check for more information. For the most up to date status, view the checks section at the bottom of the pull request. |
Author
|
/gcbcla check |
6d6e74f to
1559876
Compare
Author
|
Hi! Just a friendly ping — all CI checks are passing. Happy to address any review feedback whenever you get a chance. Thanks for your time! |
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
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.
Summary
Two unchecked allocations in the stream-optimized VMDK parser allow a crafted
file to exhaust process memory.
Bug 1: — unchecked uint32
allocates
make([]byte, size)wheresizeis auint32field read directly from the untrusted marker header.Craft: 1036-byte VMDK with stream marker
size = 0xffffffff.Effect: 4 GB heap allocation. The function returns nil (silent OOM)
because the subsequent
io.ReadFullreturnsio.EOFwhich the callertreats as end-of-stream.
Confirmed live:
Bug 2: FOOTER marker — unchecked
val * SectorSizeallocationThe
case 3 (FOOTER)handler allocatesmake([]byte, int64(val*SectorSize))wherevalis auint64sector count from the marker header — no bounds check.
Craft: set
val = 0x100000(1M sectors × 512 = 512 MB).Confirmed live: TotalAlloc delta ~512 MB.
Fix
const maxMarkerDataBytes = 64 << 20(64 MB) guard inreadStreamMarkerbeforemake([]byte, size).const maxFooterSectors = 4guard in the FOOTER switch casebefore
make([]byte, val*SectorSize). Footer headers are always512 bytes (1 sector); 4 sectors is generous.
Tests
TestConvertVMDKStreamMarkerSizeRejected: 1036-byte bomb, expectserror + TotalAlloc delta < 50 MB.
TestConvertVMDKFooterSectorCountRejected: 1040-byte FOOTER bomb,expects error + TotalAlloc delta < 50 MB.
All existing VMDK tests continue to pass.