From bf0a1af0cb1b62ec9bd0c6a11544d7f2d76ceee7 Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Fri, 22 Jun 2018 19:56:39 +0200
Subject: [PATCH] vm/gvisor: always give vm all caps

runsc can crash on nil deref without any caps.
So give all of them all the time.
---
 vm/gvisor/gvisor.go | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/vm/gvisor/gvisor.go b/vm/gvisor/gvisor.go
index 76cc7c47..a6bc4828 100644
--- a/vm/gvisor/gvisor.go
+++ b/vm/gvisor/gvisor.go
@@ -82,7 +82,15 @@ func (pool *Pool) Create(workdir string, index int) (vmimpl.Instance, error) {
 	osutil.MkdirAll(rootDir)
 	osutil.MkdirAll(bundleDir)
 	osutil.MkdirAll(imageDir)
-	vmConfig := fmt.Sprintf(configTempl, imageDir)
+
+	caps := ""
+	for _, c := range sandboxCaps {
+		if caps != "" {
+			caps += ", "
+		}
+		caps += "\"" + c + "\""
+	}
+	vmConfig := fmt.Sprintf(configTempl, imageDir, caps)
 	if err := osutil.WriteFile(filepath.Join(bundleDir, "config.json"), []byte(vmConfig)); err != nil {
 		return nil, err
 	}
@@ -326,13 +334,20 @@ const initStartMsg = "SYZKALLER INIT STARTED\n"
 const configTempl = `
 {
 	"root": {
-		"path": "%v",
+		"path": "%[1]v",
 		"readonly": true
 	},
 	"process":{
                 "args": ["/init"],
                 "cwd": "/tmp",
-                "env": ["SYZ_GVISOR_PROXY=1"]
+                "env": ["SYZ_GVISOR_PROXY=1"],
+                "capabilities": {
+                	"bounding": [%[2]v],
+                	"effective": [%[2]v],
+                	"inheritable": [%[2]v],
+                	"permitted": [%[2]v],
+                	"ambient": [%[2]v]
+                }
 	}
 }
 `