diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-05 14:55:48 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-05 14:55:48 +0000 |
| commit | 8e1f28001c134b7e34912dfcefa710f27f8594d0 (patch) | |
| tree | ff52905359cc3119eefdfdfd89ff245124845a77 | |
| parent | dea1d8917ebed798e9c04fe5c24a62ccd6a7988e (diff) | |
| parent | cd6b038e799ea13120e9676e0f1b23cdda4223db (diff) | |
| download | extras-8e1f28001c134b7e34912dfcefa710f27f8594d0.tar.gz | |
Snap for 8545515 from cd6b038e799ea13120e9676e0f1b23cdda4223db to mainline-adservices-release
Change-Id: I23e7dfdc624be9333cb8d4b594b36d50f5a8e91b
| -rw-r--r-- | simpleperf/OfflineUnwinder.cpp | 3 | ||||
| -rw-r--r-- | simpleperf/OfflineUnwinder.h | 5 | ||||
| -rw-r--r-- | tests/kernel.config/AndroidTest.xml | 2 | ||||
| -rw-r--r-- | verity/build_verity_metadata.py | 8 |
4 files changed, 12 insertions, 6 deletions
diff --git a/simpleperf/OfflineUnwinder.cpp b/simpleperf/OfflineUnwinder.cpp index f611ef4d..bbc488b4 100644 --- a/simpleperf/OfflineUnwinder.cpp +++ b/simpleperf/OfflineUnwinder.cpp @@ -66,6 +66,9 @@ CHECK_ERROR_CODE(ERROR_INVALID_ELF); CHECK_ERROR_CODE(ERROR_THREAD_DOES_NOT_EXIST); CHECK_ERROR_CODE(ERROR_THREAD_TIMEOUT); CHECK_ERROR_CODE(ERROR_SYSTEM_CALL); +CHECK_ERROR_CODE(ERROR_BAD_ARCH); +CHECK_ERROR_CODE(ERROR_MAPS_PARSE); +CHECK_ERROR_CODE(ERROR_INVALID_PARAMETER); CHECK_ERROR_CODE(ERROR_MAX); // Max frames seen so far is 463, in http://b/110923759. diff --git a/simpleperf/OfflineUnwinder.h b/simpleperf/OfflineUnwinder.h index b6445577..9eb9e8ff 100644 --- a/simpleperf/OfflineUnwinder.h +++ b/simpleperf/OfflineUnwinder.h @@ -39,7 +39,10 @@ enum UnwindStackErrorCode : uint8_t { // not exist. ERROR_THREAD_TIMEOUT, // Timeout trying to unwind a local thread. ERROR_SYSTEM_CALL, // System call failed while unwinding. - ERROR_MAX = ERROR_SYSTEM_CALL, + ERROR_BAD_ARCH, // Arch invalid (none, or mismatched). + ERROR_MAPS_PARSE, // Failed to parse maps data. + ERROR_INVALID_PARAMETER, // Invalid parameter passed to function. + ERROR_MAX = ERROR_INVALID_PARAMETER, }; struct UnwindingResult { diff --git a/tests/kernel.config/AndroidTest.xml b/tests/kernel.config/AndroidTest.xml index 19da90af..78452e1c 100644 --- a/tests/kernel.config/AndroidTest.xml +++ b/tests/kernel.config/AndroidTest.xml @@ -26,7 +26,7 @@ </target_preparer> <!-- Make sure there is some data in the pstore then reboot --> <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer"> - <option name="run-command" value="echo HELLOWORLD >/dev/pmsg0" /> + <option name="run-command" value="if [ -e /dev/pmsg0 ] ; then echo HELLOWORLD > /dev/pmsg0; fi" /> <option name="throw-if-cmd-fail" value="true" /> </target_preparer> <target_preparer class="com.android.tradefed.targetprep.RebootTargetPreparer" /> diff --git a/verity/build_verity_metadata.py b/verity/build_verity_metadata.py index 52388716..a428f270 100644 --- a/verity/build_verity_metadata.py +++ b/verity/build_verity_metadata.py @@ -43,12 +43,12 @@ def build_metadata_block(verity_table, signature, verity_disable=False): magic = MAGIC_DISABLE if verity_disable else MAGIC_NUMBER block = struct.pack("II256sI", magic, VERSION, signature, table_len) block += verity_table - block = block.ljust(METADATA_SIZE, '\x00') + block = block.ljust(METADATA_SIZE, b'\x00') return block def sign_verity_table(table, signer_path, key_path, signer_args=None): - with tempfile.NamedTemporaryFile(suffix='.table') as table_file: - with tempfile.NamedTemporaryFile(suffix='.sig') as signature_file: + with tempfile.NamedTemporaryFile(mode='wb', suffix='.table') as table_file: + with tempfile.NamedTemporaryFile(mode='rb', suffix='.sig') as signature_file: table_file.write(table) table_file.flush() if signer_args is None: @@ -70,7 +70,7 @@ def build_verity_table(block_device, data_blocks, root_hash, salt): data_blocks, root_hash, salt) - return table + return table.encode() def build_verity_metadata(data_blocks, metadata_image, root_hash, salt, block_device, signer_path, signing_key, signer_args=None, |