diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-07-31 23:11:33 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-07-31 23:11:33 +0000 |
| commit | f2ba17db33d7d3c92d622204f58308eb0a85584b (patch) | |
| tree | b14a40db321ff0ab4832e1c0936d2c8bcf86ef60 /pkg/sentry/fdimport | |
| parent | edbaf6199dae93eae2d38347e0e10e4c0efa2bc1 (diff) | |
| parent | a7d9aa6d5bfbed11c94578c6a2eb04ce75cbdbe5 (diff) | |
Merge release-20200622.1-300-ga7d9aa6d5 (automated)
Diffstat (limited to 'pkg/sentry/fdimport')
| -rw-r--r-- | pkg/sentry/fdimport/fdimport.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkg/sentry/fdimport/fdimport.go b/pkg/sentry/fdimport/fdimport.go index a4199f9e9..b8686adb4 100644 --- a/pkg/sentry/fdimport/fdimport.go +++ b/pkg/sentry/fdimport/fdimport.go @@ -15,6 +15,8 @@ package fdimport import ( + "fmt" + "gvisor.dev/gvisor/pkg/context" "gvisor.dev/gvisor/pkg/sentry/fs" "gvisor.dev/gvisor/pkg/sentry/fs/host" @@ -84,6 +86,9 @@ func importFS(ctx context.Context, fdTable *kernel.FDTable, console bool, fds [] func importVFS2(ctx context.Context, fdTable *kernel.FDTable, console bool, stdioFDs []int) (*hostvfs2.TTYFileDescription, error) { k := kernel.KernelFromContext(ctx) + if k == nil { + return nil, fmt.Errorf("cannot find kernel from context") + } var ttyFile *vfs.FileDescription for appFD, hostFD := range stdioFDs { |