From 1277bd4dfdd85b05fb864ce0c9fdd0d0085d3610 Mon Sep 17 00:00:00 2001 From: Florian Mayer Date: Tue, 14 May 2024 17:35:15 -0700 Subject: [PATCH] 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 --- init/test_upgrade_mte/mte_upgrade_test_helper.cpp | 3 +-- 1 file changed, 1 insertion(+), 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 #include #include + #include 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; }