android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ovl: compare inodes

Browse Source 
When checking for consistency in directory operations (unlink, rename,
etc.) match inodes not dentries.

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
This commit is contained in:
Miklos Szeredi 2017-07-04 22:03:16 +02:00
parent 25b7713afe
commit 9020df3720
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/overlayfs/dir.c
View File

@ -611,6 +611,11 @@ static int ovl_link(struct dentry *old, struct inode *newdir,
return err; return err;
} }
static bool ovl_matches_upper(struct dentry *dentry, struct dentry *upper)
{
return d_inode(ovl_dentry_upper(dentry)) == d_inode(upper);
}
static int ovl_remove_and_whiteout(struct dentry *dentry, bool is_dir) static int ovl_remove_and_whiteout(struct dentry *dentry, bool is_dir)
{ {
struct dentry *workdir = ovl_workdir(dentry); struct dentry *workdir = ovl_workdir(dentry);
@ -646,7 +651,7 @@ static int ovl_remove_and_whiteout(struct dentry *dentry, bool is_dir)
err = -ESTALE; err = -ESTALE;
if ((opaquedir && upper != opaquedir) || if ((opaquedir && upper != opaquedir) ||
(!opaquedir && ovl_dentry_upper(dentry) && (!opaquedir && ovl_dentry_upper(dentry) &&
upper != ovl_dentry_upper(dentry))) { !ovl_matches_upper(dentry, upper))) {
goto out_dput_upper; goto out_dput_upper;
} }
@ -707,7 +712,7 @@ static int ovl_remove_upper(struct dentry *dentry, bool is_dir)
err = -ESTALE; err = -ESTALE;
if ((opaquedir && upper != opaquedir) || if ((opaquedir && upper != opaquedir) ||
(!opaquedir && upper != ovl_dentry_upper(dentry))) (!opaquedir && !ovl_matches_upper(dentry, upper)))
goto out_dput_upper; goto out_dput_upper;
if (is_dir) if (is_dir)
@ -985,7 +990,7 @@ static int ovl_rename(struct inode *olddir, struct dentry *old,
goto out_unlock; goto out_unlock;
err = -ESTALE; err = -ESTALE;
if (olddentry != ovl_dentry_upper(old)) if (!ovl_matches_upper(old, olddentry))
goto out_dput_old; goto out_dput_old;
newdentry = lookup_one_len(new->d_name.name, new_upperdir, newdentry = lookup_one_len(new->d_name.name, new_upperdir,
@ -1003,7 +1008,7 @@ static int ovl_rename(struct inode *olddir, struct dentry *old,
if (newdentry != opaquedir) if (newdentry != opaquedir)
goto out_dput; goto out_dput;
} else { } else {
if (newdentry != ovl_dentry_upper(new)) if (!ovl_matches_upper(new, newdentry))
goto out_dput; goto out_dput;
} }
} else { } else {