diff options
| author | nybidari <59618317+nybidari@users.noreply.github.com> | 2020-02-25 15:33:59 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-25 15:33:59 -0800 |
| commit | 818abc2bd5096bf7dc6f621cfd2923bee4e0fc7b (patch) | |
| tree | 0f7f90cecb6afc332a3229651eba4da391a46b41 /pkg/sentry/fs/mount_test.go | |
| parent | acc405ba60834f5dce9ce04cd762d5cda02224cb (diff) | |
| parent | 72e3f3a3eef3a1dc02db0ff71f98a5d7fe89a6e3 (diff) | |
Merge branch 'master' into iptables
Diffstat (limited to 'pkg/sentry/fs/mount_test.go')
| -rw-r--r-- | pkg/sentry/fs/mount_test.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkg/sentry/fs/mount_test.go b/pkg/sentry/fs/mount_test.go index e672a438c..a3d10770b 100644 --- a/pkg/sentry/fs/mount_test.go +++ b/pkg/sentry/fs/mount_test.go @@ -36,11 +36,12 @@ func mountPathsAre(root *Dirent, got []*Mount, want ...string) error { gotPaths := make(map[string]struct{}, len(got)) gotStr := make([]string, len(got)) for i, g := range got { - groot := g.Root() - name, _ := groot.FullName(root) - groot.DecRef() - gotStr[i] = name - gotPaths[name] = struct{}{} + if groot := g.Root(); groot != nil { + name, _ := groot.FullName(root) + groot.DecRef() + gotStr[i] = name + gotPaths[name] = struct{}{} + } } if len(got) != len(want) { return fmt.Errorf("mount paths are different, got: %q, want: %q", gotStr, want) |