diff --git a/src/os/root_openat.go b/src/os/root_openat.go index 6591825648..f67794cd72 100644 --- a/src/os/root_openat.go +++ b/src/os/root_openat.go @@ -226,6 +226,9 @@ func doInRoot[T any](r *Root, name string, f func(parent sysfdType, name string) return ret, errPathEscapes } parts = slices.Delete(parts, i-count, end) + if len(parts) == 0 { + parts = []string{"."} + } i = 0 if dirfd != rootfd { syscall.Close(dirfd) diff --git a/src/os/root_test.go b/src/os/root_test.go index 7db8ce0e58..7b8eae03a1 100644 --- a/src/os/root_test.go +++ b/src/os/root_test.go @@ -1596,6 +1596,33 @@ func TestRootRaceRenameDir(t *testing.T) { } } +func TestRootSymlinkToRoot(t *testing.T) { + dir := makefs(t, []string{ + "d/d => ..", + }) + root, err := os.OpenRoot(dir) + if err != nil { + t.Fatal(err) + } + defer root.Close() + if err := root.Mkdir("d/d/new", 0777); err != nil { + t.Fatal(err) + } + f, err := root.Open("d/d") + if err != nil { + t.Fatal(err) + } + defer f.Close() + names, err := f.Readdirnames(-1) + if err != nil { + t.Fatal(err) + } + slices.Sort(names) + if got, want := names, []string{"d", "new"}; !slices.Equal(got, want) { + t.Errorf("root contains: %q, want %q", got, want) + } +} + func TestOpenInRoot(t *testing.T) { dir := makefs(t, []string{ "file",