diff options
author | Florian Mayer <fmayer@google.com> | 2024-05-14 17:35:15 -0700 |
---|---|---|
committer | Florian Mayer <fmayer@google.com> | 2024-05-15 16:04:43 +0000 |
commit | 1277bd4dfdd85b05fb864ce0c9fdd0d0085d3610 (patch) | |
tree | 45bf85261f8c3e3493549bbed07e7aee61143d4b /init | |
parent | 9fbd7e10264dfd6db3fb734872876de5a919918f (diff) | |
download | core-1277bd4dfdd85b05fb864ce0c9fdd0d0085d3610.tar.gz |
Prevent mte_upgrade_test from hanging if MTE is disabled
Turns out we didn't need the syscall because the kernel checks
for async MTE fault on exit.
Test: atest mte_upgrade_test with and without MTE
Change-Id: Iebdf181d67b4586926499c7549c72e73efc13c56
Diffstat (limited to 'init')
-rw-r--r-- | init/test_upgrade_mte/mte_upgrade_test_helper.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/init/test_upgrade_mte/mte_upgrade_test_helper.cpp b/init/test_upgrade_mte/mte_upgrade_test_helper.cpp index 6728cc6d0..c4b175adc 100644 --- a/init/test_upgrade_mte/mte_upgrade_test_helper.cpp +++ b/init/test_upgrade_mte/mte_upgrade_test_helper.cpp @@ -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; } |