summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/mm/proc_pid_maps.go
diff options
context:
space:
mode:
authorRahat Mahmood <rahat@google.com>2018-11-15 15:13:52 -0800
committerShentubot <shentubot@google.com>2018-11-15 15:14:38 -0800
commitf7aa9371247a3e7d8c490ac0fd4c4f3ff6de2017 (patch)
tree29124ad310c0beb8d7778a7fad5b420953333523 /pkg/sentry/mm/proc_pid_maps.go
parent6ef08c2bc2be1cc93bdf42bba5b96a0968a94552 (diff)
Advertise vsyscall support via /proc/<pid>/maps.
Also update test utilities for probing vsyscall support and add a metric to see if vsyscalls are actually used in sandboxes. PiperOrigin-RevId: 221698834 Change-Id: I57870ecc33ea8c864bd7437833f21aa1e8117477
Diffstat (limited to 'pkg/sentry/mm/proc_pid_maps.go')
-rw-r--r--pkg/sentry/mm/proc_pid_maps.go16
1 files changed, 16 insertions, 0 deletions
diff --git a/pkg/sentry/mm/proc_pid_maps.go b/pkg/sentry/mm/proc_pid_maps.go
index 0bf1cdb51..247ee45ef 100644
--- a/pkg/sentry/mm/proc_pid_maps.go
+++ b/pkg/sentry/mm/proc_pid_maps.go
@@ -53,6 +53,22 @@ func (mm *MemoryManager) ReadSeqFileData(ctx context.Context, handle seqfile.Seq
Handle: &vmaAddr,
})
}
+
+ // We always emulate vsyscall, so advertise it here. Everything about a
+ // vsyscall region is static, so just hard code the maps entry since we
+ // don't have a real vma backing it. The vsyscall region is at the end of
+ // the virtual address space so nothing should be mapped after it (if
+ // something is really mapped in the tiny ~10 MiB segment afterwards, we'll
+ // get the sorting on the maps file wrong at worst; but that's not possible
+ // on any current platform).
+ //
+ // Artifically adjust the seqfile handle so we only output vsyscall entry once.
+ if vsyscallEnd := usermem.Addr(0xffffffffff601000); start != vsyscallEnd {
+ data = append(data, seqfile.SeqData{
+ Buf: []byte("ffffffffff600000-ffffffffff601000 r-xp 00000000 00:00 0 [vsyscall]\n"),
+ Handle: &vsyscallEnd,
+ })
+ }
return data, 1
}