ovl: use wrapper ovl_revert_creds()

Introduce ovl_revert_creds() wrapper of revert_creds() to
match callers of ovl_override_creds().

Suggested-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@intel.com>
Signed-off-by: Amir Goldstein <amir73il@gmail.com>

diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c
index 2ed6ad641a2069d368438cf3253fe6eac9eabe9f..dafd1c71b977e90b7188241b7cc62162bcb4e62a 100644 (file)
--- a/fs/overlayfs/copy_up.c
+++ b/fs/overlayfs/copy_up.c
@@ -1260,7 +1260,7 @@ static int ovl_copy_up_flags(struct dentry *dentry, int flags)
                dput(parent);
                dput(next);
        }
-       revert_creds(old_cred);
+       ovl_revert_creds(old_cred);
 
        return err;
 }

diff --git a/fs/overlayfs/dir.c b/fs/overlayfs/dir.c
index ab65e98a1defdd0981300b27cdd71d5c7ed0eab4..09db5eb19242fa40c3bdbf753f25935fff7a9119 100644 (file)
--- a/fs/overlayfs/dir.c
+++ b/fs/overlayfs/dir.c
@@ -621,7 +621,7 @@ static int ovl_create_or_link(struct dentry *dentry, struct inode *inode,
                err = ovl_create_over_whiteout(dentry, inode, attr);
 
 out_revert_creds:
-       revert_creds(old_cred);
+       ovl_revert_creds(old_cred);
        return err;
 }
 
@@ -702,7 +702,7 @@ static int ovl_set_link_redirect(struct dentry *dentry)
 
        old_cred = ovl_override_creds(dentry->d_sb);
        err = ovl_set_redirect(dentry, false);
-       revert_creds(old_cred);
+       ovl_revert_creds(old_cred);
 
        return err;
 }
@@ -912,7 +912,7 @@ static int ovl_do_remove(struct dentry *dentry, bool is_dir)
                err = ovl_remove_upper(dentry, is_dir, &list);
        else
                err = ovl_remove_and_whiteout(dentry, &list);
-       revert_creds(old_cred);
+       ovl_revert_creds(old_cred);
        if (!err) {
                if (is_dir)
                        clear_nlink(dentry->d_inode);
@@ -1292,7 +1292,7 @@ out_dput_old:
 out_unlock:
        unlock_rename(new_upperdir, old_upperdir);
 out_revert_creds:
-       revert_creds(old_cred);
+       ovl_revert_creds(old_cred);
        if (update_nlink)
                ovl_nlink_end(new);
        else
@@ -1337,7 +1337,7 @@ static int ovl_create_tmpfile(struct file *file, struct dentry *dentry,
                fput(realfile);
        }
 out_revert_creds:
-       revert_creds(old_cred);
+       ovl_revert_creds(old_cred);
        return err;
 }
 

diff --git a/fs/overlayfs/file.c b/fs/overlayfs/file.c
index 12c4d502ff916a1adb7d71a902a6c7a8727fb996..608a88ff8d8137814c61f3b810b1290c2f5db945 100644 (file)
--- a/fs/overlayfs/file.c
+++ b/fs/overlayfs/file.c
@@ -51,7 +51,7 @@ static struct file *ovl_open_realfile(const struct file *file,
                realfile = backing_file_open(&file->f_path, flags, realpath,
                                             current_cred());
        }
-       revert_creds(old_cred);
+       ovl_revert_creds(old_cred);
 
        pr_debug("open(%p[%pD2/%c], 0%o) -> (%p, 0%o)\n",
                 file, file, ovl_whatisit(inode, realinode), file->f_flags,
@@ -215,7 +215,7 @@ static loff_t ovl_llseek(struct file *file, loff_t offset, int whence)
 
        old_cred = ovl_override_creds(inode->i_sb);
        ret = vfs_llseek(fd_file(real), offset, whence);
-       revert_creds(old_cred);
+       ovl_revert_creds(old_cred);
 
        file->f_pos = fd_file(real)->f_pos;
        ovl_inode_unlock(inode);
@@ -412,7 +412,7 @@ static int ovl_fsync(struct file *file, loff_t start, loff_t end, int datasync)
        if (file_inode(fd_file(real)) == ovl_inode_upper(file_inode(file))) {
                old_cred = ovl_override_creds(file_inode(file)->i_sb);
                ret = vfs_fsync_range(fd_file(real), start, end, datasync);
-               revert_creds(old_cred);
+               ovl_revert_creds(old_cred);
        }
 
        fdput(real);
@@ -451,7 +451,7 @@ static long ovl_fallocate(struct file *file, int mode, loff_t offset, loff_t len
 
        old_cred = ovl_override_creds(file_inode(file)->i_sb);
        ret = vfs_fallocate(fd_file(real), mode, offset, len);
-       revert_creds(old_cred);
+       ovl_revert_creds(old_cred);
 
        /* Update size */
        ovl_file_modified(file);
@@ -476,7 +476,7 @@ static int ovl_fadvise(struct file *file, loff_t offset, loff_t len, int advice)
 
        old_cred = ovl_override_creds(file_inode(file)->i_sb);
        ret = vfs_fadvise(fd_file(real), offset, len, advice);
-       revert_creds(old_cred);
+       ovl_revert_creds(old_cred);
 
        fdput(real);
 
@@ -535,7 +535,7 @@ static loff_t ovl_copyfile(struct file *file_in, loff_t pos_in,
                                                flags);
                break;
        }
-       revert_creds(old_cred);
+       ovl_revert_creds(old_cred);
 
        /* Update size */
        ovl_file_modified(file_out);
@@ -597,7 +597,7 @@ static int ovl_flush(struct file *file, fl_owner_t id)
        if (fd_file(real)->f_op->flush) {
                old_cred = ovl_override_creds(file_inode(file)->i_sb);
                err = fd_file(real)->f_op->flush(fd_file(real), id);
-               revert_creds(old_cred);
+               ovl_revert_creds(old_cred);
        }
        fdput(real);
 

diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c
index baa54c718bd7224b6d6909532661a682824f0a12..a3798040532ab0c8e477cd63529548c21866b706 100644 (file)
--- a/fs/overlayfs/inode.c
+++ b/fs/overlayfs/inode.c
@@ -80,7 +80,7 @@ int ovl_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
                inode_lock(upperdentry->d_inode);
                old_cred = ovl_override_creds(dentry->d_sb);
                err = ovl_do_notify_change(ofs, upperdentry, attr);
-               revert_creds(old_cred);
+               ovl_revert_creds(old_cred);
                if (!err)
                        ovl_copyattr(dentry->d_inode);
                inode_unlock(upperdentry->d_inode);
@@ -280,7 +280,7 @@ int ovl_getattr(struct mnt_idmap *idmap, const struct path *path,
                stat->nlink = dentry->d_inode->i_nlink;
 
 out:
-       revert_creds(old_cred);
+       ovl_revert_creds(old_cred);
 
        return err;
 }
@@ -317,7 +317,7 @@ int ovl_permission(struct mnt_idmap *idmap,
                mask |= MAY_READ;
        }
        err = inode_permission(mnt_idmap(realpath.mnt), realinode, mask);
-       revert_creds(old_cred);
+       ovl_revert_creds(old_cred);
 
        return err;
 }
@@ -334,7 +334,7 @@ static const char *ovl_get_link(struct dentry *dentry,
 
        old_cred = ovl_override_creds(dentry->d_sb);
        p = vfs_get_link(ovl_dentry_real(dentry), done);
-       revert_creds(old_cred);
+       ovl_revert_creds(old_cred);
        return p;
 }
 
@@ -469,7 +469,7 @@ struct posix_acl *do_ovl_get_acl(struct mnt_idmap *idmap,
 
                old_cred = ovl_override_creds(inode->i_sb);
                acl = ovl_get_acl_path(&realpath, posix_acl_xattr_name(type), noperm);
-               revert_creds(old_cred);
+               ovl_revert_creds(old_cred);
        }
 
        return acl;
@@ -498,7 +498,7 @@ static int ovl_set_or_remove_acl(struct dentry *dentry, struct inode *inode,
                old_cred = ovl_override_creds(dentry->d_sb);
                real_acl = vfs_get_acl(mnt_idmap(realpath.mnt), realdentry,
                                       acl_name);
-               revert_creds(old_cred);
+               ovl_revert_creds(old_cred);
                if (IS_ERR(real_acl)) {
                        err = PTR_ERR(real_acl);
                        goto out;
@@ -523,7 +523,7 @@ static int ovl_set_or_remove_acl(struct dentry *dentry, struct inode *inode,
                err = ovl_do_set_acl(ofs, realdentry, acl_name, acl);
        else
                err = ovl_do_remove_acl(ofs, realdentry, acl_name);
-       revert_creds(old_cred);
+       ovl_revert_creds(old_cred);
        ovl_drop_write(dentry);
 
        /* copy c/mtime */
@@ -600,7 +600,7 @@ static int ovl_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
 
        old_cred = ovl_override_creds(inode->i_sb);
        err = realinode->i_op->fiemap(realinode, fieinfo, start, len);
-       revert_creds(old_cred);
+       ovl_revert_creds(old_cred);
 
        return err;
 }
@@ -676,7 +676,7 @@ int ovl_fileattr_set(struct mnt_idmap *idmap,
                err = ovl_set_protattr(inode, upperpath.dentry, fa);
                if (!err)
                        err = ovl_real_fileattr_set(&upperpath, fa);
-               revert_creds(old_cred);
+               ovl_revert_creds(old_cred);
                ovl_drop_write(dentry);
 
                /*
@@ -738,7 +738,7 @@ int ovl_fileattr_get(struct dentry *dentry, struct fileattr *fa)
        old_cred = ovl_override_creds(inode->i_sb);
        err = ovl_real_fileattr_get(&realpath, fa);
        ovl_fileattr_prot_flags(inode, fa);
-       revert_creds(old_cred);
+       ovl_revert_creds(old_cred);
 
        return err;
 }

diff --git a/fs/overlayfs/namei.c b/fs/overlayfs/namei.c
index 5764f91d283e7027e2ca075057242968c1016455..7e27b7d4adee8f471d9658579ec0e8c37b4d5f74 100644 (file)
--- a/fs/overlayfs/namei.c
+++ b/fs/overlayfs/namei.c
@@ -961,7 +961,7 @@ static int ovl_maybe_validate_verity(struct dentry *dentry)
                if (err == 0)
                        ovl_set_flag(OVL_VERIFIED_DIGEST, inode);
 
-               revert_creds(old_cred);
+               ovl_revert_creds(old_cred);
        }
 
        ovl_inode_unlock(inode);
@@ -995,7 +995,7 @@ static int ovl_maybe_lookup_lowerdata(struct dentry *dentry)
 
        old_cred = ovl_override_creds(dentry->d_sb);
        err = ovl_lookup_data_layers(dentry, redirect, &datapath);
-       revert_creds(old_cred);
+       ovl_revert_creds(old_cred);
        if (err)
                goto out_err;
 
@@ -1342,7 +1342,7 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
 
        ovl_dentry_init_reval(dentry, upperdentry, OVL_I_E(inode));
 
-       revert_creds(old_cred);
+       ovl_revert_creds(old_cred);
        if (origin_path) {
                dput(origin_path->dentry);
                kfree(origin_path);
@@ -1366,7 +1366,7 @@ out_put_upper:
        kfree(upperredirect);
 out:
        kfree(d.redirect);
-       revert_creds(old_cred);
+       ovl_revert_creds(old_cred);
        return ERR_PTR(err);
 }
 
@@ -1423,7 +1423,7 @@ bool ovl_lower_positive(struct dentry *dentry)
                        dput(this);
                }
        }
-       revert_creds(old_cred);
+       ovl_revert_creds(old_cred);
 
        return positive;
 }

diff --git a/fs/overlayfs/overlayfs.h b/fs/overlayfs/overlayfs.h
index 0bfe35da4b7b7a92b032a26369ae0d89c014bad3..7b7a6e3a43e2ba4fdffb7a559b00863feaa62abf 100644 (file)
--- a/fs/overlayfs/overlayfs.h
+++ b/fs/overlayfs/overlayfs.h
@@ -429,6 +429,7 @@ int ovl_want_write(struct dentry *dentry);
 void ovl_drop_write(struct dentry *dentry);
 struct dentry *ovl_workdir(struct dentry *dentry);
 const struct cred *ovl_override_creds(struct super_block *sb);
+void ovl_revert_creds(const struct cred *old_cred);
 
 static inline const struct cred *ovl_creds(struct super_block *sb)
 {

diff --git a/fs/overlayfs/readdir.c b/fs/overlayfs/readdir.c
index 0ca8af060b0c194e5824e59b59d9d2dc8b051355..881ec5592da52dfb27a588496582e7084b2fbd3b 100644 (file)
--- a/fs/overlayfs/readdir.c
+++ b/fs/overlayfs/readdir.c
@@ -290,7 +290,7 @@ static int ovl_check_whiteouts(const struct path *path, struct ovl_readdir_data
                }
                inode_unlock(dir->d_inode);
        }
-       revert_creds(old_cred);
+       ovl_revert_creds(old_cred);
 
        return err;
 }
@@ -808,7 +808,7 @@ static int ovl_iterate(struct file *file, struct dir_context *ctx)
        }
        err = 0;
 out:
-       revert_creds(old_cred);
+       ovl_revert_creds(old_cred);
        return err;
 }
 
@@ -860,7 +860,7 @@ static struct file *ovl_dir_open_realfile(const struct file *file,
 
        old_cred = ovl_override_creds(file_inode(file)->i_sb);
        res = ovl_path_open(realpath, O_RDONLY | (file->f_flags & O_LARGEFILE));
-       revert_creds(old_cred);
+       ovl_revert_creds(old_cred);
 
        return res;
 }
@@ -987,7 +987,7 @@ int ovl_check_empty_dir(struct dentry *dentry, struct list_head *list)
 
        old_cred = ovl_override_creds(dentry->d_sb);
        err = ovl_dir_read_merged(dentry, list, &root);
-       revert_creds(old_cred);
+       ovl_revert_creds(old_cred);
        if (err)
                return err;
 

diff --git a/fs/overlayfs/util.c b/fs/overlayfs/util.c
index edc9216f6e27ad2aad3b83e73ca6e7e6f6df9c0c..9408046f4f417f87b61f2a01975b5f2255d96334 100644 (file)
--- a/fs/overlayfs/util.c
+++ b/fs/overlayfs/util.c
@@ -68,6 +68,11 @@ const struct cred *ovl_override_creds(struct super_block *sb)
        return override_creds(ofs->creator_cred);
 }
 
+void ovl_revert_creds(const struct cred *old_cred)
+{
+       revert_creds(old_cred);
+}
+
 /*
  * Check if underlying fs supports file handles and try to determine encoding
  * type, in order to deduce maximum inode number used by fs.
@@ -1178,7 +1183,7 @@ int ovl_nlink_start(struct dentry *dentry)
         * value relative to the upper inode nlink in an upper inode xattr.
         */
        err = ovl_set_nlink_upper(dentry);
-       revert_creds(old_cred);
+       ovl_revert_creds(old_cred);
        if (err)
                goto out_drop_write;
 
@@ -1203,7 +1208,7 @@ void ovl_nlink_end(struct dentry *dentry)
 
                old_cred = ovl_override_creds(dentry->d_sb);
                ovl_cleanup_index(dentry);
-               revert_creds(old_cred);
+               ovl_revert_creds(old_cred);
        }
 
        ovl_inode_unlock(inode);

diff --git a/fs/overlayfs/xattrs.c b/fs/overlayfs/xattrs.c
index 383978e4663c2aec42a694e609ff32177ba24ed4..88055deca9360fd389e8fbc6dd4b3555baed2202 100644 (file)
--- a/fs/overlayfs/xattrs.c
+++ b/fs/overlayfs/xattrs.c
@@ -47,7 +47,7 @@ static int ovl_xattr_set(struct dentry *dentry, struct inode *inode, const char
                ovl_path_lower(dentry, &realpath);
                old_cred = ovl_override_creds(dentry->d_sb);
                err = vfs_getxattr(mnt_idmap(realpath.mnt), realdentry, name, NULL, 0);
-               revert_creds(old_cred);
+               ovl_revert_creds(old_cred);
                if (err < 0)
                        goto out;
        }
@@ -72,7 +72,7 @@ static int ovl_xattr_set(struct dentry *dentry, struct inode *inode, const char
                WARN_ON(flags != XATTR_REPLACE);
                err = ovl_do_removexattr(ofs, realdentry, name);
        }
-       revert_creds(old_cred);
+       ovl_revert_creds(old_cred);
        ovl_drop_write(dentry);
 
        /* copy c/mtime */
@@ -91,7 +91,7 @@ static int ovl_xattr_get(struct dentry *dentry, struct inode *inode, const char
        ovl_i_path_real(inode, &realpath);
        old_cred = ovl_override_creds(dentry->d_sb);
        res = vfs_getxattr(mnt_idmap(realpath.mnt), realpath.dentry, name, value, size);
-       revert_creds(old_cred);
+       ovl_revert_creds(old_cred);
        return res;
 }
 
@@ -121,7 +121,7 @@ ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size)
 
        old_cred = ovl_override_creds(dentry->d_sb);
        res = vfs_listxattr(realdentry, list, size);
-       revert_creds(old_cred);
+       ovl_revert_creds(old_cred);
        if (res <= 0 || size == 0)
                return res;
 
@@ -268,4 +268,3 @@ const struct xattr_handler * const *ovl_xattr_handlers(struct ovl_fs *ofs)
        return ofs->config.userxattr ? ovl_user_xattr_handlers :
                ovl_trusted_xattr_handlers;
 }
-