Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[cascardo/linux.git] / fs / overlayfs / dir.c

diff --git a/fs/overlayfs/dir.c b/fs/overlayfs/dir.c
index 480fc78..5f90ddf 100644 (file)
--- a/fs/overlayfs/dir.c
+++ b/fs/overlayfs/dir.c
@@ -489,6 +489,15 @@ static int ovl_create_or_link(struct dentry *dentry, struct inode *inode,
        if (override_cred) {
                override_cred->fsuid = inode->i_uid;
                override_cred->fsgid = inode->i_gid;
        if (override_cred) {
                override_cred->fsuid = inode->i_uid;
                override_cred->fsgid = inode->i_gid;

+               if (!hardlink) {
+                       err = security_dentry_create_files_as(dentry,
+                                       stat->mode, &dentry->d_name, old_cred,
+                                       override_cred);
+                       if (err) {
+                               put_cred(override_cred);
+                               goto out_revert_creds;
+                       }
+               }

                put_cred(override_creds(override_cred));
                put_cred(override_cred);
 
                put_cred(override_creds(override_cred));
                put_cred(override_cred);
 


@@ -499,6 +508,7 @@ static int ovl_create_or_link(struct dentry *dentry, struct inode *inode,
                        err = ovl_create_over_whiteout(dentry, inode, stat,
                                                        link, hardlink);
        }
                        err = ovl_create_over_whiteout(dentry, inode, stat,
                                                        link, hardlink);
        }

+out_revert_creds:

        revert_creds(old_cred);
        if (!err) {
                struct inode *realinode = d_inode(ovl_dentry_upper(dentry));
        revert_creds(old_cred);
        if (!err) {
                struct inode *realinode = d_inode(ovl_dentry_upper(dentry));


@@ -1003,10 +1013,7 @@ const struct inode_operations ovl_dir_inode_operations = {
        .mknod          = ovl_mknod,
        .permission     = ovl_permission,
        .getattr        = ovl_dir_getattr,
        .mknod          = ovl_mknod,
        .permission     = ovl_permission,
        .getattr        = ovl_dir_getattr,

-       .setxattr       = generic_setxattr,
-       .getxattr       = generic_getxattr,

        .listxattr      = ovl_listxattr,
        .listxattr      = ovl_listxattr,

-       .removexattr    = generic_removexattr,

        .get_acl        = ovl_get_acl,
        .update_time    = ovl_update_time,
 };
        .get_acl        = ovl_get_acl,
        .update_time    = ovl_update_time,
 };