Use BytecodeUtil in getAbiVersion on WasmVm except NullVm

Signed-off-by: Takeshi Yoneda <[email protected]>

Author: mathetake

src/common/bytecode_util.cc

@@ -77,7 +77,7 @@ bool BytecodeUtil::getAbiVersion(std::string_view bytecode, proxy_wasm::AbiVersi
           return false;
         }
       }
-      return false;
+      return true;
     } else {
       pos += section_len;
     }

src/v8/v8.cc

@@ -123,6 +123,7 @@ class V8 : public WasmVm {
   std::unordered_map<std::string, FuncDataPtr> host_functions_;
   std::unordered_map<std::string, wasm::own<wasm::Func>> module_functions_;
 
+  AbiVersion abi_version_;
   std::unordered_map<uint32_t, std::string> function_names_index_;
 };
 
@@ -259,6 +260,12 @@ bool V8::load(const std::string &code, bool allow_precompiled) {
     return false;
   }
 
+  // Get ABI version from bytecode.
+  if (!common::BytecodeUtil::getAbiVersion(code, abi_version_)) {
+    fail(FailState::UnableToInitializeCode, "Failed to parse corrupted Wasm module");
+    return false;
+  }
+
   if (allow_precompiled) {
     const auto section_name = getPrecompiledSectionName();
     if (!section_name.empty()) {
@@ -290,7 +297,7 @@ bool V8::load(const std::string &code, bool allow_precompiled) {
     wasm::vec<byte_t> code_vec = wasm::vec<byte_t>::invalid();
     if (stripped.empty()) {
       // Use the original bytecode.
-      code_vec = wasm::vec<byte_t>::make(code.size(), code.data());
+      code_vec = wasm::vec<byte_t>::make(code.size(), (char *)(code.data()));
     } else {
       // Othewise use the stripped bytecode.
       code_vec = wasm::vec<byte_t>::make(stripped.size(), stripped.data());
@@ -340,25 +347,7 @@ std::string_view V8::getPrecompiledSectionName() {
   return name;
 }
 
-AbiVersion V8::getAbiVersion() {
-  assert(module_ != nullptr);
-
-  const auto export_types = module_.get()->exports();
-  for (size_t i = 0; i < export_types.size(); i++) {
-    if (export_types[i]->type()->kind() == wasm::EXTERN_FUNC) {
-      std::string_view name(export_types[i]->name().get(), export_types[i]->name().size());
-      if (name == "proxy_abi_version_0_1_0") {
-        return AbiVersion::ProxyWasm_0_1_0;
-      } else if (name == "proxy_abi_version_0_2_0") {
-        return AbiVersion::ProxyWasm_0_2_0;
-      } else if (name == "proxy_abi_version_0_2_1") {
-        return AbiVersion::ProxyWasm_0_2_1;
-      }
-    }
-  }
-
-  return AbiVersion::Unknown;
-}
+AbiVersion V8::getAbiVersion() { return abi_version_; }
 
 bool V8::link(std::string_view debug_name) {
   assert(module_ != nullptr);

src/wasmtime/wasmtime.cc

@@ -103,12 +103,13 @@ class Wasmtime : public WasmVm {
   WasmModulePtr module_;
   WasmSharedModulePtr shared_module_;
   WasmInstancePtr instance_;
-
   WasmMemoryPtr memory_;
   WasmTablePtr table_;
 
   std::unordered_map<std::string, HostFuncDataPtr> host_functions_;
   std::unordered_map<std::string, WasmFuncPtr> module_functions_;
+
+  AbiVersion abi_version_;
 };
 
 bool Wasmtime::load(const std::string &code, bool allow_precompiled) {
@@ -119,6 +120,12 @@ bool Wasmtime::load(const std::string &code, bool allow_precompiled) {
     return false;
   }
 
+  // Get ABI version from bytecode.
+  if (!common::BytecodeUtil::getAbiVersion(code, abi_version_)) {
+    fail(FailState::UnableToInitializeCode, "Failed to parse corrupted Wasm module");
+    return false;
+  }
+
   std::string stripped_vec;
   if (!common::BytecodeUtil::getStrippedSource(code, stripped_vec)) {
     fail(FailState::UnableToInitializeCode, "Failed to parse corrupted Wasm module");
@@ -645,27 +652,7 @@ void Wasmtime::getModuleFunctionImpl(std::string_view function_name,
   };
 };
 
-AbiVersion Wasmtime::getAbiVersion() {
-  assert(module_ != nullptr);
-  WasmExportTypeVec export_types;
-  wasm_module_exports(module_.get(), export_types.get());
-
-  for (size_t i = 0; i < export_types.get()->size; i++) {
-    const wasm_externtype_t *exp_extern_type = wasm_exporttype_type(export_types.get()->data[i]);
-    if (wasm_externtype_kind(exp_extern_type) == WASM_EXTERN_FUNC) {
-      const wasm_name_t *name_ptr = wasm_exporttype_name(export_types.get()->data[i]);
-      std::string_view name(name_ptr->data, name_ptr->size);
-      if (name == "proxy_abi_version_0_1_0") {
-        return AbiVersion::ProxyWasm_0_1_0;
-      } else if (name == "proxy_abi_version_0_2_0") {
-        return AbiVersion::ProxyWasm_0_2_0;
-      } else if (name == "proxy_abi_version_0_2_1") {
-        return AbiVersion::ProxyWasm_0_2_1;
-      }
-    }
-  }
-  return AbiVersion::Unknown;
-}
+AbiVersion Wasmtime::getAbiVersion() { return abi_version_; }
 
 } // namespace wasmtime
 

src/wavm/wavm.cc

@@ -302,7 +302,13 @@ bool Wavm::load(const std::string &code, bool allow_precompiled) {
   if (!loadModule(code, ir_module_)) {
     return false;
   }
-  getAbiVersion(); // Cache ABI version.
+
+  // Get ABI version from bytecode.
+  if (!common::BytecodeUtil::getAbiVersion(code, abi_version_)) {
+    fail(FailState::UnableToInitializeCode, "Failed to parse corrupted Wasm module");
+    return false;
+  }
+
   std::string_view precompiled = {};
   if (allow_precompiled) {
     if (!common::BytecodeUtil::getCustomSection(code, getPrecompiledSectionName(), precompiled)) {
@@ -319,26 +325,7 @@ bool Wavm::load(const std::string &code, bool allow_precompiled) {
   return true;
 }
 
-AbiVersion Wavm::getAbiVersion() {
-  if (abi_version_ != AbiVersion::Unknown) {
-    return abi_version_;
-  }
-  for (auto &e : ir_module_.exports) {
-    if (e.name == "proxy_abi_version_0_1_0") {
-      abi_version_ = AbiVersion::ProxyWasm_0_1_0;
-      return abi_version_;
-    }
-    if (e.name == "proxy_abi_version_0_2_0") {
-      abi_version_ = AbiVersion::ProxyWasm_0_2_0;
-      return abi_version_;
-    }
-    if (e.name == "proxy_abi_version_0_2_1") {
-      abi_version_ = AbiVersion::ProxyWasm_0_2_1;
-      return abi_version_;
-    }
-  }
-  return AbiVersion::Unknown;
-}
+AbiVersion Wavm::getAbiVersion() { return abi_version_; }
 
 bool Wavm::link(std::string_view debug_name) {
   RootResolver rootResolver(compartment_, this);