tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Prevent mte_upgrade_test from hanging if MTE is disabled" into main am: 53748d08e5

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3086860

Change-Id: I2f7c720783e1e620f735da62927ba41bbdd60c46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Florian Mayer 2024-05-15 18:12:04 +00:00 committed by Automerger Merge Worker
commit 6654e8f2d0
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
init/test_upgrade_mte/mte_upgrade_test_helper.cpp
View file

@ -22,6 +22,7 @@
#include <sys/prctl.h>
#include <time.h>
#include <unistd.h>
#include <memory>
int MaybeDowngrade() {
@ -65,7 +66,5 @@ int main(int argc, char** argv) {
// This binary gets run by src/com/android/tests/init/MteUpgradeTest.java, which
// asserts that it crashes as expected.
f[17] = 'x';
char buf[1];
read(1, buf, 1);
return 0;
}