Merge pull request #3939 from buildkite/fix-restore-umask-always

DrJosh9000 · web-flow · commit 494405cf56ae · 2026-05-25T11:54:58.000+10:00
fix: Always restore process umask
diff --git a/kubernetes/runner.go b/kubernetes/runner.go
@@ -87,10 +87,13 @@ func (r *Runner) Run(ctx context.Context) error {
 	}
 	r.mux.Handle(rpc.DefaultRPCPath, r.server)
 
-	oldUmask, err := Umask(0) // set umask of socket file to 0o777 (world read-write-executable)
+	// Set umask to 0, so the socket is created with mode 0o777 (world
+	// read-write-executable)
+	oldUmask, err := Umask(0)
 	if err != nil {
 		return fmt.Errorf("failed to set socket umask: %w", err)
 	}
+	defer Umask(oldUmask) //nolint:errcheck // Best-effort cleanup on failure
 	l, err := (&net.ListenConfig{}).Listen(ctx, "unix", r.conf.SocketPath)
 	if err != nil {
 		return fmt.Errorf("failed to listen: %w", err)

Original file line number	Diff line number	Diff line change
`@@ -87,10 +87,13 @@ func (r *Runner) Run(ctx context.Context) error {`
`87`	`87`	`}`
`88`	`88`	`r.mux.Handle(rpc.DefaultRPCPath, r.server)`
`89`	`89`
`90`		`- oldUmask, err := Umask(0) // set umask of socket file to 0o777 (world read-write-executable)`
	`90`	`+ // Set umask to 0, so the socket is created with mode 0o777 (world`
	`91`	`+ // read-write-executable)`
	`92`	`+ oldUmask, err := Umask(0)`
`91`	`93`	`if err != nil {`
`92`	`94`	`return fmt.Errorf("failed to set socket umask: %w", err)`
`93`	`95`	`}`
	`96`	`+ defer Umask(oldUmask) //nolint:errcheck // Best-effort cleanup on failure`
`94`	`97`	`l, err := (&net.ListenConfig{}).Listen(ctx, "unix", r.conf.SocketPath)`
`95`	`98`	`if err != nil {`
`96`	`99`	`return fmt.Errorf("failed to listen: %w", err)`