This is an archive of the discontinued LLVM Phabricator instance.

Differential D43954

[WebAssembly] Check function type indexes
ClosedPublic

Authored by ncw on Mar 1 2018, 9:55 AM.

Details

Reviewers
sbc100
sunfish
Commits
rG3b82510523f6: [WebAssembly] Check function type indexes
rL326577: [WebAssembly] Check function type indexes
Summary

Also update tests containing invalid Wasm files, exposed by the check

Split out of D43940 as requested

Diff Detail

Event Timeline

ncw created this revision.Mar 1 2018, 9:55 AM
Herald added subscribers: llvm-commits, aheejin, jgravelle-google and 2 others. · View Herald TranscriptMar 1 2018, 9:55 AM
sbc100 accepted this revision.Mar 1 2018, 9:12 PM
sbc100 added inline comments.
lib/Object/WasmObjectFile.cpp
775

Maybe just "Invalid function type"?

This revision is now accepted and ready to land.Mar 1 2018, 9:12 PM
Closed by commit rL326577: [WebAssembly] Check function type indexes (authored by ncw). · Explain WhyMar 2 2018, 6:37 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
Object/
7 lines
test/
ObjectYAML/
wasm/
5 lines
9 lines

Diff 136556

lib/Object/WasmObjectFile.cpp

Show First 20 Lines • Show All 762 Lines • ▼ Show 20 Lines if (Ptr != End)
return make_error<GenericBinaryError>("Import section ended prematurely", return make_error<GenericBinaryError>("Import section ended prematurely",
object_error::parse_failed); object_error::parse_failed);
return Error::success(); return Error::success();
} }
Error WasmObjectFile::parseFunctionSection(const uint8_t *Ptr, const uint8_t *End) { Error WasmObjectFile::parseFunctionSection(const uint8_t *Ptr, const uint8_t *End) {
uint32_t Count = readVaruint32(Ptr); uint32_t Count = readVaruint32(Ptr);
FunctionTypes.reserve(Count); FunctionTypes.reserve(Count);
uint32_t MaxType = Signatures.size();
while (Count--) { while (Count--) {
FunctionTypes.push_back(readVaruint32(Ptr)); uint32_t Type = readVaruint32(Ptr);
if (Type >= MaxType)
return make_error<GenericBinaryError>("Invalid function type index",
sbc100Unsubmitted
Not Done
ReplyInline Actions

Maybe just "Invalid function type"?

sbc100: Maybe just "Invalid function type"?
object_error::parse_failed);
FunctionTypes.push_back(Type);
} }
if (Ptr != End) if (Ptr != End)
return make_error<GenericBinaryError>("Function section ended prematurely", return make_error<GenericBinaryError>("Function section ended prematurely",
object_error::parse_failed); object_error::parse_failed);
return Error::success(); return Error::success();
} }
Error WasmObjectFile::parseTableSection(const uint8_t *Ptr, const uint8_t *End) { Error WasmObjectFile::parseTableSection(const uint8_t *Ptr, const uint8_t *End) {
▲ Show 20 Lines • Show All 509 Lines • Show Last 20 Lines

test/ObjectYAML/wasm/export_section.yaml

# RUN: yaml2obj %s | obj2yaml | FileCheck %s # RUN: yaml2obj %s | obj2yaml | FileCheck %s
--- !WASM --- !WASM
FileHeader: FileHeader:
Version: 0x00000001 Version: 0x00000001
Sections: Sections:
- Type: TYPE
Signatures:
- Index: 0
ReturnType: NORESULT
ParamTypes:
- Type: FUNCTION - Type: FUNCTION
FunctionTypes: [ 0, 0 ] FunctionTypes: [ 0, 0 ]
- Type: GLOBAL - Type: GLOBAL
Globals: Globals:
- Index: 0 - Index: 0
Type: I32 Type: I32
Mutable: false Mutable: false
InitExpr: InitExpr:
▲ Show 20 Lines • Show All 50 Lines • Show Last 20 Lines

test/ObjectYAML/wasm/function_section.yaml

# RUN: yaml2obj %s | obj2yaml | FileCheck %s # RUN: yaml2obj %s | obj2yaml | FileCheck %s
--- !WASM --- !WASM
FileHeader: FileHeader:
Version: 0x00000001 Version: 0x00000001
Sections: Sections:
- Type: TYPE
Signatures:
- Index: 0
ReturnType: NORESULT
ParamTypes:
- Index: 1
ReturnType: NORESULT
ParamTypes:
- I32
- Type: FUNCTION - Type: FUNCTION
FunctionTypes: [ 1, 0 ] FunctionTypes: [ 1, 0 ]
- Type: CODE - Type: CODE
Functions: Functions:
- Index: 0 - Index: 0
Locals: Locals:
Body: 0B Body: 0B
- Index: 1 - Index: 1
Show All 10 Lines