diff options
-rw-r--r-- | pkg/sentry/arch/arch_aarch64.go | 2 | ||||
-rw-r--r-- | pkg/sentry/arch/registers_go_proto/registers.pb.go | 77 | ||||
-rw-r--r-- | pkg/sentry/syscalls/linux/linux64.go | 4 | ||||
-rw-r--r-- | pkg/sentry/syscalls/linux/vfs2/vfs2.go | 1 |
4 files changed, 48 insertions, 36 deletions
diff --git a/pkg/sentry/arch/arch_aarch64.go b/pkg/sentry/arch/arch_aarch64.go index 0f433ee79..fd73751e7 100644 --- a/pkg/sentry/arch/arch_aarch64.go +++ b/pkg/sentry/arch/arch_aarch64.go @@ -154,6 +154,7 @@ func (s State) Proto() *rpb.Registers { Sp: s.Regs.Sp, Pc: s.Regs.Pc, Pstate: s.Regs.Pstate, + Tls: s.Regs.TPIDR_EL0, } return &rpb.Registers{Arch: &rpb.Registers_Arm64{Arm64: regs}} } @@ -232,6 +233,7 @@ func (s *State) RegisterMap() (map[string]uintptr, error) { "Sp": uintptr(s.Regs.Sp), "Pc": uintptr(s.Regs.Pc), "Pstate": uintptr(s.Regs.Pstate), + "Tls": uintptr(s.Regs.TPIDR_EL0), }, nil } diff --git a/pkg/sentry/arch/registers_go_proto/registers.pb.go b/pkg/sentry/arch/registers_go_proto/registers.pb.go index c4e9584b5..4b11db4c0 100644 --- a/pkg/sentry/arch/registers_go_proto/registers.pb.go +++ b/pkg/sentry/arch/registers_go_proto/registers.pb.go @@ -302,6 +302,7 @@ type ARM64Registers struct { Sp uint64 `protobuf:"varint,32,opt,name=sp,proto3" json:"sp,omitempty"` Pc uint64 `protobuf:"varint,33,opt,name=pc,proto3" json:"pc,omitempty"` Pstate uint64 `protobuf:"varint,34,opt,name=pstate,proto3" json:"pstate,omitempty"` + Tls uint64 `protobuf:"varint,35,opt,name=tls,proto3" json:"tls,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -570,6 +571,13 @@ func (m *ARM64Registers) GetPstate() uint64 { return 0 } +func (m *ARM64Registers) GetTls() uint64 { + if m != nil { + return m.Tls + } + return 0 +} + type Registers struct { // Types that are valid to be assigned to Arch: // *Registers_Amd64 @@ -659,39 +667,40 @@ func init() { func init() { proto.RegisterFile("pkg/sentry/arch/registers.proto", fileDescriptor_082b7510610e0457) } var fileDescriptor_082b7510610e0457 = []byte{ - // 544 bytes of a gzipped FileDescriptorProto + // 555 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x94, 0x4b, 0x72, 0xd3, 0x40, - 0x10, 0x86, 0xc9, 0xc4, 0xb1, 0x93, 0x09, 0x98, 0x20, 0xc0, 0xe9, 0xf0, 0x4a, 0xf0, 0x8a, 0x95, - 0xad, 0x97, 0x65, 0x7b, 0x49, 0x8a, 0x05, 0x9b, 0x6c, 0x7c, 0x81, 0x94, 0x2c, 0xcb, 0x42, 0x05, - 0xc1, 0x53, 0xd3, 0x2e, 0x4a, 0xac, 0xb9, 0x29, 0x27, 0xa1, 0xfa, 0x31, 0x90, 0xdc, 0x80, 0x5d, - 0x7f, 0xdf, 0xb4, 0x4a, 0x23, 0xfd, 0x3d, 0x63, 0x2f, 0xdd, 0xd7, 0x66, 0x8a, 0xf5, 0xf7, 0xbd, - 0xff, 0x39, 0x2d, 0x7d, 0xf5, 0x65, 0xea, 0xeb, 0xa6, 0xc5, 0x7d, 0xed, 0x71, 0xe2, 0xfc, 0x6e, - 0xbf, 0x8b, 0xfa, 0xcd, 0x8f, 0x16, 0x77, 0x7e, 0xfc, 0xab, 0x67, 0x87, 0x1f, 0x6f, 0x3e, 0x15, - 0xf9, 0x2a, 0x34, 0x44, 0x67, 0xf6, 0xd0, 0x97, 0x1d, 0x1c, 0x5c, 0x1d, 0x7c, 0xe8, 0xad, 0xa8, - 0x64, 0xb3, 0xee, 0xc0, 0xa8, 0x59, 0x8b, 0xa9, 0x3a, 0x38, 0x54, 0x53, 0x89, 0xd9, 0x74, 0xd0, - 0x53, 0xb3, 0x11, 0x83, 0x2d, 0x1c, 0xa9, 0xc1, 0x56, 0x7a, 0x5a, 0xe8, 0x87, 0x1e, 0x31, 0xe8, - 0x60, 0x10, 0x7a, 0x9c, 0xbc, 0xcb, 0xc1, 0x71, 0x78, 0x97, 0x8b, 0x86, 0xd6, 0xf8, 0x05, 0x9c, - 0xb0, 0x30, 0x7e, 0xc1, 0xbc, 0x04, 0xab, 0xbc, 0xe4, 0x27, 0x92, 0x18, 0x4e, 0xf5, 0x89, 0x24, - 0x16, 0x93, 0xc0, 0xe3, 0x60, 0x12, 0x31, 0x29, 0x3c, 0x09, 0x26, 0x15, 0x93, 0xc1, 0x30, 0x98, - 0x4c, 0x4c, 0x0e, 0x4f, 0x83, 0xc9, 0xc5, 0xcc, 0xe0, 0x2c, 0x98, 0x19, 0x9b, 0xd6, 0xc1, 0x33, - 0x35, 0xad, 0x8b, 0x46, 0xb6, 0xef, 0xb7, 0xdf, 0xca, 0x06, 0x21, 0x62, 0xa9, 0x14, 0x5d, 0xd8, - 0xe3, 0x9d, 0x6f, 0x9b, 0x5b, 0xfa, 0x95, 0xcf, 0x79, 0x65, 0x40, 0xbc, 0x2a, 0x3b, 0xfa, 0x80, - 0x0a, 0xe1, 0x85, 0x7c, 0x40, 0x85, 0xc4, 0x1b, 0x84, 0x97, 0xc2, 0x1b, 0xe6, 0x1a, 0x61, 0x24, - 0x5c, 0x33, 0x6f, 0x11, 0xce, 0x85, 0xb7, 0xcc, 0x0d, 0x02, 0x08, 0x37, 0xcc, 0x88, 0x70, 0x21, - 0x8c, 0x18, 0x9d, 0xdb, 0xc1, 0x16, 0x6f, 0xd7, 0x25, 0xd6, 0xf0, 0x4a, 0xf6, 0xb4, 0xc5, 0xeb, - 0x12, 0x6b, 0x5a, 0x68, 0x74, 0xe1, 0xb5, 0x2c, 0x34, 0xbc, 0x30, 0xfe, 0x4d, 0x53, 0xb0, 0xba, - 0xb9, 0x3f, 0x05, 0xf4, 0x97, 0x63, 0x1d, 0x02, 0xe3, 0x63, 0xe6, 0x44, 0x47, 0xc0, 0xf8, 0x84, - 0x39, 0xd5, 0x01, 0x30, 0x3e, 0x65, 0xce, 0x34, 0x7e, 0xe3, 0x33, 0xe6, 0x5c, 0xc3, 0x37, 0x3e, - 0x67, 0x9e, 0x69, 0xf4, 0xc6, 0xcf, 0x98, 0x0b, 0x0d, 0xde, 0xf8, 0x82, 0x79, 0xae, 0xb1, 0x1b, - 0x3f, 0xff, 0xef, 0x52, 0x4f, 0x8a, 0xbf, 0xa9, 0x27, 0x85, 0x98, 0xb9, 0x46, 0x4e, 0xa5, 0x98, - 0x85, 0x46, 0x4d, 0xa5, 0x98, 0xa5, 0xe6, 0x4c, 0x25, 0x9b, 0x34, 0xd6, 0xa4, 0xa9, 0x14, 0x93, - 0x68, 0xd6, 0x54, 0x8a, 0x49, 0x35, 0x6d, 0x2a, 0xc5, 0x64, 0x9a, 0x37, 0x95, 0x62, 0x72, 0x4d, - 0x9c, 0x4a, 0x31, 0x33, 0x8d, 0x9b, 0x4a, 0x31, 0x85, 0xe6, 0x4c, 0xa5, 0x98, 0x39, 0xbc, 0x09, - 0x46, 0xf6, 0x9c, 0x2e, 0xe0, 0x6d, 0x30, 0xb2, 0xe7, 0x74, 0x09, 0xef, 0x82, 0x91, 0x3d, 0x67, - 0x31, 0x5c, 0xaa, 0xc9, 0x78, 0x12, 0xd0, 0xc1, 0x95, 0x8e, 0x1b, 0x9f, 0x4f, 0x57, 0xc1, 0x7b, - 0x61, 0x57, 0xd1, 0x89, 0x70, 0xb8, 0x2f, 0xf7, 0x35, 0x8c, 0x65, 0xc8, 0x84, 0xc6, 0x68, 0x4f, - 0xfe, 0x8d, 0xd7, 0xc4, 0x1e, 0x95, 0x77, 0x9b, 0x22, 0xe7, 0x09, 0x3b, 0x4d, 0x47, 0x13, 0xb9, - 0x8f, 0x26, 0x0f, 0xef, 0xa2, 0xcf, 0x8f, 0x56, 0xd2, 0xc6, 0xfd, 0xfe, 0xae, 0xc8, 0x79, 0x02, - 0xef, 0xf7, 0x3f, 0x98, 0x5a, 0xee, 0xa7, 0xb6, 0xeb, 0xbe, 0xed, 0xd1, 0xbd, 0xb7, 0xee, 0xf3, - 0x75, 0x97, 0xfd, 0x09, 0x00, 0x00, 0xff, 0xff, 0x79, 0x30, 0x5f, 0x13, 0x11, 0x05, 0x00, 0x00, + 0x10, 0x86, 0xc9, 0xc4, 0x71, 0x92, 0x09, 0x84, 0x20, 0xc0, 0xe9, 0xf0, 0x4a, 0x30, 0x1b, 0x56, + 0xb6, 0x5e, 0x96, 0xed, 0x25, 0x29, 0x16, 0x6c, 0xb2, 0xf1, 0x05, 0x52, 0xb2, 0x2c, 0x0b, 0x15, + 0x0e, 0x9e, 0x9a, 0x56, 0x51, 0x66, 0xcd, 0x95, 0x39, 0x00, 0xd5, 0x8f, 0x81, 0xe4, 0x06, 0xec, + 0xfa, 0xfb, 0xa6, 0x25, 0x8d, 0xf4, 0xb7, 0xc6, 0x5e, 0xba, 0x6f, 0xcd, 0x18, 0xeb, 0xef, 0x9d, + 0xff, 0x39, 0x2e, 0x7d, 0xf5, 0x75, 0xec, 0xeb, 0xa6, 0xc5, 0xae, 0xf6, 0x38, 0x72, 0x7e, 0xdb, + 0x6d, 0xa3, 0x7e, 0xf3, 0xa3, 0xc5, 0xad, 0x1f, 0xfe, 0xea, 0xd9, 0xd3, 0x4f, 0x37, 0x9f, 0x8b, + 0x7c, 0x11, 0x1a, 0xa2, 0x33, 0xbb, 0xef, 0xcb, 0x1d, 0xec, 0x5d, 0xed, 0x7d, 0xec, 0x2d, 0xa8, + 0x64, 0xb3, 0xdc, 0x81, 0x51, 0xb3, 0x14, 0x53, 0xed, 0x60, 0x5f, 0x4d, 0x25, 0x66, 0xb5, 0x83, + 0x9e, 0x9a, 0x95, 0x18, 0x6c, 0xe1, 0x40, 0x0d, 0xb6, 0xd2, 0xd3, 0x42, 0x3f, 0xf4, 0x88, 0x41, + 0x07, 0x87, 0xa1, 0xc7, 0xc9, 0xb3, 0x1c, 0x1c, 0x85, 0x67, 0xb9, 0xe8, 0xd4, 0x1a, 0x3f, 0x83, + 0x63, 0x16, 0xc6, 0xcf, 0x98, 0xe7, 0x60, 0x95, 0xe7, 0x7c, 0x45, 0x12, 0xc3, 0x89, 0x5e, 0x91, + 0xc4, 0x62, 0x12, 0x78, 0x1c, 0x4c, 0x22, 0x26, 0x85, 0x27, 0xc1, 0xa4, 0x62, 0x32, 0x38, 0x0d, + 0x26, 0x13, 0x93, 0xc3, 0xd3, 0x60, 0x72, 0x31, 0x13, 0x38, 0x0b, 0x66, 0xc2, 0xa6, 0x75, 0xf0, + 0x4c, 0x4d, 0xeb, 0xa2, 0x81, 0xed, 0xfb, 0xf5, 0xa6, 0x6c, 0x10, 0x22, 0x96, 0x4a, 0xd1, 0x85, + 0x3d, 0xda, 0xfa, 0xb6, 0xb9, 0xa5, 0x4f, 0xf9, 0x9c, 0x57, 0x0e, 0x89, 0x17, 0xe5, 0x8e, 0x5e, + 0xa0, 0x42, 0x78, 0x21, 0x2f, 0x50, 0x21, 0xf1, 0x0a, 0xe1, 0xa5, 0xf0, 0x8a, 0xb9, 0x46, 0x18, + 0x08, 0xd7, 0xcc, 0x6b, 0x84, 0x73, 0xe1, 0x35, 0x73, 0x83, 0x00, 0xc2, 0x0d, 0x33, 0x22, 0x5c, + 0x08, 0x23, 0x46, 0xe7, 0xf6, 0x70, 0x8d, 0xb7, 0xcb, 0x12, 0x6b, 0x78, 0x25, 0x7b, 0x5a, 0xe3, + 0x75, 0x89, 0x35, 0x2d, 0x34, 0xba, 0xf0, 0x5a, 0x16, 0x1a, 0x5e, 0x18, 0xfe, 0xa6, 0x29, 0x58, + 0xdc, 0xdc, 0x9f, 0x02, 0xfa, 0xca, 0xb1, 0x0e, 0x81, 0xf1, 0x31, 0x73, 0xa2, 0x23, 0x60, 0x7c, + 0xc2, 0x9c, 0xea, 0x00, 0x18, 0x9f, 0x32, 0x67, 0x1a, 0xbf, 0xf1, 0x19, 0x73, 0xae, 0xe1, 0x1b, + 0x9f, 0x33, 0x4f, 0x34, 0x7a, 0xe3, 0x27, 0xcc, 0x85, 0x06, 0x6f, 0x7c, 0xc1, 0x3c, 0xd5, 0xd8, + 0x8d, 0x9f, 0xfe, 0x77, 0xa9, 0x27, 0xc5, 0xdf, 0xd4, 0x93, 0x42, 0xcc, 0x54, 0x23, 0xa7, 0x52, + 0xcc, 0x4c, 0xa3, 0xa6, 0x52, 0xcc, 0x5c, 0x73, 0xa6, 0x92, 0x4d, 0x1a, 0x6b, 0xd2, 0x54, 0x8a, + 0x49, 0x34, 0x6b, 0x2a, 0xc5, 0xa4, 0x9a, 0x36, 0x95, 0x62, 0x32, 0xcd, 0x9b, 0x4a, 0x31, 0xb9, + 0x26, 0x4e, 0xa5, 0x98, 0x89, 0xc6, 0x4d, 0xa5, 0x98, 0x42, 0x73, 0xa6, 0x52, 0xcc, 0x14, 0xde, + 0x04, 0x23, 0x7b, 0x4e, 0x67, 0xf0, 0x36, 0x18, 0xd9, 0x73, 0x3a, 0x87, 0x77, 0xc1, 0xc8, 0x9e, + 0xb3, 0x18, 0x2e, 0xd5, 0x64, 0x3c, 0x09, 0xe8, 0xe0, 0x4a, 0xc7, 0x8d, 0xff, 0x4f, 0x57, 0xc1, + 0x7b, 0x61, 0x57, 0xd1, 0x1f, 0xe1, 0xb0, 0x2b, 0xbb, 0x1a, 0x86, 0x32, 0x64, 0x42, 0x74, 0xa7, + 0x6e, 0x83, 0xf0, 0x41, 0xee, 0xd4, 0x6d, 0x70, 0x88, 0xf6, 0xf8, 0xdf, 0xc0, 0x8d, 0xec, 0x41, + 0x79, 0xb7, 0x2a, 0x72, 0x9e, 0xb9, 0x93, 0x74, 0x30, 0x92, 0x13, 0x6a, 0xf4, 0xf0, 0x74, 0xfa, + 0xf2, 0x68, 0x21, 0x6d, 0xdc, 0xef, 0xef, 0x8a, 0x9c, 0x67, 0xf2, 0x7e, 0xff, 0x83, 0x39, 0xe6, + 0x7e, 0x6a, 0xbb, 0xee, 0xdb, 0x1e, 0x9d, 0x84, 0xcb, 0x3e, 0x1f, 0x80, 0xd9, 0x9f, 0x00, 0x00, + 0x00, 0xff, 0xff, 0xd3, 0xa0, 0x97, 0xf1, 0x23, 0x05, 0x00, 0x00, } diff --git a/pkg/sentry/syscalls/linux/linux64.go b/pkg/sentry/syscalls/linux/linux64.go index 5f26697d2..b293669de 100644 --- a/pkg/sentry/syscalls/linux/linux64.go +++ b/pkg/sentry/syscalls/linux/linux64.go @@ -527,8 +527,8 @@ var ARM64 = &kernel.SyscallTable{ 96: syscalls.Supported("set_tid_address", SetTidAddress), 97: syscalls.PartiallySupported("unshare", Unshare, "Mount, cgroup namespaces not supported. Network namespaces supported but must be empty.", nil), 98: syscalls.PartiallySupported("futex", Futex, "Robust futexes not supported.", nil), - 99: syscalls.Error("set_robust_list", syserror.ENOSYS, "Obsolete.", nil), - 100: syscalls.Error("get_robust_list", syserror.ENOSYS, "Obsolete.", nil), + 99: syscalls.Supported("set_robust_list", SetRobustList), + 100: syscalls.Supported("get_robust_list", GetRobustList), 101: syscalls.Supported("nanosleep", Nanosleep), 102: syscalls.Supported("getitimer", Getitimer), 103: syscalls.Supported("setitimer", Setitimer), diff --git a/pkg/sentry/syscalls/linux/vfs2/vfs2.go b/pkg/sentry/syscalls/linux/vfs2/vfs2.go index 0df3bd449..41c25946d 100644 --- a/pkg/sentry/syscalls/linux/vfs2/vfs2.go +++ b/pkg/sentry/syscalls/linux/vfs2/vfs2.go @@ -227,6 +227,7 @@ func Override() { s.Table[76] = syscalls.Supported("splice", Splice) s.Table[77] = syscalls.Supported("tee", Tee) s.Table[78] = syscalls.Supported("readlinkat", Readlinkat) + s.Table[79] = syscalls.Supported("newfstatat", Newfstatat) s.Table[80] = syscalls.Supported("fstat", Fstat) s.Table[81] = syscalls.Supported("sync", Sync) s.Table[82] = syscalls.Supported("fsync", Fsync) |