diff --git a/net/dns/manager_windows.go b/net/dns/manager_windows.go index 56ab32f45..4c05b7718 100644 --- a/net/dns/manager_windows.go +++ b/net/dns/manager_windows.go @@ -51,12 +51,14 @@ func NewOSConfigurator(logf logger.Logf, interfaceName string) (OSConfigurator, ret.nrptDB = newNRPTRuleDatabase(logf) } - // Log WSL status once at startup. - if distros, err := wslDistros(); err != nil { - logf("WSL: could not list distributions: %v", err) - } else { - logf("WSL: found %d distributions", len(distros)) - } + go func() { + // Log WSL status once at startup. + if distros, err := wslDistros(); err != nil { + logf("WSL: could not list distributions: %v", err) + } else { + logf("WSL: found %d distributions", len(distros)) + } + }() return ret, nil } diff --git a/net/dns/wsl_windows.go b/net/dns/wsl_windows.go index 8990fdcc7..90632ce5f 100644 --- a/net/dns/wsl_windows.go +++ b/net/dns/wsl_windows.go @@ -5,6 +5,7 @@ import ( "bytes" + "context" "errors" "fmt" "os" @@ -12,6 +13,7 @@ "os/user" "strings" "syscall" + "time" "golang.org/x/sys/windows" "tailscale.com/types/logger" @@ -20,7 +22,13 @@ // wslDistros reports the names of the installed WSL2 linux distributions. func wslDistros() ([]string, error) { - b, err := wslCombinedOutput(exec.Command("wsl.exe", "-l")) + // There is a bug in some builds of wsl.exe that causes it to block + // indefinitely while executing this operation. Set a timeout so that we don't + // get wedged! (Issue #7476) + ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) + defer cancel() + + b, err := wslCombinedOutput(exec.CommandContext(ctx, "wsl.exe", "-l")) if err != nil { return nil, fmt.Errorf("%v: %q", err, string(b)) }