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/fs | |
| parent | f718bf54abb46b65c4000497b3f24a628c5fb7ea (diff) | |
| parent | 239a07aabfad8991556b43c85c30270d09353f86 (diff) | |
Merge release-20190806.1-145-g239a07a (automated)
Diffstat (limited to 'pkg/sentry/fs')
| -rw-r--r-- | pkg/sentry/fs/dirent.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkg/sentry/fs/dirent.go b/pkg/sentry/fs/dirent.go index fbca06761..3cb73bd78 100644 --- a/pkg/sentry/fs/dirent.go +++ b/pkg/sentry/fs/dirent.go @@ -1126,7 +1126,7 @@ func (d *Dirent) unmount(ctx context.Context, replacement *Dirent) error { // Remove removes the given file or symlink. The root dirent is used to // resolve name, and must not be nil. -func (d *Dirent) Remove(ctx context.Context, root *Dirent, name string) error { +func (d *Dirent) Remove(ctx context.Context, root *Dirent, name string, dirPath bool) error { // Check the root. if root == nil { panic("Dirent.Remove: root must not be nil") @@ -1151,6 +1151,8 @@ func (d *Dirent) Remove(ctx context.Context, root *Dirent, name string) error { // Remove cannot remove directories. if IsDir(child.Inode.StableAttr) { return syscall.EISDIR + } else if dirPath { + return syscall.ENOTDIR } // Remove cannot remove a mount point. |