maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[WebAssembly] Validate exports when parsing object files 

Subscribers: jfb, dschuff, jgravelle-google, aheejin

Differential Revision: https://reviews.llvm.org/D37358

llvm-svn: 312286
This commit is contained in:
Sam Clegg 2017-08-31 21:43:45 +00:00
parent 67419e3947
commit a3b9fe6acd
6 changed files with 75 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/include/llvm/Object/Wasm.h
View File

@ -221,6 +221,8 @@ private:
uint32_t StartFunction = -1;
bool HasLinkingSection = false;
wasm::WasmLinkingData LinkingData;
uint32_t NumImportedGlobals = 0;
uint32_t NumImportedFunctions = 0;
StringMap<uint32_t> SymbolMap;
};

8
llvm/lib/Object/WasmObjectFile.cpp
View File

@ -472,6 +472,7 @@ Error WasmObjectFile::parseImportSection(const uint8_t *Ptr, const uint8_t *End)
Im.Kind = readUint8(Ptr);
switch (Im.Kind) {
case wasm::WASM_EXTERNAL_FUNCTION:
NumImportedFunctions++;
Im.SigIndex = readVaruint32(Ptr);
SymbolMap.try_emplace(Im.Field, Symbols.size());
Symbols.emplace_back(Im.Field, WasmSymbol::SymbolType::FUNCTION_IMPORT,
@ -480,6 +481,7 @@ Error WasmObjectFile::parseImportSection(const uint8_t *Ptr, const uint8_t *End)
<< " sym index:" << Symbols.size() << "\n");
break;
case wasm::WASM_EXTERNAL_GLOBAL:
NumImportedGlobals++;
Im.Global.Type = readVarint7(Ptr);
Im.Global.Mutable = readVaruint1(Ptr);
SymbolMap.try_emplace(Im.Field, Symbols.size());
@ -580,10 +582,16 @@ Error WasmObjectFile::parseExportSection(const uint8_t *Ptr, const uint8_t *End)
switch (Ex.Kind) {
case wasm::WASM_EXTERNAL_FUNCTION:
ExportType = WasmSymbol::SymbolType::FUNCTION_EXPORT;
if (Ex.Index >= FunctionTypes.size() + NumImportedFunctions)
return make_error<GenericBinaryError>("Invalid function export",
object_error::parse_failed);
MakeSymbol = true;
break;
case wasm::WASM_EXTERNAL_GLOBAL:
ExportType = WasmSymbol::SymbolType::GLOBAL_EXPORT;
if (Ex.Index >= Globals.size() + NumImportedGlobals)
return make_error<GenericBinaryError>("Invalid global export",
object_error::parse_failed);
MakeSymbol = true;
break;
case wasm::WASM_EXTERNAL_MEMORY:

14
llvm/test/ObjectYAML/wasm/export_section.yaml
View File

@ -3,6 +3,20 @@
FileHeader:
Version: 0x00000001
Sections:
- Type: FUNCTION
FunctionTypes: [ 0, 0 ]
- Type: GLOBAL
Globals:
- Type: I32
Mutable: false
InitExpr:
Opcode: I64_CONST
Value: 32
- Type: I32
Mutable: false
InitExpr:
Opcode: I64_CONST
Value: 64
- Type: EXPORT
Exports:
- Name: function_export

13
llvm/test/ObjectYAML/wasm/invalid_export.yaml Normal file
View File

@ -0,0 +1,13 @@
# RUN: yaml2obj < %s | not obj2yaml 2>&1 | FileCheck %s
--- !WASM
FileHeader:
Version: 0x00000001
Sections:
- Type: EXPORT
Exports:
- Name: invalid_function_index
Kind: FUNCTION
Index: 0x00000001
# CHECK: Error reading file: <stdin>: Invalid function export

19
llvm/test/tools/llvm-nm/wasm/exports.yaml
View File

@ -12,6 +12,25 @@ Sections:
- ReturnType: I32
ParamTypes:
- I32
- Type: FUNCTION
FunctionTypes: [ 0, 0, 0, 0, 0 ]
- Type: GLOBAL
Globals:
- Type: I32
Mutable: false
InitExpr:
Opcode: I64_CONST
Value: 32
- Type: I32
Mutable: false
InitExpr:
Opcode: I64_CONST
Value: 64
- Type: I32
Mutable: false
InitExpr:
Opcode: I64_CONST
Value: 1024
- Type: EXPORT
Exports:
- Name: foo

19
llvm/test/tools/llvm-nm/wasm/weak-symbols.yaml
View File

@ -12,6 +12,8 @@ Sections:
- ReturnType: I32
ParamTypes:
- I32
- Type: FUNCTION
FunctionTypes: [ 0, 0, 0, 0 ]
- Type: IMPORT
Imports:
- Module: env
@ -23,6 +25,23 @@ Sections:
Kind: GLOBAL
GlobalType: I32
GlobalMutable: false
- Type: GLOBAL
Globals:
- Type: I32
Mutable: false
InitExpr:
Opcode: I64_CONST
Value: 32
- Type: I32
Mutable: false
InitExpr:
Opcode: I64_CONST
Value: 64
- Type: I32
Mutable: false
InitExpr:
Opcode: I64_CONST
Value: 1024
- Type: EXPORT
Exports:
- Name: weak_global_func