netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Enable automated marshalling for RSeqCriticalSection.

Browse Source 
PiperOrigin-RevId: 295226468
This commit is contained in:
gVisor bot
2020-02-14 14:24:27 -08:00
parent e4c7f3e6f6
commit 87bc2834c9
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/sentry/kernel/rseq.go
+2 -14
View File
@@ -303,26 +303,14 @@ func (t *Task) rseqAddrInterrupt() {
return
}
buf = t.CopyScratchBuffer(linux.SizeOfRSeqCriticalSection)
if _, err := t.CopyInBytes(critAddr, buf); err != nil {
var cs linux.RSeqCriticalSection
if _, err := cs.CopyIn(t, critAddr); err != nil {
t.Debugf("Failed to copy critical section from %#x for rseq: %v", critAddr, err)
t.forceSignal(linux.SIGSEGV, false /* unconditional */)
t.SendSignal(SignalInfoPriv(linux.SIGSEGV))
return
}
// Manually marshal RSeqCriticalSection as this is in the hot path when
// rseq is enabled. It must be as fast as possible.
//
// TODO(b/130243041): Replace with go_marshal.
cs := linux.RSeqCriticalSection{
Version: usermem.ByteOrder.Uint32(buf[0:4]),
Flags: usermem.ByteOrder.Uint32(buf[4:8]),
Start: usermem.ByteOrder.Uint64(buf[8:16]),
PostCommitOffset: usermem.ByteOrder.Uint64(buf[16:24]),
Abort: usermem.ByteOrder.Uint64(buf[24:32]),
}
if cs.Version != 0 {
t.Debugf("Unknown version in %+v", cs)
t.forceSignal(linux.SIGSEGV, false /* unconditional */)