summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/syscalls/linux/sys_sysinfo.go
diff options
context:
space:
mode:
authorNicolas Lacasse <nlacasse@google.com>2020-05-06 10:28:50 -0700
committergVisor bot <gvisor-bot@google.com>2020-05-06 10:30:18 -0700
commit591ff0e424e3b30eb143bce06618cb8656784b90 (patch)
tree46b63f822864e51c6ecbbe909f986e19fc0033df /pkg/sentry/syscalls/linux/sys_sysinfo.go
parent8416da33d25bf28cfcfdcbe658f696d6883eebcd (diff)
Add maximum memory limit.
PiperOrigin-RevId: 310179277
Diffstat (limited to 'pkg/sentry/syscalls/linux/sys_sysinfo.go')
-rw-r--r--pkg/sentry/syscalls/linux/sys_sysinfo.go7
1 files changed, 6 insertions, 1 deletions
diff --git a/pkg/sentry/syscalls/linux/sys_sysinfo.go b/pkg/sentry/syscalls/linux/sys_sysinfo.go
index a65b560c8..297de052a 100644
--- a/pkg/sentry/syscalls/linux/sys_sysinfo.go
+++ b/pkg/sentry/syscalls/linux/sys_sysinfo.go
@@ -29,13 +29,18 @@ func Sysinfo(t *kernel.Task, args arch.SyscallArguments) (uintptr, *kernel.Sysca
mf.UpdateUsage()
_, totalUsage := usage.MemoryAccounting.Copy()
totalSize := usage.TotalMemory(mf.TotalSize(), totalUsage)
+ memFree := totalSize - totalUsage
+ if memFree > totalSize {
+ // Underflow.
+ memFree = 0
+ }
// Only a subset of the fields in sysinfo_t make sense to return.
si := linux.Sysinfo{
Procs: uint16(len(t.PIDNamespace().Tasks())),
Uptime: t.Kernel().MonotonicClock().Now().Seconds(),
TotalRAM: totalSize,
- FreeRAM: totalSize - totalUsage,
+ FreeRAM: memFree,
Unit: 1,
}
_, err := t.CopyOut(addr, si)