ppapi/native_client/src/trusted/plugin/json_manifest.cc - Issue 177113009: Support non-SFI mode in NaCl manifest file.

Unified Diff: ppapi/native_client/src/trusted/plugin/json_manifest.cc

Issue 177113009: Support non-SFI mode in NaCl manifest file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« ppapi/api/private/ppb_nacl_private.idl ('K') | « ppapi/native_client/src/trusted/plugin/json_manifest.h ('k') | ppapi/native_client/src/trusted/plugin/manifest.h » ('j') | ppapi/native_client/src/trusted/plugin/service_runtime.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ppapi/native_client/src/trusted/plugin/json_manifest.cc

diff --git a/ppapi/native_client/src/trusted/plugin/json_manifest.cc b/ppapi/native_client/src/trusted/plugin/json_manifest.cc

index be9b01b88c63425a2890b24ded776873f0a928d9..2a1871d1b7015e1d68fe00abdb8101004238195a 100644

--- a/ppapi/native_client/src/trusted/plugin/json_manifest.cc

+++ b/ppapi/native_client/src/trusted/plugin/json_manifest.cc

@@ -32,8 +32,11 @@ const char* const kFilesKey = "files";

// ISA Dictionary keys

const char* const kX8632Key = "x86-32";

+const char* const kX8632NonSFIKey = "x86-32-nonsfi";

const char* const kX8664Key = "x86-64";

+const char* const kX8664NonSFIKey = "x86-64-nonsfi";

const char* const kArmKey = "arm";

+const char* const kArmNonSFIKey = "arm-nonsfi";

const char* const kPortableKey = "portable";

// Url Resolution keys

@@ -89,6 +92,11 @@ const char* const kOptLevelKey = "optlevel";

// }

+// Returns the key for the architecture in non-SFI mode.

+std::string GetNonSFIKey(const std::string& sandbox_isa) {

+ return sandbox_isa + "-nonsfi";

// Looks up |property_name| in the vector |valid_names| with length

// |valid_name_count|. Returns true if |property_name| is found.

bool FindMatchingProperty(const nacl::string& property_name,

@@ -250,6 +258,7 @@ bool IsValidISADictionary(const Json::Value& dictionary,

const nacl::string& parent_key,

const nacl::string& sandbox_isa,

bool must_find_matching_entry,

+ bool nonsfi_enabled,

ErrorInfo* error_info) {

if (error_info == NULL) return false;

@@ -274,8 +283,11 @@ bool IsValidISADictionary(const Json::Value& dictionary,

// The known values for NaCl ISA dictionaries in the manifest.

static const char* kNaClManifestISAProperties[] = {

kX8632Key,

+ kX8632NonSFIKey,

kX8664Key,

+ kX8664NonSFIKey,

kArmKey,

+ kArmNonSFIKey,

// "portable" is here to allow checking that, if present, it can

// only refer to an URL, such as for a data file, and not to

// "pnacl-translate", which would cause the creation of a nexe.

@@ -343,9 +355,11 @@ bool IsValidISADictionary(const Json::Value& dictionary,

// TODO(elijahtaylor) add ISA resolver here if we expand ISAs to include

// micro-architectures that can resolve to multiple valid sandboxes.

bool has_isa = dictionary.isMember(sandbox_isa);

+ bool has_nonsfi_isa =

+ nonsfi_enabled && dictionary.isMember(GetNonSFIKey(sandbox_isa));

bool has_portable = dictionary.isMember(kPortableKey);

- if (!has_isa && !has_portable) {

+ if (!has_isa && !has_nonsfi_isa && !has_portable) {

error_info->SetReport(

PP_NACL_ERROR_MANIFEST_PROGRAM_MISSING_ARCH,

nacl::string("manifest: no version of ") + parent_key +

@@ -428,6 +442,7 @@ bool JsonManifest::MatchesSchema(ErrorInfo* error_info) {

kProgramKey,

sandbox_isa_,

true,

+ nonsfi_enabled_,

error_info)) {

return false;

}

@@ -440,6 +455,7 @@ bool JsonManifest::MatchesSchema(ErrorInfo* error_info) {

kInterpreterKey,

sandbox_isa_,

true,

+ nonsfi_enabled_,

error_info)) {

return false;

}

@@ -463,6 +479,7 @@ bool JsonManifest::MatchesSchema(ErrorInfo* error_info) {

file_name,

sandbox_isa_,

false,

+ nonsfi_enabled_,

error_info)) {

return false;

}

@@ -476,13 +493,14 @@ bool JsonManifest::GetURLFromISADictionary(const Json::Value& dictionary,

const nacl::string& parent_key,

nacl::string* url,

PnaclOptions* pnacl_options,

+ bool* nonsfi_enabled,

Mark Seaborn 2014/02/27 17:10:22 This is very close to "nonsfi_enabled_", so it wou

hidehiko 2014/02/28 06:41:54 Done.

ErrorInfo* error_info) const {

DCHECK(url != NULL && pnacl_options != NULL && error_info != NULL);

// When the application actually requests a resolved URL, we must have

// a matching entry (sandbox_isa_ or portable) for NaCl.

if (!IsValidISADictionary(dictionary, parent_key, sandbox_isa_, true,

- error_info)) {

+ nonsfi_enabled_, error_info)) {

error_info->SetReport(PP_NACL_ERROR_MANIFEST_RESOLVE_URL,

"architecture " + sandbox_isa_ +

" is not found for file " + parent_key);

@@ -495,11 +513,20 @@ bool JsonManifest::GetURLFromISADictionary(const Json::Value& dictionary,

// sandbox_isa_ or kPortableKey is present in the dictionary.

bool has_portable = dictionary.isMember(kPortableKey);

bool has_isa = dictionary.isMember(sandbox_isa_);

+ // True iff the non-SFI mode is enabled, and the nmf as the -nonsfi entry.

+ bool has_nonsfi_isa =

+ nonsfi_enabled_ && dictionary.isMember(GetNonSFIKey(sandbox_isa_));

nacl::string chosen_isa;

- if ((sandbox_isa_ == kPortableKey) || (has_portable && !has_isa)) {

+ if ((sandbox_isa_ == kPortableKey) ||

+ (has_portable && !has_isa && !has_nonsfi_isa)) {

chosen_isa = kPortableKey;

} else {

- chosen_isa = sandbox_isa_;

+ // Choose non-SFI iff available.

+ if (has_nonsfi_isa) {

+ chosen_isa = GetNonSFIKey(sandbox_isa_);

+ } else {

+ chosen_isa = sandbox_isa_;

+ }

}

const Json::Value& isa_spec = dictionary[chosen_isa];

// Check if this requires a pnacl-translate, otherwise just grab the URL.

@@ -508,10 +535,14 @@ bool JsonManifest::GetURLFromISADictionary(const Json::Value& dictionary,

// PNaCl

GrabUrlAndPnaclOptions(isa_spec[kPnaclTranslateKey], url, pnacl_options);

pnacl_options->set_translate(true);

+ if (nonsfi_enabled)

Mark Seaborn 2014/02/27 17:10:22 It might be a little simpler to require the caller

hidehiko 2014/02/28 06:41:54 Done.

+ *nonsfi_enabled = false;

} else {

// NaCl

*url = isa_spec[kUrlKey].asString();

pnacl_options->set_translate(false);

+ if (nonsfi_enabled)

+ *nonsfi_enabled = has_nonsfi_isa;

}

return true;

@@ -531,7 +562,7 @@ bool JsonManifest::GetKeyUrl(const Json::Value& dictionary,

const Json::Value& isa_dict = dictionary[key];

nacl::string relative_url;

if (!GetURLFromISADictionary(isa_dict, key, &relative_url,

- pnacl_options, error_info)) {

+ pnacl_options, NULL, error_info)) {

return false;

}

return ResolveURL(relative_url, full_url, error_info);

@@ -559,11 +590,12 @@ bool JsonManifest::ResolveURL(const nacl::string& relative_url,

bool JsonManifest::GetProgramURL(nacl::string* full_url,

PnaclOptions* pnacl_options,

+ bool* nonsfi_enabled,

ErrorInfo* error_info) const {

if (full_url == NULL || pnacl_options == NULL || error_info == NULL)

return false;

- Json::Value program = dictionary_[kProgramKey];

+ const Json::Value& program = dictionary_[kProgramKey];

nacl::string nexe_url;

nacl::string error_string;

@@ -572,6 +604,7 @@ bool JsonManifest::GetProgramURL(nacl::string* full_url,

kProgramKey,

&nexe_url,

pnacl_options,

+ nonsfi_enabled,

error_info)) {

return false;

}