netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

DecRef replaced dirent in inode_overlay.

Browse Source 
PiperOrigin-RevId: 236352158
Change-Id: Ide5104620999eaef6820917505e7299c7b0c5a03
This commit is contained in:
Nicolas Lacasse
2019-03-01 11:58:59 -08:00
committed by Shentubot
parent 3dbd4a16f8
commit 9177bcd0ba
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/sentry/fs/inode_overlay.go
+18 -10
View File
@@ -336,18 +336,26 @@ func overlayRename(ctx context.Context, o *overlayEntry, oldParent *Dirent, rena
if err != nil && err != syserror.ENOENT {
return err
}
if err == nil && !replaced.IsNegative() && IsDir(replaced.Inode.StableAttr) {
children, err := readdirOne(ctx, replaced)
if err != nil {
return err
if err == nil {
// NOTE: We must drop the reference on replaced before we make
// the rename call. For that reason we can't use defer.
if !replaced.IsNegative() && IsDir(replaced.Inode.StableAttr) {
children, err := readdirOne(ctx, replaced)
if err != nil {
replaced.DecRef()
return err
}
// readdirOne ensures that "." and ".." are not
// included among the returned children, so we don't
// need to bother checking for them.
if len(children) > 0 {
replaced.DecRef()
return syserror.ENOTEMPTY
}
}
// readdirOne ensures that "." and ".." are not
// included among the returned children, so we don't
// need to bother checking for them.
if len(children) > 0 {
return syserror.ENOTEMPTY
}
replaced.DecRef()
}
if err := copyUpLockedForRename(ctx, renamed); err != nil {
return err