diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-09-14 04:47:07 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-09-14 04:47:07 +0000 |
| commit | c0e0b502737cb57e9b6bbd5a3fe665970360f9f8 (patch) | |
| tree | fc68bf2e797e576ec40f855cae5d20f1e27eb679 /pkg/sentry/syscalls/linux | |
| parent | f718bf54abb46b65c4000497b3f24a628c5fb7ea (diff) | |
| parent | 239a07aabfad8991556b43c85c30270d09353f86 (diff) | |
Merge release-20190806.1-145-g239a07a (automated)
Diffstat (limited to 'pkg/sentry/syscalls/linux')
| -rw-r--r-- | pkg/sentry/syscalls/linux/sys_file.go | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/pkg/sentry/syscalls/linux/sys_file.go b/pkg/sentry/syscalls/linux/sys_file.go index 2e00a91ce..b9a8e3e21 100644 --- a/pkg/sentry/syscalls/linux/sys_file.go +++ b/pkg/sentry/syscalls/linux/sys_file.go @@ -1423,9 +1423,6 @@ func unlinkAt(t *kernel.Task, dirFD int32, addr usermem.Addr) error { if err != nil { return err } - if dirPath { - return syserror.ENOENT - } return fileOpAt(t, dirFD, path, func(root *fs.Dirent, d *fs.Dirent, name string, _ uint) error { if !fs.IsDir(d.Inode.StableAttr) { @@ -1436,7 +1433,7 @@ func unlinkAt(t *kernel.Task, dirFD int32, addr usermem.Addr) error { return err } - return d.Remove(t, root, name) + return d.Remove(t, root, name, dirPath) }) } |