StarMirror/sandboxed-api
1
0
Fork 0
mirror of https://github.com/google/sandboxed-api.git synced 2024-03-22 13:11:30 +08:00
Code Issues Projects Releases Wiki Activity

Fix logging/display of syscall tables

Browse Source 
Initializing `absl::Span`s like by assigning them from a temporary
array leaves them pointing to invalid data. Due to the way the linker
initializes these constant tables, _most_ of them will still be valid
_most_ of the time, leading to crashes when running sandboxees with the
`--sandbox2_danger_danger_permit_all_and_log` option.

PiperOrigin-RevId: 321112099
Change-Id: I891118da08cbb6000b3e2e275618bc4edaa1d020
This commit is contained in:
Christian Blichmann 2020-07-14 00:47:14 -07:00 committed by Copybara-Service
parent 5f35b4fc8c
commit 1f1de9e229
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sandboxed_api/sandbox2/syscall_defs.cc
View File

@ -130,7 +130,7 @@ std::vector<std::string> SyscallTable::GetArgumentsDescription(
#if defined(__x86_64__) #if defined(__x86_64__)
// Syscall description table for Linux x86_64 // Syscall description table for Linux x86_64
const absl::Span<const SyscallTable::Entry> kSyscallDataX8664 = { constexpr SyscallTable::Entry kSyscallDataX8664[] = {
MakeEntry("read", kInt, kHex, kInt), // 0 MakeEntry("read", kInt, kHex, kInt), // 0
MakeEntry("write", kInt, kHex, kInt), // 1 MakeEntry("write", kInt, kHex, kInt), // 1
MakeEntry("open", kPath, kHex, kOct), // 2 MakeEntry("open", kPath, kHex, kOct), // 2
@ -333,7 +333,7 @@ const absl::Span<const SyscallTable::Entry> kSyscallDataX8664 = {
MakeEntry("fremovexattr", UnknownArguments()), // 199 MakeEntry("fremovexattr", UnknownArguments()), // 199
MakeEntry("tkill", kInt, kSignal), // 200 MakeEntry("tkill", kInt, kSignal), // 200
MakeEntry("time", kHex), // 201 MakeEntry("time", kHex), // 201
MakeEntry("futex", UnknownArguments()), // 202 MakeEntry("futex", kGen, kInt, kInt, kGen, kGen, kInt), // 202
MakeEntry("sched_setaffinity", UnknownArguments()), // 203 MakeEntry("sched_setaffinity", UnknownArguments()), // 203
MakeEntry("sched_getaffinity", UnknownArguments()), // 204 MakeEntry("sched_getaffinity", UnknownArguments()), // 204
MakeEntry("set_thread_area", kHex), // 205 MakeEntry("set_thread_area", kHex), // 205
@ -458,7 +458,7 @@ const absl::Span<const SyscallTable::Entry> kSyscallDataX8664 = {
MakeEntry("membarrier", kHex, kHex), // 324 MakeEntry("membarrier", kHex, kHex), // 324
}; };
const absl::Span<const SyscallTable::Entry> kSyscallDataX8632 = { constexpr SyscallTable::Entry kSyscallDataX8632[] = {
MakeEntry("restart_syscall", kHex, kHex, kHex, kHex, kHex, kHex), // 0 MakeEntry("restart_syscall", kHex, kHex, kHex, kHex, kHex, kHex), // 0
MakeEntry("exit", kHex, kHex, kHex, kHex, kHex, kHex), // 1 MakeEntry("exit", kHex, kHex, kHex, kHex, kHex, kHex), // 1
MakeEntry("fork", kHex, kHex, kHex, kHex, kHex, kHex), // 2 MakeEntry("fork", kHex, kHex, kHex, kHex, kHex, kHex), // 2
@ -829,7 +829,7 @@ const absl::Span<const SyscallTable::Entry> kSyscallDataX8632 = {
// http://lxr.free-electrons.com/source/arch/powerpc/include/uapi/asm/unistd.h // http://lxr.free-electrons.com/source/arch/powerpc/include/uapi/asm/unistd.h
// Note: PPC64 syscalls can have up to 7 register arguments, but nobody is // Note: PPC64 syscalls can have up to 7 register arguments, but nobody is
// using the 7th argument - probably for x64 compatibility reasons. // using the 7th argument - probably for x64 compatibility reasons.
const absl::Span<const SyscallTable::Entry> kSyscallDataPPC64 = { constexpr SyscallTable::Entry kSyscallDataPPC64[] = {
MakeEntry("restart_syscall", kGen, kGen, kGen, kGen, kGen, kGen), // 0 MakeEntry("restart_syscall", kGen, kGen, kGen, kGen, kGen, kGen), // 0
MakeEntry("exit", kInt, kGen, kGen, kGen, kGen, kGen), // 1 MakeEntry("exit", kInt, kGen, kGen, kGen, kGen, kGen), // 1
MakeEntry("fork", kGen, kGen, kGen, kGen, kGen, kGen), // 2 MakeEntry("fork", kGen, kGen, kGen, kGen, kGen, kGen), // 2