Fix android.os.cts.SeccompTest for Nougat on i386 and x86_64.
On i386, permit __NR_set_thread_area. In Nougat+ this is used instead of
__NR_modify_ldt, per
https://android.googlesource.com/platform/art/+/8a2c62c62b3398afbac00b1cb8772ae5b53b62a3.
On x86_64, permit __NR_arch_prctl, which is also used to initialize threading.
Test: cts-tradefed run singleCommand cts -m CtsOsTestCases -t android.os.cts.SeccompTest
Bug: 32287739
Change-Id: I1e9b4eebf7e477214a59a423b451516e4f3c5d63
diff --git a/tests/tests/os/jni/seccomp_sample_program.cpp b/tests/tests/os/jni/seccomp_sample_program.cpp
index cb15aff..eb1e9a6 100644
--- a/tests/tests/os/jni/seccomp_sample_program.cpp
+++ b/tests/tests/os/jni/seccomp_sample_program.cpp
@@ -756,123 +756,125 @@
{0x20, 0, 0, 0x0},
{0x45, 0, 1, 0x40000000},
{0x6, 0, 0, 0x30006},
- {0x35, 0, 85, 0x94},
- {0x35, 0, 44, 0xdd},
+ {0x35, 0, 86, 0x96},
+ {0x35, 0, 43, 0xe0},
{0x35, 0, 20, 0x11c},
{0x35, 0, 10, 0x13f},
{0x35, 0, 5, 0x149},
{0x35, 0, 2, 0x163},
- {0x35, 0, 92, 0x164},
- {0x35, 91, 90, 0x165},
+ {0x35, 0, 95, 0x164},
+ {0x35, 94, 91, 0x165},
{0x35, 0, 92, 0x14c},
- {0x35, 88, 89, 0x161},
+ {0x35, 89, 92, 0x161},
{0x35, 0, 2, 0x141},
- {0x35, 0, 87, 0x144},
- {0x35, 86, 85, 0x145},
- {0x35, 84, 87, 0x140},
+ {0x35, 0, 90, 0x144},
+ {0x35, 89, 86, 0x145},
+ {0x35, 85, 87, 0x140},
{0x35, 0, 4, 0x12d},
{0x35, 0, 2, 0x136},
- {0x35, 0, 82, 0x137},
- {0x35, 81, 80, 0x138},
- {0x35, 82, 79, 0x134},
+ {0x35, 0, 85, 0x137},
+ {0x35, 84, 81, 0x138},
+ {0x35, 82, 80, 0x134},
{0x35, 0, 2, 0x127},
{0x35, 0, 80, 0x128},
- {0x35, 79, 76, 0x12c},
- {0x35, 76, 78, 0x11d},
+ {0x35, 79, 77, 0x12c},
+ {0x35, 79, 78, 0x11d},
{0x35, 0, 11, 0xfe},
{0x35, 0, 6, 0x10a},
{0x35, 0, 3, 0x10e},
{0x35, 1, 0, 0x10f},
- {0x5, 0, 0, 0x142},
- {0x35, 70, 69, 0x110},
- {0x35, 0, 69, 0x10c},
- {0x35, 68, 67, 0x10d},
+ {0x5, 0, 0, 0x144},
+ {0x35, 73, 70, 0x110},
+ {0x35, 0, 72, 0x10c},
+ {0x35, 71, 68, 0x10d},
{0x35, 0, 2, 0x102},
{0x35, 0, 68, 0x103},
- {0x35, 136, 65, 0x109},
- {0x35, 64, 66, 0x101},
- {0x35, 0, 4, 0xef},
- {0x35, 0, 2, 0xf1},
- {0x35, 0, 61, 0xfc},
- {0x35, 59, 62, 0xfd},
- {0x35, 154, 59, 0xf0},
- {0x35, 0, 3, 0xe0},
- {0x35, 0, 59, 0xe1},
- {0x35, 0, 56, 0xee},
- {0x5, 0, 0, 0x137},
- {0x35, 54, 0, 0xde},
- {0x5, 0, 0, 0x108},
- {0x35, 0, 20, 0xb6},
- {0x35, 0, 10, 0xc7},
- {0x35, 0, 5, 0xd2},
- {0x35, 0, 2, 0xd9},
- {0x35, 0, 48, 0xdb},
- {0x35, 46, 177, 0xdc},
- {0x35, 0, 45, 0xd3},
- {0x35, 44, 47, 0xd4},
- {0x35, 0, 2, 0xcd},
- {0x35, 0, 45, 0xce},
- {0x35, 44, 41, 0xd1},
- {0x35, 40, 43, 0xcb},
- {0x35, 0, 4, 0xbf},
- {0x35, 0, 2, 0xc1},
- {0x35, 0, 37, 0xc5},
- {0x35, 36, 39, 0xc6},
- {0x35, 243, 38, 0xc0},
- {0x35, 0, 2, 0xb9},
- {0x35, 0, 33, 0xba},
- {0x35, 33, 35, 0xbb},
- {0x35, 34, 31, 0xb8},
- {0x35, 0, 9, 0xa9},
- {0x35, 0, 4, 0xb0},
- {0x35, 0, 2, 0xb2},
- {0x35, 0, 28, 0xb4},
- {0x35, 27, 29, 0xb5},
- {0x35, 28, 26, 0xb1},
- {0x35, 0, 2, 0xab},
- {0x35, 0, 26, 0xac},
- {0x35, 25, 157, 0xad},
- {0x35, 21, 22, 0xaa},
- {0x35, 0, 4, 0xa2},
- {0x35, 0, 2, 0xa5},
- {0x35, 0, 21, 0xa6},
- {0x35, 20, 18, 0xa8},
- {0x35, 16, 19, 0xa4},
- {0x35, 0, 2, 0x98},
- {0x35, 0, 15, 0x9e},
- {0x35, 14, 16, 0x9f},
- {0x35, 15, 13, 0x96},
- {0x35, 0, 43, 0x4f},
- {0x35, 0, 23, 0x6e},
- {0x35, 0, 13, 0x7d},
- {0x35, 0, 5, 0x8a},
- {0x35, 0, 2, 0x8e},
- {0x35, 0, 9, 0x90},
- {0x35, 8, 6, 0x91},
- {0x35, 0, 4, 0x8c},
- {0x35, 3, 6, 0x8d},
- {0x35, 0, 4, 0x7f},
- {0x35, 0, 2, 0x85},
- {0x35, 1, 0, 0x86},
- {0x5, 0, 0, 0x101},
+ {0x35, 138, 68, 0x109},
+ {0x35, 67, 66, 0x101},
+ {0x35, 0, 4, 0xf1},
+ {0x35, 0, 2, 0xf4},
+ {0x35, 0, 64, 0xfc},
+ {0x35, 60, 62, 0xfd},
+ {0x35, 61, 62, 0xf3},
+ {0x35, 0, 3, 0xee},
+ {0x35, 1, 0, 0xef},
+ {0x5, 0, 0, 0x13a},
+ {0x35, 152, 58, 0xf0},
+ {0x35, 57, 56, 0xe1},
+ {0x35, 0, 21, 0xb9},
+ {0x35, 0, 11, 0xcd},
+ {0x35, 0, 6, 0xd4},
+ {0x35, 0, 3, 0xdc},
+ {0x35, 0, 49, 0xdd},
+ {0x35, 51, 0, 0xde},
+ {0x5, 0, 0, 0x104},
+ {0x35, 0, 46, 0xd9},
+ {0x35, 177, 48, 0xdb},
+ {0x35, 0, 2, 0xd1},
+ {0x35, 0, 45, 0xd2},
+ {0x35, 44, 42, 0xd3},
+ {0x35, 41, 43, 0xce},
+ {0x35, 0, 4, 0xc1},
+ {0x35, 0, 2, 0xc6},
+ {0x35, 0, 38, 0xc7},
+ {0x35, 37, 39, 0xcb},
+ {0x35, 38, 36, 0xc5},
+ {0x35, 0, 2, 0xbb},
+ {0x35, 0, 37, 0xbf},
+ {0x35, 242, 35, 0xc0},
+ {0x35, 34, 32, 0xba},
+ {0x35, 0, 10, 0xaa},
+ {0x35, 0, 5, 0xb1},
+ {0x35, 0, 2, 0xb5},
+ {0x35, 0, 31, 0xb6},
+ {0x35, 29, 27, 0xb8},
+ {0x35, 0, 28, 0xb2},
+ {0x35, 27, 28, 0xb4},
+ {0x35, 0, 2, 0xac},
+ {0x35, 0, 159, 0xad},
+ {0x35, 25, 24, 0xb0},
+ {0x35, 23, 21, 0xab},
+ {0x35, 0, 4, 0xa4},
+ {0x35, 0, 2, 0xa6},
+ {0x35, 0, 21, 0xa8},
+ {0x35, 20, 19, 0xa9},
+ {0x35, 18, 16, 0xa5},
+ {0x35, 0, 2, 0x9e},
+ {0x35, 0, 16, 0x9f},
+ {0x35, 15, 16, 0xa2},
+ {0x35, 15, 14, 0x98},
+ {0x35, 0, 44, 0x4f},
+ {0x35, 0, 23, 0x6f},
+ {0x35, 0, 13, 0x7e},
+ {0x35, 0, 5, 0x8c},
+ {0x35, 0, 2, 0x90},
+ {0x35, 0, 9, 0x91},
+ {0x35, 8, 7, 0x94},
+ {0x35, 0, 6, 0x8d},
+ {0x35, 5, 3, 0x8e},
+ {0x35, 0, 3, 0x85},
+ {0x35, 0, 1, 0x86},
+ {0x35, 0, 3, 0x8a},
{0x5, 0, 0, 0x102},
- {0x35, 0, 169, 0x7e},
- {0x5, 0, 0, 0xff},
- {0x35, 0, 4, 0x76},
- {0x35, 0, 2, 0x79},
- {0x35, 0, 253, 0x7a},
- {0x35, 252, 251, 0x7c},
- {0x35, 250, 251, 0x77},
- {0x35, 0, 2, 0x72},
- {0x35, 0, 248, 0x73},
- {0x35, 246, 248, 0x75},
- {0x35, 247, 245, 0x6f},
- {0x35, 0, 9, 0x60},
- {0x35, 0, 4, 0x66},
- {0x35, 0, 2, 0x6a},
- {0x35, 0, 241, 0x6c},
- {0x35, 242, 241, 0x6d},
- {0x35, 241, 157, 0x67},
+ {0x35, 1, 0, 0x7f},
+ {0x5, 0, 0, 0x101},
+ {0x5, 0, 0, 0x101},
+ {0x35, 0, 4, 0x77},
+ {0x35, 0, 2, 0x7a},
+ {0x35, 0, 253, 0x7c},
+ {0x35, 165, 253, 0x7d},
+ {0x35, 252, 251, 0x79},
+ {0x35, 0, 2, 0x73},
+ {0x35, 0, 250, 0x75},
+ {0x35, 249, 247, 0x76},
+ {0x35, 247, 248, 0x72},
+ {0x35, 0, 10, 0x60},
+ {0x35, 0, 5, 0x66},
+ {0x35, 0, 2, 0x6c},
+ {0x35, 0, 243, 0x6d},
+ {0x35, 241, 243, 0x6e},
+ {0x35, 0, 158, 0x67},
+ {0x35, 239, 241, 0x6a},
{0x35, 0, 2, 0x63},
{0x35, 0, 237, 0x64},
{0x35, 236, 238, 0x65},
@@ -1110,7 +1112,7 @@
{0x15, 1, 0, 0x0},
{0x6, 0, 0, 0x30003},
{0x20, 0, 0, 0x10},
- {0x15, 2, 0, 0x78a0},
+ {0x15, 2, 0, 0x12b3},
{0x6, 0, 0, 0x30002},
{0x6, 0, 0, 0x50001},
{0x6, 0, 0, 0x7fff0000},
@@ -1124,104 +1126,105 @@
{0x20, 0, 0, 0x0},
{0x45, 0, 1, 0x40000000},
{0x6, 0, 0, 0x30006},
- {0x35, 0, 58, 0x7f},
+ {0x35, 0, 58, 0x80},
{0x35, 0, 28, 0xe4},
{0x35, 0, 14, 0x111},
{0x35, 0, 7, 0x120},
{0x35, 0, 3, 0x13c},
{0x35, 0, 1, 0x13f},
- {0x35, 105, 114, 0x140},
- {0x35, 104, 113, 0x13e},
+ {0x35, 106, 115, 0x140},
+ {0x35, 105, 114, 0x13e},
{0x35, 0, 1, 0x123},
- {0x35, 102, 120, 0x126},
- {0x35, 101, 110, 0x121},
+ {0x35, 103, 121, 0x126},
+ {0x35, 102, 111, 0x121},
{0x35, 0, 3, 0x119},
{0x35, 0, 1, 0x11d},
- {0x35, 98, 107, 0x11e},
- {0x35, 97, 115, 0x11a},
- {0x35, 0, 105, 0x112},
- {0x35, 104, 95, 0x118},
+ {0x35, 99, 108, 0x11e},
+ {0x35, 98, 116, 0x11a},
+ {0x35, 0, 106, 0x112},
+ {0x35, 105, 96, 0x118},
{0x35, 0, 6, 0xf8},
{0x35, 0, 3, 0x106},
{0x35, 0, 1, 0x10e},
- {0x35, 91, 109, 0x110},
- {0x35, 99, 108, 0x107},
- {0x35, 0, 89, 0x101},
- {0x35, 97, 106, 0x102},
+ {0x35, 92, 110, 0x110},
+ {0x35, 100, 109, 0x107},
+ {0x35, 0, 90, 0x101},
+ {0x35, 98, 107, 0x102},
{0x35, 0, 3, 0xea},
{0x35, 0, 1, 0xec},
- {0x35, 103, 85, 0xf7},
- {0x35, 93, 60, 0xeb},
- {0x35, 0, 93, 0xe5},
- {0x35, 100, 82, 0xe7},
+ {0x35, 104, 86, 0xf7},
+ {0x35, 94, 60, 0xeb},
+ {0x35, 0, 94, 0xe5},
+ {0x35, 101, 83, 0xe7},
{0x35, 0, 15, 0xac},
{0x35, 0, 7, 0xcb},
{0x35, 0, 3, 0xd9},
{0x35, 0, 1, 0xdc},
- {0x35, 77, 86, 0xdd},
- {0x35, 94, 85, 0xda},
+ {0x35, 78, 87, 0xdd},
+ {0x35, 95, 86, 0xda},
{0x35, 0, 1, 0xd5},
- {0x35, 74, 92, 0xd6},
- {0x35, 82, 73, 0xd4},
+ {0x35, 75, 93, 0xd6},
+ {0x35, 83, 74, 0xd4},
{0x35, 0, 4, 0xbb},
{0x35, 0, 1, 0xc9},
- {0x35, 124, 88, 0xca},
- {0x35, 0, 69, 0xc8},
- {0x5, 0, 0, 0x13c},
- {0x35, 0, 76, 0xae},
- {0x35, 84, 66, 0xba},
- {0x35, 0, 6, 0x8a},
- {0x35, 0, 3, 0x95},
- {0x35, 0, 1, 0x9d},
- {0x35, 62, 172, 0x9e},
- {0x35, 61, 79, 0x97},
- {0x35, 0, 60, 0x8c},
- {0x35, 59, 77, 0x8e},
- {0x35, 0, 3, 0x83},
- {0x35, 0, 1, 0x87},
- {0x35, 65, 56, 0x88},
- {0x35, 64, 73, 0x84},
- {0x35, 0, 54, 0x80},
- {0x35, 53, 71, 0x81},
- {0x35, 0, 29, 0x3b},
- {0x35, 0, 14, 0x69},
- {0x35, 0, 7, 0x74},
- {0x35, 0, 3, 0x79},
- {0x35, 0, 1, 0x7c},
- {0x35, 56, 65, 0x7e},
- {0x35, 55, 46, 0x7a},
- {0x35, 0, 1, 0x77},
- {0x35, 62, 53, 0x78},
- {0x35, 61, 52, 0x76},
- {0x35, 0, 3, 0x6e},
- {0x35, 0, 1, 0x71},
- {0x35, 58, 49, 0x73},
- {0x35, 39, 57, 0x6f},
- {0x35, 0, 47, 0x6b},
- {0x35, 37, 55, 0x6d},
- {0x35, 0, 6, 0x4a},
- {0x35, 0, 3, 0x62},
- {0x35, 0, 1, 0x67},
- {0x35, 51, 33, 0x68},
- {0x35, 50, 32, 0x66},
- {0x35, 0, 31, 0x4c},
- {0x35, 48, 39, 0x60},
- {0x35, 0, 3, 0x3f},
- {0x35, 0, 1, 0x48},
- {0x35, 45, 201, 0x49},
- {0x35, 35, 44, 0x40},
- {0x35, 0, 34, 0x3c},
- {0x35, 0, 42, 0x3e},
+ {0x35, 125, 89, 0xca},
+ {0x35, 0, 70, 0xc8},
+ {0x5, 0, 0, 0x13d},
+ {0x35, 0, 77, 0xae},
+ {0x35, 85, 67, 0xba},
+ {0x35, 0, 6, 0x8c},
+ {0x35, 0, 3, 0x97},
+ {0x35, 0, 1, 0x9e},
+ {0x35, 63, 81, 0x9f},
+ {0x35, 172, 62, 0x9d},
+ {0x35, 0, 79, 0x8e},
+ {0x35, 78, 60, 0x95},
+ {0x35, 0, 3, 0x84},
+ {0x35, 0, 1, 0x88},
+ {0x35, 57, 66, 0x8a},
+ {0x35, 56, 65, 0x87},
+ {0x35, 0, 73, 0x81},
+ {0x35, 72, 54, 0x83},
+ {0x35, 0, 29, 0x3c},
+ {0x35, 0, 14, 0x6b},
+ {0x35, 0, 7, 0x76},
+ {0x35, 0, 3, 0x7a},
+ {0x35, 0, 1, 0x7e},
+ {0x35, 48, 57, 0x7f},
+ {0x35, 65, 56, 0x7c},
+ {0x35, 0, 1, 0x78},
+ {0x35, 45, 63, 0x79},
+ {0x35, 53, 62, 0x77},
+ {0x35, 0, 3, 0x6f},
+ {0x35, 0, 1, 0x73},
+ {0x35, 50, 59, 0x74},
+ {0x35, 49, 40, 0x71},
+ {0x35, 0, 57, 0x6d},
+ {0x35, 56, 38, 0x6e},
+ {0x35, 0, 6, 0x4c},
+ {0x35, 0, 3, 0x66},
+ {0x35, 0, 1, 0x68},
+ {0x35, 43, 52, 0x69},
+ {0x35, 33, 51, 0x67},
+ {0x35, 0, 41, 0x60},
+ {0x35, 31, 49, 0x62},
+ {0x35, 0, 3, 0x40},
+ {0x35, 0, 1, 0x49},
+ {0x35, 28, 46, 0x4a},
+ {0x35, 201, 36, 0x48},
+ {0x35, 0, 44, 0x3e},
+ {0x35, 43, 0, 0x3f},
+ {0x5, 0, 0, 0x109},
+ {0x35, 0, 15, 0x1d},
+ {0x35, 0, 8, 0x31},
+ {0x35, 0, 3, 0x37},
+ {0x35, 0, 1, 0x3a},
+ {0x35, 28, 19, 0x3b},
+ {0x35, 27, 36, 0x39},
+ {0x35, 0, 2, 0x35},
+ {0x35, 16, 0, 0x36},
{0x5, 0, 0, 0x108},
- {0x35, 0, 14, 0x1d},
- {0x35, 0, 7, 0x31},
- {0x35, 0, 3, 0x36},
- {0x35, 0, 1, 0x39},
- {0x35, 18, 27, 0x3a},
- {0x35, 35, 17, 0x37},
- {0x35, 0, 25, 0x33},
- {0x35, 0, 15, 0x35},
- {0x5, 0, 0, 0x107},
+ {0x35, 14, 23, 0x33},
{0x35, 0, 3, 0x27},
{0x35, 0, 1, 0x29},
{0x35, 29, 20, 0x2c},
@@ -1483,7 +1486,7 @@
{0x20, 0, 0, 0x10},
{0x45, 0, 29, 0x80000000},
{0x20, 0, 0, 0x10},
- {0x15, 31, 0, 0x8da},
+ {0x15, 31, 0, 0x12b1},
{0x6, 0, 0, 0x30003},
{0x20, 0, 0, 0x14},
{0x15, 3, 0, 0x0},
