summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2021-10-18 18:51:04 +0000
committergVisor bot <gvisor-bot@google.com>2021-10-18 18:51:04 +0000
commit6164d91fd2fce418d2620ff8e593900eabdad5b9 (patch)
tree939c46c7ba734c88335e3b28433b1ceb95a33925
parent29477a59b6e57b7c172121852b6cd9411bf95a3d (diff)
parenteafa3f19e4d2c0a490af78dbe77289c7b5edbb76 (diff)
Merge release-20211005.0-53-geafa3f19e (automated)
-rw-r--r--runsc/boot/loader.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/runsc/boot/loader.go b/runsc/boot/loader.go
index 28dbbcf1f..dbb02fdf4 100644
--- a/runsc/boot/loader.go
+++ b/runsc/boot/loader.go
@@ -950,7 +950,7 @@ func (l *Loader) executeAsync(args *control.ExecArgs) (kernel.ThreadID, error) {
if kernel.VFS2Enabled {
// task.MountNamespaceVFS2() does not take a ref, so we must do so ourselves.
args.MountNamespaceVFS2 = tg.Leader().MountNamespaceVFS2()
- if !args.MountNamespaceVFS2.TryIncRef() {
+ if args.MountNamespaceVFS2 == nil || !args.MountNamespaceVFS2.TryIncRef() {
return 0, fmt.Errorf("container %q has stopped", args.ContainerID)
}
} else {