do not set empty $HOME

Make sure to not set an empty $HOME for containers and let it default to "/". containers/crun#599 is required to fully address containers#9378. Partially-Fixes: containers#9378 Signed-off-by: Valentin Rothberg <[email protected]> <MH: Fixed cherry-pick conflicts> Signed-off-by: Matthew Heon <[email protected]>
mheon · Feb 18, 2021 · 32350c7 · 32350c7
1 parent bddbe98
commit 32350c7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go
@@ -457,7 +457,7 @@ func (c *Container) generateSpec(ctx context.Context) (*spec.Spec, error) {
 			break
 		}
 	}
-	if !hasHomeSet {
+	if !hasHomeSet && execUser.Home != "" {
 		c.config.Spec.Process.Env = append(c.config.Spec.Process.Env, fmt.Sprintf("HOME=%s", execUser.Home))
 	}
 

diff --git a/test/system/030-run.bats b/test/system/030-run.bats
@@ -623,4 +623,10 @@ json-file | f
     fi
 }
 
+@test "podman run - do not set empty HOME" {
+    # Regression test for #9378.
+    run_podman run --rm --user 100 $IMAGE printenv
+    is "$output" ".*HOME=/.*"
+}
+
 # vim: filetype=sh
-Original file line number
+Diff line change
@@ Expand Up @@
     			break
     		}
     	}
-    	if !hasHomeSet {
+    	if !hasHomeSet && execUser.Home != "" {
     		c.config.Spec.Process.Env = append(c.config.Spec.Process.Env, fmt.Sprintf("HOME=%s", execUser.Home))
     	}
@@ Expand Down @@