summaryrefslogtreecommitdiffhomepage
path: root/runsc/container
diff options
context:
space:
mode:
authorTing-Yu Wang <anivia@google.com>2021-02-05 17:25:35 -0800
committergVisor bot <gvisor-bot@google.com>2021-02-05 17:28:01 -0800
commit120c8e34687129c919ae45263c14b239a0a5d343 (patch)
treeb684a6e57c6d291c7d7b528c36c9ef9844dd6e3b /runsc/container
parent09afd68326898f783927c65f86f813d815d8c16c (diff)
Replace TaskFromContext(ctx).Kernel() with KernelFromContext(ctx)
Panic seen at some code path like control.ExecAsync where ctx does not have a Task. Reported-by: syzbot+55ce727161cf94a7b7d6@syzkaller.appspotmail.com PiperOrigin-RevId: 355960596
Diffstat (limited to 'runsc/container')
-rw-r--r--runsc/container/container_test.go22
1 files changed, 22 insertions, 0 deletions
diff --git a/runsc/container/container_test.go b/runsc/container/container_test.go
index d50bbcd9f..129478505 100644
--- a/runsc/container/container_test.go
+++ b/runsc/container/container_test.go
@@ -777,6 +777,28 @@ func TestExec(t *testing.T) {
}
})
}
+
+ // Test for exec failure with an non-existent file.
+ t.Run("nonexist", func(t *testing.T) {
+ // b/179114837 found by Syzkaller that causes nil pointer panic when
+ // trying to dec-ref an unix socket FD.
+ fds, err := syscall.Socketpair(syscall.AF_UNIX, syscall.SOCK_STREAM, 0)
+ if err != nil {
+ t.Fatal(err)
+ }
+ defer syscall.Close(fds[0])
+
+ _, err = cont.executeSync(&control.ExecArgs{
+ Argv: []string{"/nonexist"},
+ FilePayload: urpc.FilePayload{
+ Files: []*os.File{os.NewFile(uintptr(fds[1]), "sock")},
+ },
+ })
+ want := "failed to load /nonexist"
+ if err == nil || !strings.Contains(err.Error(), want) {
+ t.Errorf("executeSync: want err containing %q; got err = %q", want, err)
+ }
+ })
})
}
}