Skip to content

Commit e566bff

Browse files
committed
ovl: port ovl_create_or_link() to new ovl_override_creator_creds cleanup guard
This clearly indicates the double-credential override and makes the code a lot easier to grasp with one glance. Link: https://patch.msgid.link/20251117-work-ovl-cred-guard-prepare-v2-5-bd1c97a36d7b@kernel.org Reviewed-by: Amir Goldstein <amir73il@gmail.com> Signed-off-by: Christian Brauner <brauner@kernel.org>
1 parent 8a227c2 commit e566bff

1 file changed

Lines changed: 6 additions & 7 deletions

File tree

fs/overlayfs/dir.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -664,10 +664,9 @@ static int ovl_create_or_link(struct dentry *dentry, struct inode *inode,
664664
struct ovl_cattr *attr, bool origin)
665665
{
666666
int err;
667-
const struct cred *new_cred __free(put_cred) = NULL;
668667
struct dentry *parent = dentry->d_parent;
669668

670-
scoped_class(override_creds_ovl, old_cred, dentry->d_sb) {
669+
with_ovl_creds(dentry->d_sb) {
671670
/*
672671
* When linking a file with copy up origin into a new parent, mark the
673672
* new parent dir "impure".
@@ -695,11 +694,11 @@ static int ovl_create_or_link(struct dentry *dentry, struct inode *inode,
695694
if (attr->hardlink)
696695
return ovl_create_handle_whiteouts(dentry, inode, attr);
697696

698-
new_cred = ovl_setup_cred_for_create(dentry, inode, attr->mode, old_cred);
699-
if (IS_ERR(new_cred))
700-
return PTR_ERR(new_cred);
701-
702-
return ovl_create_handle_whiteouts(dentry, inode, attr);
697+
scoped_class(ovl_override_creator_creds, cred, dentry, inode, attr->mode) {
698+
if (IS_ERR(cred))
699+
return PTR_ERR(cred);
700+
return ovl_create_handle_whiteouts(dentry, inode, attr);
701+
}
703702
}
704703
return err;
705704
}

0 commit comments

Comments
 (0)