summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2019-12-20 16:59:14 +0000
committergVisor bot <gvisor-bot@google.com>2019-12-20 16:59:14 +0000
commit50ec3761fdbcae838453770fa6bf8e7e90fe53a6 (patch)
treeda9b5918f4ddf0233818718f5d3e3f468a822a5e /pkg/sentry
parent99cfc711c6999d2c47c2498e8d9a10b4b28e7fcd (diff)
parent822d847ccaa1e6016b818bee289b5e33335f9fee (diff)
Merge release-20191213.0-37-g822d847 (automated)
Diffstat (limited to 'pkg/sentry')
-rwxr-xr-xpkg/sentry/strace/select.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkg/sentry/strace/select.go b/pkg/sentry/strace/select.go
index dea309fda..c77d418e6 100755
--- a/pkg/sentry/strace/select.go
+++ b/pkg/sentry/strace/select.go
@@ -36,6 +36,9 @@ func fdsFromSet(t *kernel.Task, set []byte) []int {
}
func fdSet(t *kernel.Task, nfds int, addr usermem.Addr) string {
+ if nfds < 0 {
+ return fmt.Sprintf("%#x (negative nfds)", addr)
+ }
if addr == 0 {
return "null"
}