netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix mount namespace ref leak during executeAsync() when ResolveEnvs() fails.

Browse Source 
Fixes 7e462a1c7f ("OCI spec may contain duplicate environment variables").

PiperOrigin-RevId: 637033998
This commit is contained in:
Ayush Ranjan
2024-05-24 14:28:51 -07:00
committed by gVisor bot
parent f52d36ccc2
commit a244eff8ad
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runsc/boot/loader.go
+5 -5
View File
@@ -1230,6 +1230,11 @@ func (l *Loader) executeAsync(args *control.ExecArgs) (kernel.ThreadID, error) {
if args.MountNamespace == nil || !args.MountNamespace.TryIncRef() {
return 0, fmt.Errorf("container %q has stopped", args.ContainerID)
}
sctx := l.k.SupervisorContext()
root := args.MountNamespace.Root(sctx)
defer root.DecRef(sctx)
ctx := vfs.WithRoot(sctx, root)
defer args.MountNamespace.DecRef(ctx)
args.Envv, err = specutils.ResolveEnvs(args.Envv)
if err != nil {
@@ -1237,11 +1242,6 @@ func (l *Loader) executeAsync(args *control.ExecArgs) (kernel.ThreadID, error) {
}
// Add the HOME environment variable if it is not already set.
sctx := l.k.SupervisorContext()
root := args.MountNamespace.Root(sctx)
defer root.DecRef(sctx)
ctx := vfs.WithRoot(sctx, root)
defer args.MountNamespace.DecRef(ctx)
args.Envv, err = user.MaybeAddExecUserHome(ctx, args.MountNamespace, args.KUID, args.Envv)
if err != nil {
return 0, err