Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 21:21:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fs: port ->setattr() to pass mnt_idmap

Browse Source 
Convert to struct mnt_idmap.

Last cycle we merged the necessary infrastructure in
256c8aed2b ("fs: introduce dedicated idmap type for mounts").
This is just the conversion to struct mnt_idmap.

Currently we still pass around the plain namespace that was attached to a
mount. This is in general pretty convenient but it makes it easy to
conflate namespaces that are relevant on the filesystem with namespaces
that are relevent on the mount level. Especially for non-vfs developers
without detailed knowledge in this area this can be a potential source for
bugs.

Once the conversion to struct mnt_idmap is done all helpers down to the
really low-level helpers will take a struct mnt_idmap argument instead of
two namespace arguments. This way it becomes impossible to conflate the two
eliminating the possibility of any bugs. All of the vfs and all filesystems
only operate on struct mnt_idmap.

Acked-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Christian Brauner (Microsoft) <brauner@kernel.org>
This commit is contained in:
Christian Brauner 2023-01-13 12:49:11 +01:00 committed by Christian Brauner (Microsoft)
parent abf08576af
commit c1632a0f11
No known key found for this signature in database
GPG Key ID: 91C61BC06578DCA2
101 changed files with 257 additions and 245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/filesystems/locking.rst
View File

@ -71,7 +71,7 @@ prototypes::
void (*truncate) (struct inode *); void (*truncate) (struct inode *);
int (*permission) (struct inode *, int, unsigned int); int (*permission) (struct inode *, int, unsigned int);
struct posix_acl * (*get_inode_acl)(struct inode *, int, bool); struct posix_acl * (*get_inode_acl)(struct inode *, int, bool);
int (*setattr) (struct dentry *, struct iattr *); int (*setattr) (struct mnt_idmap *, struct dentry *, struct iattr *);
int (*getattr) (const struct path *, struct kstat *, u32, unsigned int); int (*getattr) (const struct path *, struct kstat *, u32, unsigned int);
ssize_t (*listxattr) (struct dentry *, char *, size_t); ssize_t (*listxattr) (struct dentry *, char *, size_t);
int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start, u64 len); int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start, u64 len);

2
Documentation/filesystems/vfs.rst
View File

@ -436,7 +436,7 @@ As of kernel 2.6.22, the following members are defined:
struct delayed_call *); struct delayed_call *);
int (*permission) (struct user_namespace *, struct inode *, int); int (*permission) (struct user_namespace *, struct inode *, int);
struct posix_acl * (*get_inode_acl)(struct inode *, int, bool); struct posix_acl * (*get_inode_acl)(struct inode *, int, bool);
int (*setattr) (struct user_namespace *, struct dentry *, struct iattr *); int (*setattr) (struct mnt_idmap *, struct dentry *, struct iattr *);
int (*getattr) (struct user_namespace *, const struct path *, struct kstat *, u32, unsigned int); int (*getattr) (struct user_namespace *, const struct path *, struct kstat *, u32, unsigned int);
ssize_t (*listxattr) (struct dentry *, char *, size_t); ssize_t (*listxattr) (struct dentry *, char *, size_t);
void (*update_time)(struct inode *, struct timespec *, int); void (*update_time)(struct inode *, struct timespec *, int);

4
arch/powerpc/platforms/cell/spufs/inode.c
View File

@ -92,7 +92,7 @@ out:
} }
static int static int
spufs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, spufs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *attr) struct iattr *attr)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
@ -100,7 +100,7 @@ spufs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
if ((attr->ia_valid & ATTR_SIZE) && if ((attr->ia_valid & ATTR_SIZE) &&
(attr->ia_size != inode->i_size)) (attr->ia_size != inode->i_size))
return -EINVAL; return -EINVAL;
setattr_copy(&init_user_ns, inode, attr); setattr_copy(&nop_mnt_idmap, inode, attr);
mark_inode_dirty(inode); mark_inode_dirty(inode);
return 0; return 0;
} }

2
fs/9p/acl.c
View File

@ -225,7 +225,7 @@ int v9fs_iop_set_acl(struct user_namespace *mnt_userns, struct dentry *dentry,
* FIXME should we update ctime ? * FIXME should we update ctime ?
* What is the following setxattr update the mode ? * What is the following setxattr update the mode ?
*/ */
v9fs_vfs_setattr_dotl(&init_user_ns, dentry, &iattr); v9fs_vfs_setattr_dotl(&nop_mnt_idmap, dentry, &iattr);
} }
break; break;
case ACL_TYPE_DEFAULT: case ACL_TYPE_DEFAULT:

2
fs/9p/v9fs_vfs.h
View File

@ -60,7 +60,7 @@ void v9fs_inode2stat(struct inode *inode, struct p9_wstat *stat);
int v9fs_uflags2omode(int uflags, int extended); int v9fs_uflags2omode(int uflags, int extended);
void v9fs_blank_wstat(struct p9_wstat *wstat); void v9fs_blank_wstat(struct p9_wstat *wstat);
int v9fs_vfs_setattr_dotl(struct user_namespace *mnt_userns, int v9fs_vfs_setattr_dotl(struct mnt_idmap *idmap,
struct dentry *dentry, struct iattr *iattr); struct dentry *dentry, struct iattr *iattr);
int v9fs_file_fsync_dotl(struct file *filp, loff_t start, loff_t end, int v9fs_file_fsync_dotl(struct file *filp, loff_t start, loff_t end,
int datasync); int datasync);

8
fs/9p/vfs_inode.c
View File

@ -1060,13 +1060,13 @@ v9fs_vfs_getattr(struct user_namespace *mnt_userns, const struct path *path,
/** /**
* v9fs_vfs_setattr - set file metadata * v9fs_vfs_setattr - set file metadata
* @mnt_userns: The user namespace of the mount * @idmap: idmap of the mount
* @dentry: file whose metadata to set * @dentry: file whose metadata to set
* @iattr: metadata assignment structure * @iattr: metadata assignment structure
* *
*/ */
static int v9fs_vfs_setattr(struct user_namespace *mnt_userns, static int v9fs_vfs_setattr(struct mnt_idmap *idmap,
struct dentry *dentry, struct iattr *iattr) struct dentry *dentry, struct iattr *iattr)
{ {
int retval, use_dentry = 0; int retval, use_dentry = 0;
@ -1077,7 +1077,7 @@ static int v9fs_vfs_setattr(struct user_namespace *mnt_userns,
struct p9_wstat wstat; struct p9_wstat wstat;
p9_debug(P9_DEBUG_VFS, "\n"); p9_debug(P9_DEBUG_VFS, "\n");
retval = setattr_prepare(&init_user_ns, dentry, iattr); retval = setattr_prepare(&nop_mnt_idmap, dentry, iattr);
if (retval) if (retval)
return retval; return retval;
@ -1135,7 +1135,7 @@ static int v9fs_vfs_setattr(struct user_namespace *mnt_userns,
v9fs_invalidate_inode_attr(inode); v9fs_invalidate_inode_attr(inode);
setattr_copy(&init_user_ns, inode, iattr); setattr_copy(&nop_mnt_idmap, inode, iattr);
mark_inode_dirty(inode); mark_inode_dirty(inode);
return 0; return 0;
} }

8
fs/9p/vfs_inode_dotl.c
View File

@ -529,13 +529,13 @@ static int v9fs_mapped_iattr_valid(int iattr_valid)
/** /**
* v9fs_vfs_setattr_dotl - set file metadata * v9fs_vfs_setattr_dotl - set file metadata
* @mnt_userns: The user namespace of the mount * @idmap: idmap of the mount
* @dentry: file whose metadata to set * @dentry: file whose metadata to set
* @iattr: metadata assignment structure * @iattr: metadata assignment structure
* *
*/ */
int v9fs_vfs_setattr_dotl(struct user_namespace *mnt_userns, int v9fs_vfs_setattr_dotl(struct mnt_idmap *idmap,
struct dentry *dentry, struct iattr *iattr) struct dentry *dentry, struct iattr *iattr)
{ {
int retval, use_dentry = 0; int retval, use_dentry = 0;
@ -548,7 +548,7 @@ int v9fs_vfs_setattr_dotl(struct user_namespace *mnt_userns,
p9_debug(P9_DEBUG_VFS, "\n"); p9_debug(P9_DEBUG_VFS, "\n");
retval = setattr_prepare(&init_user_ns, dentry, iattr); retval = setattr_prepare(&nop_mnt_idmap, dentry, iattr);
if (retval) if (retval)
return retval; return retval;
@ -597,7 +597,7 @@ int v9fs_vfs_setattr_dotl(struct user_namespace *mnt_userns,
truncate_setsize(inode, iattr->ia_size); truncate_setsize(inode, iattr->ia_size);
v9fs_invalidate_inode_attr(inode); v9fs_invalidate_inode_attr(inode);
setattr_copy(&init_user_ns, inode, iattr); setattr_copy(&nop_mnt_idmap, inode, iattr);
mark_inode_dirty(inode); mark_inode_dirty(inode);
if (iattr->ia_valid & ATTR_MODE) { if (iattr->ia_valid & ATTR_MODE) {
/* We also want to update ACL when we update mode bits */ /* We also want to update ACL when we update mode bits */

2
fs/adfs/adfs.h
View File

@ -144,7 +144,7 @@ struct adfs_discmap {
/* Inode stuff */ /* Inode stuff */
struct inode *adfs_iget(struct super_block *sb, struct object_info *obj); struct inode *adfs_iget(struct super_block *sb, struct object_info *obj);
int adfs_write_inode(struct inode *inode, struct writeback_control *wbc); int adfs_write_inode(struct inode *inode, struct writeback_control *wbc);
int adfs_notify_change(struct user_namespace *mnt_userns, struct dentry *dentry, int adfs_notify_change(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *attr); struct iattr *attr);
/* map.c */ /* map.c */

4
fs/adfs/inode.c
View File

@ -294,7 +294,7 @@ out:
* later. * later.
*/ */
int int
adfs_notify_change(struct user_namespace *mnt_userns, struct dentry *dentry, adfs_notify_change(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *attr) struct iattr *attr)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
@ -302,7 +302,7 @@ adfs_notify_change(struct user_namespace *mnt_userns, struct dentry *dentry,
unsigned int ia_valid = attr->ia_valid; unsigned int ia_valid = attr->ia_valid;
int error; int error;
error = setattr_prepare(&init_user_ns, dentry, attr); error = setattr_prepare(&nop_mnt_idmap, dentry, attr);
/* /*
* we can't change the UID or GID of any file - * we can't change the UID or GID of any file -

2
fs/affs/affs.h
View File

@ -185,7 +185,7 @@ extern int affs_rename2(struct user_namespace *mnt_userns,
/* inode.c */ /* inode.c */
extern struct inode *affs_new_inode(struct inode *dir); extern struct inode *affs_new_inode(struct inode *dir);
extern int affs_notify_change(struct user_namespace *mnt_userns, extern int affs_notify_change(struct mnt_idmap *idmap,
struct dentry *dentry, struct iattr *attr); struct dentry *dentry, struct iattr *attr);
extern void affs_evict_inode(struct inode *inode); extern void affs_evict_inode(struct inode *inode);
extern struct inode *affs_iget(struct super_block *sb, extern struct inode *affs_iget(struct super_block *sb,

6
fs/affs/inode.c
View File

@ -216,7 +216,7 @@ affs_write_inode(struct inode *inode, struct writeback_control *wbc)
} }
int int
affs_notify_change(struct user_namespace *mnt_userns, struct dentry *dentry, affs_notify_change(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *attr) struct iattr *attr)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
@ -224,7 +224,7 @@ affs_notify_change(struct user_namespace *mnt_userns, struct dentry *dentry,
pr_debug("notify_change(%lu,0x%x)\n", inode->i_ino, attr->ia_valid); pr_debug("notify_change(%lu,0x%x)\n", inode->i_ino, attr->ia_valid);
error = setattr_prepare(&init_user_ns, dentry, attr); error = setattr_prepare(&nop_mnt_idmap, dentry, attr);
if (error) if (error)
goto out; goto out;
@ -250,7 +250,7 @@ affs_notify_change(struct user_namespace *mnt_userns, struct dentry *dentry,
affs_truncate(inode); affs_truncate(inode);
} }
setattr_copy(&init_user_ns, inode, attr); setattr_copy(&nop_mnt_idmap, inode, attr);
mark_inode_dirty(inode); mark_inode_dirty(inode);
if (attr->ia_valid & ATTR_MODE) if (attr->ia_valid & ATTR_MODE)

2
fs/afs/inode.c
View File

@ -870,7 +870,7 @@ static const struct afs_operation_ops afs_setattr_operation = {
/* /*
* set the attributes of an inode * set the attributes of an inode
*/ */
int afs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, int afs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *attr) struct iattr *attr)
{ {
const unsigned int supported = const unsigned int supported =

2
fs/afs/internal.h
View File

@ -1172,7 +1172,7 @@ extern bool afs_check_validity(struct afs_vnode *);
extern int afs_validate(struct afs_vnode *, struct key *); extern int afs_validate(struct afs_vnode *, struct key *);
extern int afs_getattr(struct user_namespace *mnt_userns, const struct path *, extern int afs_getattr(struct user_namespace *mnt_userns, const struct path *,
struct kstat *, u32, unsigned int); struct kstat *, u32, unsigned int);
extern int afs_setattr(struct user_namespace *mnt_userns, struct dentry *, struct iattr *); extern int afs_setattr(struct mnt_idmap *idmap, struct dentry *, struct iattr *);
extern void afs_evict_inode(struct inode *); extern void afs_evict_inode(struct inode *);
extern int afs_drop_inode(struct inode *); extern int afs_drop_inode(struct inode *);

32
fs/attr.c
View File

@ -142,7 +142,7 @@ static bool chgrp_ok(struct user_namespace *mnt_userns,
/** /**
* setattr_prepare - check if attribute changes to a dentry are allowed * setattr_prepare - check if attribute changes to a dentry are allowed
* @mnt_userns: user namespace of the mount the inode was found from * @idmap: idmap of the mount the inode was found from
* @dentry: dentry to check * @dentry: dentry to check
* @attr: attributes to change * @attr: attributes to change
* *
@ -152,18 +152,19 @@ static bool chgrp_ok(struct user_namespace *mnt_userns,
* SGID bit from mode if user is not allowed to set it. Also file capabilities * SGID bit from mode if user is not allowed to set it. Also file capabilities
* and IMA extended attributes are cleared if ATTR_KILL_PRIV is set. * and IMA extended attributes are cleared if ATTR_KILL_PRIV is set.
* *
* If the inode has been found through an idmapped mount the user namespace of * If the inode has been found through an idmapped mount the idmap of
* the vfsmount must be passed through @mnt_userns. This function will then * the vfsmount must be passed through @idmap. This function will then
* take care to map the inode according to @mnt_userns before checking * take care to map the inode according to @idmap before checking
* permissions. On non-idmapped mounts or if permission checking is to be * permissions. On non-idmapped mounts or if permission checking is to be
* performed on the raw inode simply passs init_user_ns. * performed on the raw inode simply passs @nop_mnt_idmap.
* *
* Should be called as the first thing in ->setattr implementations, * Should be called as the first thing in ->setattr implementations,
* possibly after taking additional locks. * possibly after taking additional locks.
*/ */
int setattr_prepare(struct user_namespace *mnt_userns, struct dentry *dentry, int setattr_prepare(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *attr) struct iattr *attr)
{ {
struct user_namespace *mnt_userns = mnt_idmap_owner(idmap);
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
unsigned int ia_valid = attr->ia_valid; unsigned int ia_valid = attr->ia_valid;
@ -276,7 +277,7 @@ EXPORT_SYMBOL(inode_newsize_ok);
/** /**
* setattr_copy - copy simple metadata updates into the generic inode * setattr_copy - copy simple metadata updates into the generic inode
* @mnt_userns: user namespace of the mount the inode was found from * @idmap: idmap of the mount the inode was found from
* @inode: the inode to be updated * @inode: the inode to be updated
* @attr: the new attributes * @attr: the new attributes
* *
@ -289,19 +290,20 @@ EXPORT_SYMBOL(inode_newsize_ok);
* Noticeably missing is inode size update, which is more complex * Noticeably missing is inode size update, which is more complex
* as it requires pagecache updates. * as it requires pagecache updates.
* *
* If the inode has been found through an idmapped mount the user namespace of * If the inode has been found through an idmapped mount the idmap of
* the vfsmount must be passed through @mnt_userns. This function will then * the vfsmount must be passed through @idmap. This function will then
* take care to map the inode according to @mnt_userns before checking * take care to map the inode according to @idmap before checking
* permissions. On non-idmapped mounts or if permission checking is to be * permissions. On non-idmapped mounts or if permission checking is to be
* performed on the raw inode simply passs init_user_ns. * performed on the raw inode simply pass @nop_mnt_idmap.
* *
* The inode is not marked as dirty after this operation. The rationale is * The inode is not marked as dirty after this operation. The rationale is
* that for "simple" filesystems, the struct inode is the inode storage. * that for "simple" filesystems, the struct inode is the inode storage.
* The caller is free to mark the inode dirty afterwards if needed. * The caller is free to mark the inode dirty afterwards if needed.
*/ */
void setattr_copy(struct user_namespace *mnt_userns, struct inode *inode, void setattr_copy(struct mnt_idmap *idmap, struct inode *inode,
const struct iattr *attr) const struct iattr *attr)
{ {
struct user_namespace *mnt_userns = mnt_idmap_owner(idmap);
unsigned int ia_valid = attr->ia_valid; unsigned int ia_valid = attr->ia_valid;
i_uid_update(mnt_userns, attr, inode); i_uid_update(mnt_userns, attr, inode);
@ -472,7 +474,7 @@ int notify_change(struct mnt_idmap *idmap, struct dentry *dentry,
!vfsgid_valid(i_gid_into_vfsgid(mnt_userns, inode))) !vfsgid_valid(i_gid_into_vfsgid(mnt_userns, inode)))
return -EOVERFLOW; return -EOVERFLOW;
error = security_inode_setattr(mnt_userns, dentry, attr); error = security_inode_setattr(idmap, dentry, attr);
if (error) if (error)
return error; return error;
error = try_break_deleg(inode, delegated_inode); error = try_break_deleg(inode, delegated_inode);
@ -480,9 +482,9 @@ int notify_change(struct mnt_idmap *idmap, struct dentry *dentry,
return error; return error;
if (inode->i_op->setattr) if (inode->i_op->setattr)
error = inode->i_op->setattr(mnt_userns, dentry, attr); error = inode->i_op->setattr(idmap, dentry, attr);
else else
error = simple_setattr(mnt_userns, dentry, attr); error = simple_setattr(idmap, dentry, attr);
if (!error) { if (!error) {
fsnotify_change(dentry, ia_valid); fsnotify_change(dentry, ia_valid);

2
fs/bad_inode.c
View File

@ -102,7 +102,7 @@ static int bad_inode_getattr(struct user_namespace *mnt_userns,
return -EIO; return -EIO;
} }
static int bad_inode_setattr(struct user_namespace *mnt_userns, static int bad_inode_setattr(struct mnt_idmap *idmap,
struct dentry *direntry, struct iattr *attrs) struct dentry *direntry, struct iattr *attrs)
{ {
return -EIO; return -EIO;

9
fs/btrfs/inode.c
View File

@ -5281,7 +5281,7 @@ static int btrfs_setsize(struct inode *inode, struct iattr *attr)
return ret; return ret;
} }
static int btrfs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, static int btrfs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *attr) struct iattr *attr)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
@ -5291,7 +5291,7 @@ static int btrfs_setattr(struct user_namespace *mnt_userns, struct dentry *dentr
if (btrfs_root_readonly(root)) if (btrfs_root_readonly(root))
return -EROFS; return -EROFS;
err = setattr_prepare(mnt_userns, dentry, attr); err = setattr_prepare(idmap, dentry, attr);
if (err) if (err)
return err; return err;
@ -5302,12 +5302,13 @@ static int btrfs_setattr(struct user_namespace *mnt_userns, struct dentry *dentr
} }
if (attr->ia_valid) { if (attr->ia_valid) {
setattr_copy(mnt_userns, inode, attr); setattr_copy(idmap, inode, attr);
inode_inc_iversion(inode); inode_inc_iversion(inode);
err = btrfs_dirty_inode(BTRFS_I(inode)); err = btrfs_dirty_inode(BTRFS_I(inode));
if (!err && attr->ia_valid & ATTR_MODE) if (!err && attr->ia_valid & ATTR_MODE)
err = posix_acl_chmod(mnt_userns, dentry, inode->i_mode); err = posix_acl_chmod(mnt_idmap_owner(idmap), dentry,
inode->i_mode);
} }
return err; return err;

4
fs/ceph/inode.c
View File

@ -2227,7 +2227,7 @@ int __ceph_setattr(struct inode *inode, struct iattr *attr)
/* /*
* setattr * setattr
*/ */
int ceph_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, int ceph_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *attr) struct iattr *attr)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
@ -2240,7 +2240,7 @@ int ceph_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
if (ceph_inode_is_shutdown(inode)) if (ceph_inode_is_shutdown(inode))
return -ESTALE; return -ESTALE;
err = setattr_prepare(&init_user_ns, dentry, attr); err = setattr_prepare(&nop_mnt_idmap, dentry, attr);
if (err != 0) if (err != 0)
return err; return err;

2
fs/ceph/super.h
View File

@ -1043,7 +1043,7 @@ static inline int ceph_do_getattr(struct inode *inode, int mask, bool force)
extern int ceph_permission(struct user_namespace *mnt_userns, extern int ceph_permission(struct user_namespace *mnt_userns,
struct inode *inode, int mask); struct inode *inode, int mask);
extern int __ceph_setattr(struct inode *inode, struct iattr *attr); extern int __ceph_setattr(struct inode *inode, struct iattr *attr);
extern int ceph_setattr(struct user_namespace *mnt_userns, extern int ceph_setattr(struct mnt_idmap *idmap,
struct dentry *dentry, struct iattr *attr); struct dentry *dentry, struct iattr *attr);
extern int ceph_getattr(struct user_namespace *mnt_userns, extern int ceph_getattr(struct user_namespace *mnt_userns,
const struct path *path, struct kstat *stat, const struct path *path, struct kstat *stat,

2
fs/cifs/cifsfs.h
View File

@ -74,7 +74,7 @@ extern int cifs_revalidate_mapping(struct inode *inode);
extern int cifs_zap_mapping(struct inode *inode); extern int cifs_zap_mapping(struct inode *inode);
extern int cifs_getattr(struct user_namespace *, const struct path *, extern int cifs_getattr(struct user_namespace *, const struct path *,
struct kstat *, u32, unsigned int); struct kstat *, u32, unsigned int);
extern int cifs_setattr(struct user_namespace *, struct dentry *, extern int cifs_setattr(struct mnt_idmap *, struct dentry *,
struct iattr *); struct iattr *);
extern int cifs_fiemap(struct inode *, struct fiemap_extent_info *, u64 start, extern int cifs_fiemap(struct inode *, struct fiemap_extent_info *, u64 start,
u64 len); u64 len);

10
fs/cifs/inode.c
View File

@ -2752,7 +2752,7 @@ cifs_setattr_unix(struct dentry *direntry, struct iattr *attrs)
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_PERM) if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_PERM)
attrs->ia_valid |= ATTR_FORCE; attrs->ia_valid |= ATTR_FORCE;
rc = setattr_prepare(&init_user_ns, direntry, attrs); rc = setattr_prepare(&nop_mnt_idmap, direntry, attrs);
if (rc < 0) if (rc < 0)
goto out; goto out;
@ -2859,7 +2859,7 @@ cifs_setattr_unix(struct dentry *direntry, struct iattr *attrs)
fscache_resize_cookie(cifs_inode_cookie(inode), attrs->ia_size); fscache_resize_cookie(cifs_inode_cookie(inode), attrs->ia_size);
} }
setattr_copy(&init_user_ns, inode, attrs); setattr_copy(&nop_mnt_idmap, inode, attrs);
mark_inode_dirty(inode); mark_inode_dirty(inode);
/* force revalidate when any of these times are set since some /* force revalidate when any of these times are set since some
@ -2903,7 +2903,7 @@ cifs_setattr_nounix(struct dentry *direntry, struct iattr *attrs)
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_PERM) if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_PERM)
attrs->ia_valid |= ATTR_FORCE; attrs->ia_valid |= ATTR_FORCE;
rc = setattr_prepare(&init_user_ns, direntry, attrs); rc = setattr_prepare(&nop_mnt_idmap, direntry, attrs);
if (rc < 0) if (rc < 0)
goto cifs_setattr_exit; goto cifs_setattr_exit;
@ -3058,7 +3058,7 @@ cifs_setattr_nounix(struct dentry *direntry, struct iattr *attrs)
fscache_resize_cookie(cifs_inode_cookie(inode), attrs->ia_size); fscache_resize_cookie(cifs_inode_cookie(inode), attrs->ia_size);
} }
setattr_copy(&init_user_ns, inode, attrs); setattr_copy(&nop_mnt_idmap, inode, attrs);
mark_inode_dirty(inode); mark_inode_dirty(inode);
cifs_setattr_exit: cifs_setattr_exit:
@ -3068,7 +3068,7 @@ cifs_setattr_exit:
} }
int int
cifs_setattr(struct user_namespace *mnt_userns, struct dentry *direntry, cifs_setattr(struct mnt_idmap *idmap, struct dentry *direntry,
struct iattr *attrs) struct iattr *attrs)
{ {
struct cifs_sb_info *cifs_sb = CIFS_SB(direntry->d_sb); struct cifs_sb_info *cifs_sb = CIFS_SB(direntry->d_sb);

2
fs/coda/coda_linux.h
View File

@ -51,7 +51,7 @@ int coda_permission(struct user_namespace *mnt_userns, struct inode *inode,
int coda_revalidate_inode(struct inode *); int coda_revalidate_inode(struct inode *);
int coda_getattr(struct user_namespace *, const struct path *, struct kstat *, int coda_getattr(struct user_namespace *, const struct path *, struct kstat *,
u32, unsigned int); u32, unsigned int);
int coda_setattr(struct user_namespace *, struct dentry *, struct iattr *); int coda_setattr(struct mnt_idmap *, struct dentry *, struct iattr *);
/* this file: helpers */ /* this file: helpers */
char *coda_f2s(struct CodaFid *f); char *coda_f2s(struct CodaFid *f);

2
fs/coda/inode.c
View File

@ -260,7 +260,7 @@ int coda_getattr(struct user_namespace *mnt_userns, const struct path *path,
return err; return err;
} }
int coda_setattr(struct user_namespace *mnt_userns, struct dentry *de, int coda_setattr(struct mnt_idmap *idmap, struct dentry *de,
struct iattr *iattr) struct iattr *iattr)
{ {
struct inode *inode = d_inode(de); struct inode *inode = d_inode(de);

2
fs/configfs/configfs_internal.h
View File

@ -77,7 +77,7 @@ extern void configfs_hash_and_remove(struct dentry * dir, const char * name);
extern const unsigned char * configfs_get_name(struct configfs_dirent *sd); extern const unsigned char * configfs_get_name(struct configfs_dirent *sd);
extern void configfs_drop_dentry(struct configfs_dirent *sd, struct dentry *parent); extern void configfs_drop_dentry(struct configfs_dirent *sd, struct dentry *parent);
extern int configfs_setattr(struct user_namespace *mnt_userns, extern int configfs_setattr(struct mnt_idmap *idmap,
struct dentry *dentry, struct iattr *iattr); struct dentry *dentry, struct iattr *iattr);
extern struct dentry *configfs_pin_fs(void); extern struct dentry *configfs_pin_fs(void);

4
fs/configfs/inode.c
View File

@ -32,7 +32,7 @@ static const struct inode_operations configfs_inode_operations ={
.setattr = configfs_setattr, .setattr = configfs_setattr,
}; };
int configfs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, int configfs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *iattr) struct iattr *iattr)
{ {
struct inode * inode = d_inode(dentry); struct inode * inode = d_inode(dentry);
@ -60,7 +60,7 @@ int configfs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
} }
/* attributes were changed atleast once in past */ /* attributes were changed atleast once in past */
error = simple_setattr(mnt_userns, dentry, iattr); error = simple_setattr(idmap, dentry, iattr);
if (error) if (error)
return error; return error;

4
fs/debugfs/inode.c
View File

@ -42,7 +42,7 @@ static unsigned int debugfs_allow __ro_after_init = DEFAULT_DEBUGFS_ALLOW_BITS;
* so that we can use the file mode as part of a heuristic to determine whether * so that we can use the file mode as part of a heuristic to determine whether
* to lock down individual files. * to lock down individual files.
*/ */
static int debugfs_setattr(struct user_namespace *mnt_userns, static int debugfs_setattr(struct mnt_idmap *idmap,
struct dentry *dentry, struct iattr *ia) struct dentry *dentry, struct iattr *ia)
{ {
int ret; int ret;
@ -52,7 +52,7 @@ static int debugfs_setattr(struct user_namespace *mnt_userns,
if (ret) if (ret)
return ret; return ret;
} }
return simple_setattr(&init_user_ns, dentry, ia); return simple_setattr(&nop_mnt_idmap, dentry, ia);
} }
static const struct inode_operations debugfs_file_inode_operations = { static const struct inode_operations debugfs_file_inode_operations = {

6
fs/ecryptfs/inode.c
View File

@ -873,7 +873,7 @@ ecryptfs_permission(struct user_namespace *mnt_userns, struct inode *inode,
/** /**
* ecryptfs_setattr * ecryptfs_setattr
* @mnt_userns: user namespace of the target mount * @idmap: idmap of the target mount
* @dentry: dentry handle to the inode to modify * @dentry: dentry handle to the inode to modify
* @ia: Structure with flags of what to change and values * @ia: Structure with flags of what to change and values
* *
@ -884,7 +884,7 @@ ecryptfs_permission(struct user_namespace *mnt_userns, struct inode *inode,
* All other metadata changes will be passed right to the lower filesystem, * All other metadata changes will be passed right to the lower filesystem,
* and we will just update our inode to look like the lower. * and we will just update our inode to look like the lower.
*/ */
static int ecryptfs_setattr(struct user_namespace *mnt_userns, static int ecryptfs_setattr(struct mnt_idmap *idmap,
struct dentry *dentry, struct iattr *ia) struct dentry *dentry, struct iattr *ia)
{ {
int rc = 0; int rc = 0;
@ -939,7 +939,7 @@ static int ecryptfs_setattr(struct user_namespace *mnt_userns,
} }
mutex_unlock(&crypt_stat->cs_mutex); mutex_unlock(&crypt_stat->cs_mutex);
rc = setattr_prepare(&init_user_ns, dentry, ia); rc = setattr_prepare(&nop_mnt_idmap, dentry, ia);
if (rc) if (rc)
goto out; goto out;
if (ia->ia_valid & ATTR_SIZE) { if (ia->ia_valid & ATTR_SIZE) {

2
fs/exfat/exfat_fs.h
View File

@ -450,7 +450,7 @@ int exfat_trim_fs(struct inode *inode, struct fstrim_range *range);
extern const struct file_operations exfat_file_operations; extern const struct file_operations exfat_file_operations;
int __exfat_truncate(struct inode *inode); int __exfat_truncate(struct inode *inode);
void exfat_truncate(struct inode *inode); void exfat_truncate(struct inode *inode);
int exfat_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, int exfat_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *attr); struct iattr *attr);
int exfat_getattr(struct user_namespace *mnt_userns, const struct path *path, int exfat_getattr(struct user_namespace *mnt_userns, const struct path *path,
struct kstat *stat, unsigned int request_mask, struct kstat *stat, unsigned int request_mask,

6
fs/exfat/file.c
View File

@ -242,7 +242,7 @@ int exfat_getattr(struct user_namespace *mnt_uerns, const struct path *path,
return 0; return 0;
} }
int exfat_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, int exfat_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *attr) struct iattr *attr)
{ {
struct exfat_sb_info *sbi = EXFAT_SB(dentry->d_sb); struct exfat_sb_info *sbi = EXFAT_SB(dentry->d_sb);
@ -266,7 +266,7 @@ int exfat_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
ATTR_TIMES_SET); ATTR_TIMES_SET);
} }
error = setattr_prepare(&init_user_ns, dentry, attr); error = setattr_prepare(&nop_mnt_idmap, dentry, attr);
attr->ia_valid = ia_valid; attr->ia_valid = ia_valid;
if (error) if (error)
goto out; goto out;
@ -293,7 +293,7 @@ int exfat_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
if (attr->ia_valid & ATTR_SIZE) if (attr->ia_valid & ATTR_SIZE)
inode->i_mtime = inode->i_ctime = current_time(inode); inode->i_mtime = inode->i_ctime = current_time(inode);
setattr_copy(&init_user_ns, inode, attr); setattr_copy(&nop_mnt_idmap, inode, attr);
exfat_truncate_atime(&inode->i_atime); exfat_truncate_atime(&inode->i_atime);
if (attr->ia_valid & ATTR_SIZE) { if (attr->ia_valid & ATTR_SIZE) {

2
fs/ext2/ext2.h
View File

@ -753,7 +753,7 @@ extern struct inode *ext2_iget (struct super_block *, unsigned long);
extern int ext2_write_inode (struct inode *, struct writeback_control *); extern int ext2_write_inode (struct inode *, struct writeback_control *);
extern void ext2_evict_inode(struct inode *); extern void ext2_evict_inode(struct inode *);
extern int ext2_get_block(struct inode *, sector_t, struct buffer_head *, int); extern int ext2_get_block(struct inode *, sector_t, struct buffer_head *, int);
extern int ext2_setattr (struct user_namespace *, struct dentry *, struct iattr *); extern int ext2_setattr (struct mnt_idmap *, struct dentry *, struct iattr *);
extern int ext2_getattr (struct user_namespace *, const struct path *, extern int ext2_getattr (struct user_namespace *, const struct path *,
struct kstat *, u32, unsigned int); struct kstat *, u32, unsigned int);
extern void ext2_set_inode_flags(struct inode *inode); extern void ext2_set_inode_flags(struct inode *inode);

7
fs/ext2/inode.c
View File

@ -1618,13 +1618,14 @@ int ext2_getattr(struct user_namespace *mnt_userns, const struct path *path,
return 0; return 0;
} }
int ext2_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, int ext2_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *iattr) struct iattr *iattr)
{ {
struct user_namespace *mnt_userns = mnt_idmap_owner(idmap);
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
int error; int error;
error = setattr_prepare(&init_user_ns, dentry, iattr); error = setattr_prepare(&nop_mnt_idmap, dentry, iattr);
if (error) if (error)
return error; return error;
@ -1644,7 +1645,7 @@ int ext2_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
if (error) if (error)
return error; return error;
} }
setattr_copy(&init_user_ns, inode, iattr); setattr_copy(&nop_mnt_idmap, inode, iattr);
if (iattr->ia_valid & ATTR_MODE) if (iattr->ia_valid & ATTR_MODE)
error = posix_acl_chmod(&init_user_ns, dentry, inode->i_mode); error = posix_acl_chmod(&init_user_ns, dentry, inode->i_mode);
mark_inode_dirty(inode); mark_inode_dirty(inode);

2
fs/ext4/ext4.h
View File

@ -2976,7 +2976,7 @@ extern struct inode *__ext4_iget(struct super_block *sb, unsigned long ino,
__ext4_iget((sb), (ino), (flags), __func__, __LINE__) __ext4_iget((sb), (ino), (flags), __func__, __LINE__)
extern int ext4_write_inode(struct inode *, struct writeback_control *); extern int ext4_write_inode(struct inode *, struct writeback_control *);
extern int ext4_setattr(struct user_namespace *, struct dentry *, extern int ext4_setattr(struct mnt_idmap *, struct dentry *,
struct iattr *); struct iattr *);
extern u32 ext4_dio_alignment(struct inode *inode); extern u32 ext4_dio_alignment(struct inode *inode);
extern int ext4_getattr(struct user_namespace *, const struct path *, extern int ext4_getattr(struct user_namespace *, const struct path *,

7
fs/ext4/inode.c
View File

@ -5434,7 +5434,7 @@ static void ext4_wait_for_tail_page_commit(struct inode *inode)
* *
* Called with inode->i_rwsem down. * Called with inode->i_rwsem down.
*/ */
int ext4_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, int ext4_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *attr) struct iattr *attr)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
@ -5442,6 +5442,7 @@ int ext4_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
int orphan = 0; int orphan = 0;
const unsigned int ia_valid = attr->ia_valid; const unsigned int ia_valid = attr->ia_valid;
bool inc_ivers = true; bool inc_ivers = true;
struct user_namespace *mnt_userns = mnt_idmap_owner(idmap);
if (unlikely(ext4_forced_shutdown(EXT4_SB(inode->i_sb)))) if (unlikely(ext4_forced_shutdown(EXT4_SB(inode->i_sb))))
return -EIO; return -EIO;
@ -5454,7 +5455,7 @@ int ext4_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
ATTR_GID | ATTR_TIMES_SET)))) ATTR_GID | ATTR_TIMES_SET))))
return -EPERM; return -EPERM;
error = setattr_prepare(mnt_userns, dentry, attr); error = setattr_prepare(idmap, dentry, attr);
if (error) if (error)
return error; return error;
@ -5630,7 +5631,7 @@ out_mmap_sem:
if (!error) { if (!error) {
if (inc_ivers) if (inc_ivers)
inode_inc_iversion(inode); inode_inc_iversion(inode);
setattr_copy(mnt_userns, inode, attr); setattr_copy(idmap, inode, attr);
mark_inode_dirty(inode); mark_inode_dirty(inode);
} }

2
fs/f2fs/f2fs.h
View File

@ -3471,7 +3471,7 @@ int f2fs_truncate_blocks(struct inode *inode, u64 from, bool lock);
int f2fs_truncate(struct inode *inode); int f2fs_truncate(struct inode *inode);
int f2fs_getattr(struct user_namespace *mnt_userns, const struct path *path, int f2fs_getattr(struct user_namespace *mnt_userns, const struct path *path,
struct kstat *stat, u32 request_mask, unsigned int flags); struct kstat *stat, u32 request_mask, unsigned int flags);
int f2fs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, int f2fs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *attr); struct iattr *attr);
int f2fs_truncate_hole(struct inode *inode, pgoff_t pg_start, pgoff_t pg_end); int f2fs_truncate_hole(struct inode *inode, pgoff_t pg_start, pgoff_t pg_end);
void f2fs_truncate_data_blocks_range(struct dnode_of_data *dn, int count); void f2fs_truncate_data_blocks_range(struct dnode_of_data *dn, int count);

10
fs/f2fs/file.c
View File

@ -903,10 +903,11 @@ int f2fs_getattr(struct user_namespace *mnt_userns, const struct path *path,
} }
#ifdef CONFIG_F2FS_FS_POSIX_ACL #ifdef CONFIG_F2FS_FS_POSIX_ACL
static void __setattr_copy(struct user_namespace *mnt_userns, static void __setattr_copy(struct mnt_idmap *idmap,
struct inode *inode, const struct iattr *attr) struct inode *inode, const struct iattr *attr)
{ {
unsigned int ia_valid = attr->ia_valid; unsigned int ia_valid = attr->ia_valid;
struct user_namespace *mnt_userns = mnt_idmap_owner(idmap);
i_uid_update(mnt_userns, attr, inode); i_uid_update(mnt_userns, attr, inode);
i_gid_update(mnt_userns, attr, inode); i_gid_update(mnt_userns, attr, inode);
@ -930,9 +931,10 @@ static void __setattr_copy(struct user_namespace *mnt_userns,
#define __setattr_copy setattr_copy #define __setattr_copy setattr_copy
#endif #endif
int f2fs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, int f2fs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *attr) struct iattr *attr)
{ {
struct user_namespace *mnt_userns = mnt_idmap_owner(idmap);
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
int err; int err;
@ -951,7 +953,7 @@ int f2fs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
!f2fs_is_compress_backend_ready(inode)) !f2fs_is_compress_backend_ready(inode))
return -EOPNOTSUPP; return -EOPNOTSUPP;
err = setattr_prepare(mnt_userns, dentry, attr); err = setattr_prepare(idmap, dentry, attr);
if (err) if (err)
return err; return err;
@ -1023,7 +1025,7 @@ int f2fs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
spin_unlock(&F2FS_I(inode)->i_size_lock); spin_unlock(&F2FS_I(inode)->i_size_lock);
} }
__setattr_copy(mnt_userns, inode, attr); __setattr_copy(idmap, inode, attr);
if (attr->ia_valid & ATTR_MODE) { if (attr->ia_valid & ATTR_MODE) {
err = posix_acl_chmod(mnt_userns, dentry, f2fs_get_inode_mode(inode)); err = posix_acl_chmod(mnt_userns, dentry, f2fs_get_inode_mode(inode));

2
fs/fat/fat.h
View File

@ -398,7 +398,7 @@ extern long fat_generic_ioctl(struct file *filp, unsigned int cmd,
unsigned long arg); unsigned long arg);
extern const struct file_operations fat_file_operations; extern const struct file_operations fat_file_operations;
extern const struct inode_operations fat_file_inode_operations; extern const struct inode_operations fat_file_inode_operations;
extern int fat_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, extern int fat_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *attr); struct iattr *attr);
extern void fat_truncate_blocks(struct inode *inode, loff_t offset); extern void fat_truncate_blocks(struct inode *inode, loff_t offset);
extern int fat_getattr(struct user_namespace *mnt_userns, extern int fat_getattr(struct user_namespace *mnt_userns,

11
fs/fat/file.c
View File

@ -90,13 +90,13 @@ static int fat_ioctl_set_attributes(struct file *file, u32 __user *user_attr)
* out the RO attribute for checking by the security * out the RO attribute for checking by the security
* module, just because it maps to a file mode. * module, just because it maps to a file mode.
*/ */
err = security_inode_setattr(file_mnt_user_ns(file), err = security_inode_setattr(file_mnt_idmap(file),
file->f_path.dentry, &ia); file->f_path.dentry, &ia);
if (err) if (err)
goto out_unlock_inode; goto out_unlock_inode;
/* This MUST be done before doing anything irreversible... */ /* This MUST be done before doing anything irreversible... */
err = fat_setattr(file_mnt_user_ns(file), file->f_path.dentry, &ia); err = fat_setattr(file_mnt_idmap(file), file->f_path.dentry, &ia);
if (err) if (err)
goto out_unlock_inode; goto out_unlock_inode;
@ -477,9 +477,10 @@ static int fat_allow_set_time(struct user_namespace *mnt_userns,
/* valid file mode bits */ /* valid file mode bits */
#define FAT_VALID_MODE (S_IFREG | S_IFDIR | S_IRWXUGO) #define FAT_VALID_MODE (S_IFREG | S_IFDIR | S_IRWXUGO)
int fat_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, int fat_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *attr) struct iattr *attr)
{ {
struct user_namespace *mnt_userns = mnt_idmap_owner(idmap);
struct msdos_sb_info *sbi = MSDOS_SB(dentry->d_sb); struct msdos_sb_info *sbi = MSDOS_SB(dentry->d_sb);
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
unsigned int ia_valid; unsigned int ia_valid;
@ -492,7 +493,7 @@ int fat_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
attr->ia_valid &= ~TIMES_SET_FLAGS; attr->ia_valid &= ~TIMES_SET_FLAGS;
} }
error = setattr_prepare(mnt_userns, dentry, attr); error = setattr_prepare(idmap, dentry, attr);
attr->ia_valid = ia_valid; attr->ia_valid = ia_valid;
if (error) { if (error) {
if (sbi->options.quiet) if (sbi->options.quiet)
@ -564,7 +565,7 @@ int fat_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
fat_truncate_time(inode, &attr->ia_mtime, S_MTIME); fat_truncate_time(inode, &attr->ia_mtime, S_MTIME);
attr->ia_valid &= ~(ATTR_ATIME|ATTR_CTIME|ATTR_MTIME); attr->ia_valid &= ~(ATTR_ATIME|ATTR_CTIME|ATTR_MTIME);
setattr_copy(mnt_userns, inode, attr); setattr_copy(idmap, inode, attr);
mark_inode_dirty(inode); mark_inode_dirty(inode);
out: out:
return error; return error;

4
fs/fuse/dir.c
View File

@ -1690,7 +1690,7 @@ int fuse_do_setattr(struct dentry *dentry, struct iattr *attr,
if (!fc->default_permissions) if (!fc->default_permissions)
attr->ia_valid |= ATTR_FORCE; attr->ia_valid |= ATTR_FORCE;
err = setattr_prepare(&init_user_ns, dentry, attr); err = setattr_prepare(&nop_mnt_idmap, dentry, attr);
if (err) if (err)
return err; return err;
@ -1837,7 +1837,7 @@ error:
return err; return err;
} }
static int fuse_setattr(struct user_namespace *mnt_userns, struct dentry *entry, static int fuse_setattr(struct mnt_idmap *idmap, struct dentry *entry,
struct iattr *attr) struct iattr *attr)
{ {
struct inode *inode = d_inode(entry); struct inode *inode = d_inode(entry);

8
fs/gfs2/inode.c
View File

@ -1881,7 +1881,7 @@ int gfs2_permission(struct user_namespace *mnt_userns, struct inode *inode,
static int __gfs2_setattr_simple(struct inode *inode, struct iattr *attr) static int __gfs2_setattr_simple(struct inode *inode, struct iattr *attr)
{ {
setattr_copy(&init_user_ns, inode, attr); setattr_copy(&nop_mnt_idmap, inode, attr);
mark_inode_dirty(inode); mark_inode_dirty(inode);
return 0; return 0;
} }
@ -1966,7 +1966,7 @@ out:
/** /**
* gfs2_setattr - Change attributes on an inode * gfs2_setattr - Change attributes on an inode
* @mnt_userns: User namespace of the mount the inode was found from * @idmap: idmap of the mount the inode was found from
* @dentry: The dentry which is changing * @dentry: The dentry which is changing
* @attr: The structure describing the change * @attr: The structure describing the change
* *
@ -1976,7 +1976,7 @@ out:
* Returns: errno * Returns: errno
*/ */
static int gfs2_setattr(struct user_namespace *mnt_userns, static int gfs2_setattr(struct mnt_idmap *idmap,
struct dentry *dentry, struct iattr *attr) struct dentry *dentry, struct iattr *attr)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
@ -1996,7 +1996,7 @@ static int gfs2_setattr(struct user_namespace *mnt_userns,
if (error) if (error)
goto error; goto error;
error = setattr_prepare(&init_user_ns, dentry, attr); error = setattr_prepare(&nop_mnt_idmap, dentry, attr);
if (error) if (error)
goto error; goto error;

2
fs/hfs/hfs_fs.h
View File

@ -206,7 +206,7 @@ int hfs_write_begin(struct file *file, struct address_space *mapping,
extern struct inode *hfs_new_inode(struct inode *, const struct qstr *, umode_t); extern struct inode *hfs_new_inode(struct inode *, const struct qstr *, umode_t);
extern void hfs_inode_write_fork(struct inode *, struct hfs_extent *, __be32 *, __be32 *); extern void hfs_inode_write_fork(struct inode *, struct hfs_extent *, __be32 *, __be32 *);
extern int hfs_write_inode(struct inode *, struct writeback_control *); extern int hfs_write_inode(struct inode *, struct writeback_control *);
extern int hfs_inode_setattr(struct user_namespace *, struct dentry *, extern int hfs_inode_setattr(struct mnt_idmap *, struct dentry *,
struct iattr *); struct iattr *);
extern void hfs_inode_read_fork(struct inode *inode, struct hfs_extent *ext, extern void hfs_inode_read_fork(struct inode *inode, struct hfs_extent *ext,
__be32 log_size, __be32 phys_size, u32 clump_size); __be32 log_size, __be32 phys_size, u32 clump_size);

6
fs/hfs/inode.c
View File

@ -606,14 +606,14 @@ static int hfs_file_release(struct inode *inode, struct file *file)
* correspond to the same HFS file. * correspond to the same HFS file.
*/ */
int hfs_inode_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, int hfs_inode_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *attr) struct iattr *attr)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
struct hfs_sb_info *hsb = HFS_SB(inode->i_sb); struct hfs_sb_info *hsb = HFS_SB(inode->i_sb);
int error; int error;
error = setattr_prepare(&init_user_ns, dentry, error = setattr_prepare(&nop_mnt_idmap, dentry,
attr); /* basic permission checks */ attr); /* basic permission checks */
if (error) if (error)
return error; return error;
@ -653,7 +653,7 @@ int hfs_inode_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
current_time(inode); current_time(inode);
} }
setattr_copy(&init_user_ns, inode, attr); setattr_copy(&nop_mnt_idmap, inode, attr);
mark_inode_dirty(inode); mark_inode_dirty(inode);
return 0; return 0;
} }

6
fs/hfsplus/inode.c
View File

@ -246,13 +246,13 @@ static int hfsplus_file_release(struct inode *inode, struct file *file)
return 0; return 0;
} }
static int hfsplus_setattr(struct user_namespace *mnt_userns, static int hfsplus_setattr(struct mnt_idmap *idmap,
struct dentry *dentry, struct iattr *attr) struct dentry *dentry, struct iattr *attr)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
int error; int error;
error = setattr_prepare(&init_user_ns, dentry, attr); error = setattr_prepare(&nop_mnt_idmap, dentry, attr);
if (error) if (error)
return error; return error;
@ -270,7 +270,7 @@ static int hfsplus_setattr(struct user_namespace *mnt_userns,
inode->i_mtime = inode->i_ctime = current_time(inode); inode->i_mtime = inode->i_ctime = current_time(inode);
} }
setattr_copy(&init_user_ns, inode, attr); setattr_copy(&nop_mnt_idmap, inode, attr);
mark_inode_dirty(inode); mark_inode_dirty(inode);
return 0; return 0;

6
fs/hostfs/hostfs_kern.c
View File

@ -790,7 +790,7 @@ static int hostfs_permission(struct user_namespace *mnt_userns,
return err; return err;
} }
static int hostfs_setattr(struct user_namespace *mnt_userns, static int hostfs_setattr(struct mnt_idmap *idmap,
struct dentry *dentry, struct iattr *attr) struct dentry *dentry, struct iattr *attr)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
@ -800,7 +800,7 @@ static int hostfs_setattr(struct user_namespace *mnt_userns,
int fd = HOSTFS_I(inode)->fd; int fd = HOSTFS_I(inode)->fd;
err = setattr_prepare(&init_user_ns, dentry, attr); err = setattr_prepare(&nop_mnt_idmap, dentry, attr);
if (err) if (err)
return err; return err;
@ -857,7 +857,7 @@ static int hostfs_setattr(struct user_namespace *mnt_userns,
attr->ia_size != i_size_read(inode)) attr->ia_size != i_size_read(inode))
truncate_setsize(inode, attr->ia_size); truncate_setsize(inode, attr->ia_size);
setattr_copy(&init_user_ns, inode, attr); setattr_copy(&nop_mnt_idmap, inode, attr);
mark_inode_dirty(inode); mark_inode_dirty(inode);
return 0; return 0;
} }

2
fs/hpfs/hpfs_fn.h
View File

@ -280,7 +280,7 @@ void hpfs_init_inode(struct inode *);
void hpfs_read_inode(struct inode *); void hpfs_read_inode(struct inode *);
void hpfs_write_inode(struct inode *); void hpfs_write_inode(struct inode *);
void hpfs_write_inode_nolock(struct inode *); void hpfs_write_inode_nolock(struct inode *);
int hpfs_setattr(struct user_namespace *, struct dentry *, struct iattr *); int hpfs_setattr(struct mnt_idmap *, struct dentry *, struct iattr *);
void hpfs_write_if_changed(struct inode *); void hpfs_write_if_changed(struct inode *);
void hpfs_evict_inode(struct inode *); void hpfs_evict_inode(struct inode *);

6
fs/hpfs/inode.c
View File

@ -257,7 +257,7 @@ void hpfs_write_inode_nolock(struct inode *i)
brelse(bh); brelse(bh);
} }
int hpfs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, int hpfs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *attr) struct iattr *attr)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
@ -275,7 +275,7 @@ int hpfs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
if ((attr->ia_valid & ATTR_SIZE) && attr->ia_size > inode->i_size) if ((attr->ia_valid & ATTR_SIZE) && attr->ia_size > inode->i_size)
goto out_unlock; goto out_unlock;
error = setattr_prepare(&init_user_ns, dentry, attr); error = setattr_prepare(&nop_mnt_idmap, dentry, attr);
if (error) if (error)
goto out_unlock; goto out_unlock;
@ -289,7 +289,7 @@ int hpfs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
hpfs_truncate(inode); hpfs_truncate(inode);
} }
setattr_copy(&init_user_ns, inode, attr); setattr_copy(&nop_mnt_idmap, inode, attr);
hpfs_write_inode(inode); hpfs_write_inode(inode);

6
fs/hugetlbfs/inode.c
View File

@ -898,7 +898,7 @@ out:
return error; return error;
} }
static int hugetlbfs_setattr(struct user_namespace *mnt_userns, static int hugetlbfs_setattr(struct mnt_idmap *idmap,
struct dentry *dentry, struct iattr *attr) struct dentry *dentry, struct iattr *attr)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
@ -907,7 +907,7 @@ static int hugetlbfs_setattr(struct user_namespace *mnt_userns,
unsigned int ia_valid = attr->ia_valid; unsigned int ia_valid = attr->ia_valid;
struct hugetlbfs_inode_info *info = HUGETLBFS_I(inode); struct hugetlbfs_inode_info *info = HUGETLBFS_I(inode);
error = setattr_prepare(&init_user_ns, dentry, attr); error = setattr_prepare(&nop_mnt_idmap, dentry, attr);
if (error) if (error)
return error; return error;
@ -924,7 +924,7 @@ static int hugetlbfs_setattr(struct user_namespace *mnt_userns,
hugetlb_vmtruncate(inode, newsize); hugetlb_vmtruncate(inode, newsize);
} }
setattr_copy(&init_user_ns, inode, attr); setattr_copy(&nop_mnt_idmap, inode, attr);
mark_inode_dirty(inode); mark_inode_dirty(inode);
return 0; return 0;
} }

4
fs/jffs2/fs.c
View File

@ -190,13 +190,13 @@ int jffs2_do_setattr (struct inode *inode, struct iattr *iattr)
return 0; return 0;
} }
int jffs2_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, int jffs2_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *iattr) struct iattr *iattr)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
int rc; int rc;
rc = setattr_prepare(&init_user_ns, dentry, iattr); rc = setattr_prepare(&nop_mnt_idmap, dentry, iattr);
if (rc) if (rc)
return rc; return rc;

2
fs/jffs2/os-linux.h
View File

@ -164,7 +164,7 @@ long jffs2_ioctl(struct file *, unsigned int, unsigned long);
extern const struct inode_operations jffs2_symlink_inode_operations; extern const struct inode_operations jffs2_symlink_inode_operations;
/* fs.c */ /* fs.c */
int jffs2_setattr (struct user_namespace *, struct dentry *, struct iattr *); int jffs2_setattr (struct mnt_idmap *, struct dentry *, struct iattr *);
int jffs2_do_setattr (struct inode *, struct iattr *); int jffs2_do_setattr (struct inode *, struct iattr *);
struct inode *jffs2_iget(struct super_block *, unsigned long); struct inode *jffs2_iget(struct super_block *, unsigned long);
void jffs2_evict_inode (struct inode *); void jffs2_evict_inode (struct inode *);

10
fs/jfs/file.c
View File

@ -85,24 +85,24 @@ static int jfs_release(struct inode *inode, struct file *file)
return 0; return 0;
} }
int jfs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, int jfs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *iattr) struct iattr *iattr)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
int rc; int rc;
rc = setattr_prepare(&init_user_ns, dentry, iattr); rc = setattr_prepare(&nop_mnt_idmap, dentry, iattr);
if (rc) if (rc)
return rc; return rc;
if (is_quota_modification(mnt_userns, inode, iattr)) { if (is_quota_modification(&init_user_ns, inode, iattr)) {
rc = dquot_initialize(inode); rc = dquot_initialize(inode);
if (rc) if (rc)
return rc; return rc;
} }
if ((iattr->ia_valid & ATTR_UID && !uid_eq(iattr->ia_uid, inode->i_uid)) || if ((iattr->ia_valid & ATTR_UID && !uid_eq(iattr->ia_uid, inode->i_uid)) ||
(iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid))) { (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid))) {
rc = dquot_transfer(mnt_userns, inode, iattr); rc = dquot_transfer(&init_user_ns, inode, iattr);
if (rc) if (rc)
return rc; return rc;
} }
@ -119,7 +119,7 @@ int jfs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
jfs_truncate(inode); jfs_truncate(inode);
} }
setattr_copy(&init_user_ns, inode, iattr); setattr_copy(&nop_mnt_idmap, inode, iattr);
mark_inode_dirty(inode); mark_inode_dirty(inode);
if (iattr->ia_valid & ATTR_MODE) if (iattr->ia_valid & ATTR_MODE)

2
fs/jfs/jfs_inode.h
View File

@ -28,7 +28,7 @@ extern struct dentry *jfs_fh_to_parent(struct super_block *sb, struct fid *fid,
int fh_len, int fh_type); int fh_len, int fh_type);
extern void jfs_set_inode_flags(struct inode *); extern void jfs_set_inode_flags(struct inode *);
extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int); extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int);
extern int jfs_setattr(struct user_namespace *, struct dentry *, struct iattr *); extern int jfs_setattr(struct mnt_idmap *, struct dentry *, struct iattr *);
extern const struct address_space_operations jfs_aops; extern const struct address_space_operations jfs_aops;
extern const struct inode_operations jfs_dir_inode_operations; extern const struct inode_operations jfs_dir_inode_operations;

6
fs/kernfs/inode.c
View File

@ -107,7 +107,7 @@ int kernfs_setattr(struct kernfs_node *kn, const struct iattr *iattr)
return ret; return ret;
} }
int kernfs_iop_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, int kernfs_iop_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *iattr) struct iattr *iattr)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
@ -120,7 +120,7 @@ int kernfs_iop_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
root = kernfs_root(kn); root = kernfs_root(kn);
down_write(&root->kernfs_rwsem); down_write(&root->kernfs_rwsem);
error = setattr_prepare(&init_user_ns, dentry, iattr); error = setattr_prepare(&nop_mnt_idmap, dentry, iattr);
if (error) if (error)
goto out; goto out;
@ -129,7 +129,7 @@ int kernfs_iop_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
goto out; goto out;
/* this ignores size changes */ /* this ignores size changes */
setattr_copy(&init_user_ns, inode, iattr); setattr_copy(&nop_mnt_idmap, inode, iattr);
out: out:
up_write(&root->kernfs_rwsem); up_write(&root->kernfs_rwsem);

2
fs/kernfs/kernfs-internal.h
View File

@ -129,7 +129,7 @@ extern const struct xattr_handler *kernfs_xattr_handlers[];
void kernfs_evict_inode(struct inode *inode); void kernfs_evict_inode(struct inode *inode);
int kernfs_iop_permission(struct user_namespace *mnt_userns, int kernfs_iop_permission(struct user_namespace *mnt_userns,
struct inode *inode, int mask); struct inode *inode, int mask);
int kernfs_iop_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, int kernfs_iop_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *iattr); struct iattr *iattr);
int kernfs_iop_getattr(struct user_namespace *mnt_userns, int kernfs_iop_getattr(struct user_namespace *mnt_userns,
const struct path *path, struct kstat *stat, const struct path *path, struct kstat *stat,

10
fs/libfs.c
View File

@ -509,7 +509,7 @@ EXPORT_SYMBOL(simple_rename);
/** /**
* simple_setattr - setattr for simple filesystem * simple_setattr - setattr for simple filesystem
* @mnt_userns: user namespace of the target mount * @idmap: idmap of the target mount
* @dentry: dentry * @dentry: dentry
* @iattr: iattr structure * @iattr: iattr structure
* *
@ -522,19 +522,19 @@ EXPORT_SYMBOL(simple_rename);
* on simple regular filesystems. Anything that needs to change on-disk * on simple regular filesystems. Anything that needs to change on-disk
* or wire state on size changes needs its own setattr method. * or wire state on size changes needs its own setattr method.
*/ */
int simple_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, int simple_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *iattr) struct iattr *iattr)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
int error; int error;
error = setattr_prepare(mnt_userns, dentry, iattr); error = setattr_prepare(idmap, dentry, iattr);
if (error) if (error)
return error; return error;
if (iattr->ia_valid & ATTR_SIZE) if (iattr->ia_valid & ATTR_SIZE)
truncate_setsize(inode, iattr->ia_size); truncate_setsize(inode, iattr->ia_size);
setattr_copy(mnt_userns, inode, iattr); setattr_copy(idmap, inode, iattr);
mark_inode_dirty(inode); mark_inode_dirty(inode);
return 0; return 0;
} }
@ -1324,7 +1324,7 @@ static int empty_dir_getattr(struct user_namespace *mnt_userns,
return 0; return 0;
} }
static int empty_dir_setattr(struct user_namespace *mnt_userns, static int empty_dir_setattr(struct mnt_idmap *idmap,
struct dentry *dentry, struct iattr *attr) struct dentry *dentry, struct iattr *attr)
{ {
return -EPERM; return -EPERM;

6
fs/minix/file.c
View File

@ -22,13 +22,13 @@ const struct file_operations minix_file_operations = {
.splice_read = generic_file_splice_read, .splice_read = generic_file_splice_read,
}; };
static int minix_setattr(struct user_namespace *mnt_userns, static int minix_setattr(struct mnt_idmap *idmap,
struct dentry *dentry, struct iattr *attr) struct dentry *dentry, struct iattr *attr)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
int error; int error;
error = setattr_prepare(&init_user_ns, dentry, attr); error = setattr_prepare(&nop_mnt_idmap, dentry, attr);
if (error) if (error)
return error; return error;
@ -42,7 +42,7 @@ static int minix_setattr(struct user_namespace *mnt_userns,
minix_truncate(inode); minix_truncate(inode);
} }
setattr_copy(&init_user_ns, inode, attr); setattr_copy(&nop_mnt_idmap, inode, attr);
mark_inode_dirty(inode); mark_inode_dirty(inode);
return 0; return 0;
} }

2
fs/nfs/inode.c
View File

@ -606,7 +606,7 @@ EXPORT_SYMBOL_GPL(nfs_fhget);
#define NFS_VALID_ATTRS (ATTR_MODE|ATTR_UID|ATTR_GID|ATTR_SIZE|ATTR_ATIME|ATTR_ATIME_SET|ATTR_MTIME|ATTR_MTIME_SET|ATTR_FILE|ATTR_OPEN) #define NFS_VALID_ATTRS (ATTR_MODE|ATTR_UID|ATTR_GID|ATTR_SIZE|ATTR_ATIME|ATTR_ATIME_SET|ATTR_MTIME|ATTR_MTIME_SET|ATTR_FILE|ATTR_OPEN)
int int
nfs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, nfs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *attr) struct iattr *attr)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);

4
fs/nfs/namespace.c
View File

@ -220,11 +220,11 @@ nfs_namespace_getattr(struct user_namespace *mnt_userns,
} }
static int static int
nfs_namespace_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, nfs_namespace_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *attr) struct iattr *attr)
{ {
if (NFS_FH(d_inode(dentry))->size != 0) if (NFS_FH(d_inode(dentry))->size != 0)
return nfs_setattr(mnt_userns, dentry, attr); return nfs_setattr(idmap, dentry, attr);
return -EACCES; return -EACCES;
} }

2
fs/nfsd/nfsproc.c
View File

@ -93,7 +93,7 @@ nfsd_proc_setattr(struct svc_rqst *rqstp)
if (delta < 0) if (delta < 0)
delta = -delta; delta = -delta;
if (delta < MAX_TOUCH_TIME_ERROR && if (delta < MAX_TOUCH_TIME_ERROR &&
setattr_prepare(&init_user_ns, fhp->fh_dentry, iap) != 0) { setattr_prepare(&nop_mnt_idmap, fhp->fh_dentry, iap) != 0) {
/* /*
* Turn off ATTR_[AM]TIME_SET but leave ATTR_[AM]TIME. * Turn off ATTR_[AM]TIME_SET but leave ATTR_[AM]TIME.
* This will cause notify_change to set these times * This will cause notify_change to set these times

6
fs/nilfs2/inode.c
View File

@ -949,7 +949,7 @@ void nilfs_evict_inode(struct inode *inode)
*/ */
} }
int nilfs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, int nilfs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *iattr) struct iattr *iattr)
{ {
struct nilfs_transaction_info ti; struct nilfs_transaction_info ti;
@ -957,7 +957,7 @@ int nilfs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
struct super_block *sb = inode->i_sb; struct super_block *sb = inode->i_sb;
int err; int err;
err = setattr_prepare(&init_user_ns, dentry, iattr); err = setattr_prepare(&nop_mnt_idmap, dentry, iattr);
if (err) if (err)
return err; return err;
@ -972,7 +972,7 @@ int nilfs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
nilfs_truncate(inode); nilfs_truncate(inode);
} }
setattr_copy(&init_user_ns, inode, iattr); setattr_copy(&nop_mnt_idmap, inode, iattr);
mark_inode_dirty(inode); mark_inode_dirty(inode);
if (iattr->ia_valid & ATTR_MODE) { if (iattr->ia_valid & ATTR_MODE) {

2
fs/nilfs2/nilfs.h
View File

@ -271,7 +271,7 @@ struct inode *nilfs_iget_for_shadow(struct inode *inode);
extern void nilfs_update_inode(struct inode *, struct buffer_head *, int); extern void nilfs_update_inode(struct inode *, struct buffer_head *, int);
extern void nilfs_truncate(struct inode *); extern void nilfs_truncate(struct inode *);
extern void nilfs_evict_inode(struct inode *); extern void nilfs_evict_inode(struct inode *);
extern int nilfs_setattr(struct user_namespace *, struct dentry *, extern int nilfs_setattr(struct mnt_idmap *, struct dentry *,
struct iattr *); struct iattr *);
extern void nilfs_write_failed(struct address_space *mapping, loff_t to); extern void nilfs_write_failed(struct address_space *mapping, loff_t to);
int nilfs_permission(struct user_namespace *mnt_userns, struct inode *inode, int nilfs_permission(struct user_namespace *mnt_userns, struct inode *inode,

6
fs/ntfs/inode.c
View File

@ -2865,7 +2865,7 @@ void ntfs_truncate_vfs(struct inode *vi) {
/** /**
* ntfs_setattr - called from notify_change() when an attribute is being changed * ntfs_setattr - called from notify_change() when an attribute is being changed
* @mnt_userns: user namespace of the mount the inode was found from * @idmap: idmap of the mount the inode was found from
* @dentry: dentry whose attributes to change * @dentry: dentry whose attributes to change
* @attr: structure describing the attributes and the changes * @attr: structure describing the attributes and the changes
* *
@ -2878,14 +2878,14 @@ void ntfs_truncate_vfs(struct inode *vi) {
* *
* Called with ->i_mutex held. * Called with ->i_mutex held.
*/ */
int ntfs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, int ntfs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *attr) struct iattr *attr)
{ {
struct inode *vi = d_inode(dentry); struct inode *vi = d_inode(dentry);
int err; int err;
unsigned int ia_valid = attr->ia_valid; unsigned int ia_valid = attr->ia_valid;
err = setattr_prepare(&init_user_ns, dentry, attr); err = setattr_prepare(&nop_mnt_idmap, dentry, attr);
if (err) if (err)
goto out; goto out;
/* We do not support NTFS ACLs yet. */ /* We do not support NTFS ACLs yet. */

2
fs/ntfs/inode.h
View File

@ -289,7 +289,7 @@ extern int ntfs_show_options(struct seq_file *sf, struct dentry *root);
extern int ntfs_truncate(struct inode *vi); extern int ntfs_truncate(struct inode *vi);
extern void ntfs_truncate_vfs(struct inode *vi); extern void ntfs_truncate_vfs(struct inode *vi);
extern int ntfs_setattr(struct user_namespace *mnt_userns, extern int ntfs_setattr(struct mnt_idmap *idmap,
struct dentry *dentry, struct iattr *attr); struct dentry *dentry, struct iattr *attr);
extern int __ntfs_write_inode(struct inode *vi, int sync); extern int __ntfs_write_inode(struct inode *vi, int sync);

8
fs/ntfs3/file.c
View File

@ -657,7 +657,7 @@ out:
/* /*
* ntfs3_setattr - inode_operations::setattr * ntfs3_setattr - inode_operations::setattr
*/ */
int ntfs3_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, int ntfs3_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *attr) struct iattr *attr)
{ {
struct super_block *sb = dentry->d_sb; struct super_block *sb = dentry->d_sb;
@ -676,7 +676,7 @@ int ntfs3_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
ia_valid = attr->ia_valid; ia_valid = attr->ia_valid;
} }
err = setattr_prepare(mnt_userns, dentry, attr); err = setattr_prepare(idmap, dentry, attr);
if (err) if (err)
goto out; goto out;
@ -704,10 +704,10 @@ int ntfs3_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
inode->i_size = newsize; inode->i_size = newsize;
} }
setattr_copy(mnt_userns, inode, attr); setattr_copy(idmap, inode, attr);
if (mode != inode->i_mode) { if (mode != inode->i_mode) {
err = ntfs_acl_chmod(mnt_userns, dentry); err = ntfs_acl_chmod(mnt_idmap_owner(idmap), dentry);
if (err) if (err)
goto out; goto out;

4
fs/ntfs3/ntfs_fs.h
View File

@ -494,8 +494,10 @@ extern const struct file_operations ntfs_dir_operations;
/* Globals from file.c */ /* Globals from file.c */
int ntfs_getattr(struct user_namespace *mnt_userns, const struct path *path, int ntfs_getattr(struct user_namespace *mnt_userns, const struct path *path,
struct kstat *stat, u32 request_mask, u32 flags); struct kstat *stat, u32 request_mask, u32 flags);
int ntfs3_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, int ntfs3_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *attr); struct iattr *attr);
void ntfs_sparse_cluster(struct inode *inode, struct page *page0, CLST vcn,
CLST len);
int ntfs_file_open(struct inode *inode, struct file *file); int ntfs_file_open(struct inode *inode, struct file *file);
int ntfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, int ntfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
__u64 start, __u64 len); __u64 start, __u64 len);

6
fs/ocfs2/dlmfs/dlmfs.c
View File

@ -188,18 +188,18 @@ static int dlmfs_file_release(struct inode *inode,
* We do ->setattr() just to override size changes. Our size is the size * We do ->setattr() just to override size changes. Our size is the size
* of the LVB and nothing else. * of the LVB and nothing else.
*/ */
static int dlmfs_file_setattr(struct user_namespace *mnt_userns, static int dlmfs_file_setattr(struct mnt_idmap *idmap,
struct dentry *dentry, struct iattr *attr) struct dentry *dentry, struct iattr *attr)
{ {
int error; int error;
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
attr->ia_valid &= ~ATTR_SIZE; attr->ia_valid &= ~ATTR_SIZE;
error = setattr_prepare(&init_user_ns, dentry, attr); error = setattr_prepare(&nop_mnt_idmap, dentry, attr);
if (error) if (error)
return error; return error;
setattr_copy(&init_user_ns, inode, attr); setattr_copy(&nop_mnt_idmap, inode, attr);
mark_inode_dirty(inode); mark_inode_dirty(inode);
return 0; return 0;
} }

7
fs/ocfs2/file.c
View File

@ -1111,9 +1111,10 @@ out:
return ret; return ret;
} }
int ocfs2_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, int ocfs2_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *attr) struct iattr *attr)
{ {
struct user_namespace *mnt_userns = mnt_idmap_owner(idmap);
int status = 0, size_change; int status = 0, size_change;
int inode_locked = 0; int inode_locked = 0;
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
@ -1142,7 +1143,7 @@ int ocfs2_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
if (!(attr->ia_valid & OCFS2_VALID_ATTRS)) if (!(attr->ia_valid & OCFS2_VALID_ATTRS))
return 0; return 0;
status = setattr_prepare(&init_user_ns, dentry, attr); status = setattr_prepare(&nop_mnt_idmap, dentry, attr);
if (status) if (status)
return status; return status;
@ -1265,7 +1266,7 @@ int ocfs2_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
} }
} }
setattr_copy(&init_user_ns, inode, attr); setattr_copy(&nop_mnt_idmap, inode, attr);
mark_inode_dirty(inode); mark_inode_dirty(inode);
status = ocfs2_mark_inode_dirty(handle, inode, bh); status = ocfs2_mark_inode_dirty(handle, inode, bh);

2
fs/ocfs2/file.h
View File

@ -49,7 +49,7 @@ int ocfs2_extend_no_holes(struct inode *inode, struct buffer_head *di_bh,
u64 new_i_size, u64 zero_to); u64 new_i_size, u64 zero_to);
int ocfs2_zero_extend(struct inode *inode, struct buffer_head *di_bh, int ocfs2_zero_extend(struct inode *inode, struct buffer_head *di_bh,
loff_t zero_to); loff_t zero_to);
int ocfs2_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, int ocfs2_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *attr); struct iattr *attr);
int ocfs2_getattr(struct user_namespace *mnt_userns, const struct path *path, int ocfs2_getattr(struct user_namespace *mnt_userns, const struct path *path,
struct kstat *stat, u32 request_mask, unsigned int flags); struct kstat *stat, u32 request_mask, unsigned int flags);

6
fs/omfs/file.c
View File

@ -337,13 +337,13 @@ const struct file_operations omfs_file_operations = {
.splice_read = generic_file_splice_read, .splice_read = generic_file_splice_read,
}; };
static int omfs_setattr(struct user_namespace *mnt_userns, static int omfs_setattr(struct mnt_idmap *idmap,
struct dentry *dentry, struct iattr *attr) struct dentry *dentry, struct iattr *attr)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
int error; int error;
error = setattr_prepare(&init_user_ns, dentry, attr); error = setattr_prepare(&nop_mnt_idmap, dentry, attr);
if (error) if (error)
return error; return error;
@ -356,7 +356,7 @@ static int omfs_setattr(struct user_namespace *mnt_userns,
omfs_truncate(inode); omfs_truncate(inode);
} }
setattr_copy(&init_user_ns, inode, attr); setattr_copy(&nop_mnt_idmap, inode, attr);
mark_inode_dirty(inode); mark_inode_dirty(inode);
return 0; return 0;
} }

6
fs/orangefs/inode.c
View File

@ -822,7 +822,7 @@ again:
ORANGEFS_I(inode)->attr_uid = current_fsuid(); ORANGEFS_I(inode)->attr_uid = current_fsuid();
ORANGEFS_I(inode)->attr_gid = current_fsgid(); ORANGEFS_I(inode)->attr_gid = current_fsgid();
} }
setattr_copy(&init_user_ns, inode, iattr); setattr_copy(&nop_mnt_idmap, inode, iattr);
spin_unlock(&inode->i_lock); spin_unlock(&inode->i_lock);
mark_inode_dirty(inode); mark_inode_dirty(inode);
@ -846,13 +846,13 @@ int __orangefs_setattr_mode(struct dentry *dentry, struct iattr *iattr)
/* /*
* Change attributes of an object referenced by dentry. * Change attributes of an object referenced by dentry.
*/ */
int orangefs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, int orangefs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *iattr) struct iattr *iattr)
{ {
int ret; int ret;
gossip_debug(GOSSIP_INODE_DEBUG, "__orangefs_setattr: called on %pd\n", gossip_debug(GOSSIP_INODE_DEBUG, "__orangefs_setattr: called on %pd\n",
dentry); dentry);
ret = setattr_prepare(&init_user_ns, dentry, iattr); ret = setattr_prepare(&nop_mnt_idmap, dentry, iattr);
if (ret) if (ret)
goto out; goto out;
ret = __orangefs_setattr_mode(dentry, iattr); ret = __orangefs_setattr_mode(dentry, iattr);

2
fs/orangefs/orangefs-kernel.h
View File

@ -362,7 +362,7 @@ struct inode *orangefs_new_inode(struct super_block *sb,
int __orangefs_setattr(struct inode *, struct iattr *); int __orangefs_setattr(struct inode *, struct iattr *);
int __orangefs_setattr_mode(struct dentry *dentry, struct iattr *iattr); int __orangefs_setattr_mode(struct dentry *dentry, struct iattr *iattr);
int orangefs_setattr(struct user_namespace *, struct dentry *, struct iattr *); int orangefs_setattr(struct mnt_idmap *, struct dentry *, struct iattr *);
int orangefs_getattr(struct user_namespace *mnt_userns, const struct path *path, int orangefs_getattr(struct user_namespace *mnt_userns, const struct path *path,
struct kstat *stat, u32 request_mask, unsigned int flags); struct kstat *stat, u32 request_mask, unsigned int flags);

6
fs/overlayfs/inode.c
View File

@ -19,7 +19,7 @@
#include "overlayfs.h" #include "overlayfs.h"
int ovl_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, int ovl_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *attr) struct iattr *attr)
{ {
int err; int err;
@ -28,7 +28,7 @@ int ovl_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
struct dentry *upperdentry; struct dentry *upperdentry;
const struct cred *old_cred; const struct cred *old_cred;
err = setattr_prepare(&init_user_ns, dentry, attr); err = setattr_prepare(&nop_mnt_idmap, dentry, attr);
if (err) if (err)
return err; return err;
@ -677,7 +677,7 @@ int ovl_set_acl(struct user_namespace *mnt_userns, struct dentry *dentry,
!capable_wrt_inode_uidgid(&init_user_ns, inode, CAP_FSETID)) { !capable_wrt_inode_uidgid(&init_user_ns, inode, CAP_FSETID)) {
struct iattr iattr = { .ia_valid = ATTR_KILL_SGID }; struct iattr iattr = { .ia_valid = ATTR_KILL_SGID };
err = ovl_setattr(&init_user_ns, dentry, &iattr); err = ovl_setattr(&nop_mnt_idmap, dentry, &iattr);
if (err) if (err)
return err; return err;
} }

2
fs/overlayfs/overlayfs.h
View File

@ -597,7 +597,7 @@ int ovl_set_nlink_lower(struct dentry *dentry);
unsigned int ovl_get_nlink(struct ovl_fs *ofs, struct dentry *lowerdentry, unsigned int ovl_get_nlink(struct ovl_fs *ofs, struct dentry *lowerdentry,
struct dentry *upperdentry, struct dentry *upperdentry,
unsigned int fallback); unsigned int fallback);
int ovl_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, int ovl_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *attr); struct iattr *attr);
int ovl_getattr(struct user_namespace *mnt_userns, const struct path *path, int ovl_getattr(struct user_namespace *mnt_userns, const struct path *path,
struct kstat *stat, u32 request_mask, unsigned int flags); struct kstat *stat, u32 request_mask, unsigned int flags);

6
fs/proc/base.c
View File

@ -685,7 +685,7 @@ static bool proc_fd_access_allowed(struct inode *inode)
return allowed; return allowed;
} }
int proc_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, int proc_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *attr) struct iattr *attr)
{ {
int error; int error;
@ -694,11 +694,11 @@ int proc_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
if (attr->ia_valid & ATTR_MODE) if (attr->ia_valid & ATTR_MODE)
return -EPERM; return -EPERM;
error = setattr_prepare(&init_user_ns, dentry, attr); error = setattr_prepare(&nop_mnt_idmap, dentry, attr);
if (error) if (error)
return error; return error;
setattr_copy(&init_user_ns, inode, attr); setattr_copy(&nop_mnt_idmap, inode, attr);
mark_inode_dirty(inode); mark_inode_dirty(inode);
return 0; return 0;
} }

6
fs/proc/generic.c
View File

@ -115,18 +115,18 @@ static bool pde_subdir_insert(struct proc_dir_entry *dir,
return true; return true;
} }
static int proc_notify_change(struct user_namespace *mnt_userns, static int proc_notify_change(struct mnt_idmap *idmap,
struct dentry *dentry, struct iattr *iattr) struct dentry *dentry, struct iattr *iattr)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
struct proc_dir_entry *de = PDE(inode); struct proc_dir_entry *de = PDE(inode);
int error; int error;
error = setattr_prepare(&init_user_ns, dentry, iattr); error = setattr_prepare(&nop_mnt_idmap, dentry, iattr);
if (error) if (error)
return error; return error;
setattr_copy(&init_user_ns, inode, iattr); setattr_copy(&nop_mnt_idmap, inode, iattr);
mark_inode_dirty(inode); mark_inode_dirty(inode);
proc_set_user(de, inode->i_uid, inode->i_gid); proc_set_user(de, inode->i_uid, inode->i_gid);

2
fs/proc/internal.h
View File

@ -164,7 +164,7 @@ extern int proc_pid_statm(struct seq_file *, struct pid_namespace *,
extern const struct dentry_operations pid_dentry_operations; extern const struct dentry_operations pid_dentry_operations;
extern int pid_getattr(struct user_namespace *, const struct path *, extern int pid_getattr(struct user_namespace *, const struct path *,
struct kstat *, u32, unsigned int); struct kstat *, u32, unsigned int);
extern int proc_setattr(struct user_namespace *, struct dentry *, extern int proc_setattr(struct mnt_idmap *, struct dentry *,
struct iattr *); struct iattr *);
extern void proc_pid_evict_inode(struct proc_inode *); extern void proc_pid_evict_inode(struct proc_inode *);
extern struct inode *proc_pid_make_inode(struct super_block *, struct task_struct *, umode_t); extern struct inode *proc_pid_make_inode(struct super_block *, struct task_struct *, umode_t);

6
fs/proc/proc_sysctl.c
View File

@ -827,7 +827,7 @@ static int proc_sys_permission(struct user_namespace *mnt_userns,
return error; return error;
} }
static int proc_sys_setattr(struct user_namespace *mnt_userns, static int proc_sys_setattr(struct mnt_idmap *idmap,
struct dentry *dentry, struct iattr *attr) struct dentry *dentry, struct iattr *attr)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
@ -836,11 +836,11 @@ static int proc_sys_setattr(struct user_namespace *mnt_userns,
if (attr->ia_valid & (ATTR_MODE | ATTR_UID | ATTR_GID)) if (attr->ia_valid & (ATTR_MODE | ATTR_UID | ATTR_GID))
return -EPERM; return -EPERM;
error = setattr_prepare(&init_user_ns, dentry, attr); error = setattr_prepare(&nop_mnt_idmap, dentry, attr);
if (error) if (error)
return error; return error;
setattr_copy(&init_user_ns, inode, attr); setattr_copy(&nop_mnt_idmap, inode, attr);
mark_inode_dirty(inode); mark_inode_dirty(inode);
return 0; return 0;
} }

8
fs/ramfs/file-nommu.c
View File

@ -22,7 +22,7 @@
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include "internal.h" #include "internal.h"
static int ramfs_nommu_setattr(struct user_namespace *, struct dentry *, struct iattr *); static int ramfs_nommu_setattr(struct mnt_idmap *, struct dentry *, struct iattr *);
static unsigned long ramfs_nommu_get_unmapped_area(struct file *file, static unsigned long ramfs_nommu_get_unmapped_area(struct file *file,
unsigned long addr, unsigned long addr,
unsigned long len, unsigned long len,
@ -158,7 +158,7 @@ static int ramfs_nommu_resize(struct inode *inode, loff_t newsize, loff_t size)
* handle a change of attributes * handle a change of attributes
* - we're specifically interested in a change of size * - we're specifically interested in a change of size
*/ */
static int ramfs_nommu_setattr(struct user_namespace *mnt_userns, static int ramfs_nommu_setattr(struct mnt_idmap *idmap,
struct dentry *dentry, struct iattr *ia) struct dentry *dentry, struct iattr *ia)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
@ -166,7 +166,7 @@ static int ramfs_nommu_setattr(struct user_namespace *mnt_userns,
int ret = 0; int ret = 0;
/* POSIX UID/GID verification for setting inode attributes */ /* POSIX UID/GID verification for setting inode attributes */
ret = setattr_prepare(&init_user_ns, dentry, ia); ret = setattr_prepare(&nop_mnt_idmap, dentry, ia);
if (ret) if (ret)
return ret; return ret;
@ -186,7 +186,7 @@ static int ramfs_nommu_setattr(struct user_namespace *mnt_userns,
} }
} }
setattr_copy(&init_user_ns, inode, ia); setattr_copy(&nop_mnt_idmap, inode, ia);
out: out:
ia->ia_valid = old_ia_valid; ia->ia_valid = old_ia_valid;
return ret; return ret;

10
fs/reiserfs/inode.c
View File

@ -3262,21 +3262,21 @@ static ssize_t reiserfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
return ret; return ret;
} }
int reiserfs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, int reiserfs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *attr) struct iattr *attr)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
unsigned int ia_valid; unsigned int ia_valid;
int error; int error;
error = setattr_prepare(&init_user_ns, dentry, attr); error = setattr_prepare(&nop_mnt_idmap, dentry, attr);
if (error) if (error)
return error; return error;
/* must be turned off for recursive notify_change calls */ /* must be turned off for recursive notify_change calls */
ia_valid = attr->ia_valid &= ~(ATTR_KILL_SUID|ATTR_KILL_SGID); ia_valid = attr->ia_valid &= ~(ATTR_KILL_SUID|ATTR_KILL_SGID);
if (is_quota_modification(mnt_userns, inode, attr)) { if (is_quota_modification(&init_user_ns, inode, attr)) {
error = dquot_initialize(inode); error = dquot_initialize(inode);
if (error) if (error)
return error; return error;
@ -3359,7 +3359,7 @@ int reiserfs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
reiserfs_write_unlock(inode->i_sb); reiserfs_write_unlock(inode->i_sb);
if (error) if (error)
goto out; goto out;
error = dquot_transfer(mnt_userns, inode, attr); error = dquot_transfer(&init_user_ns, inode, attr);
reiserfs_write_lock(inode->i_sb); reiserfs_write_lock(inode->i_sb);
if (error) { if (error) {
journal_end(&th); journal_end(&th);
@ -3398,7 +3398,7 @@ int reiserfs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
} }
if (!error) { if (!error) {
setattr_copy(&init_user_ns, inode, attr); setattr_copy(&nop_mnt_idmap, inode, attr);
mark_inode_dirty(inode); mark_inode_dirty(inode);
} }

2
fs/reiserfs/reiserfs.h
View File

@ -3100,7 +3100,7 @@ static inline void reiserfs_update_sd(struct reiserfs_transaction_handle *th,
} }
void sd_attrs_to_i_attrs(__u16 sd_attrs, struct inode *inode); void sd_attrs_to_i_attrs(__u16 sd_attrs, struct inode *inode);
int reiserfs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, int reiserfs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *attr); struct iattr *attr);
int __reiserfs_write_begin(struct page *page, unsigned from, unsigned len); int __reiserfs_write_begin(struct page *page, unsigned from, unsigned len);

4
fs/reiserfs/xattr.c
View File

@ -352,7 +352,7 @@ static int chown_one_xattr(struct dentry *dentry, void *data)
* ATTR_MODE is set. * ATTR_MODE is set.
*/ */
attrs->ia_valid &= (ATTR_UID|ATTR_GID); attrs->ia_valid &= (ATTR_UID|ATTR_GID);
err = reiserfs_setattr(&init_user_ns, dentry, attrs); err = reiserfs_setattr(&nop_mnt_idmap, dentry, attrs);
attrs->ia_valid = ia_valid; attrs->ia_valid = ia_valid;
return err; return err;
@ -597,7 +597,7 @@ reiserfs_xattr_set_handle(struct reiserfs_transaction_handle *th,
inode_lock_nested(d_inode(dentry), I_MUTEX_XATTR); inode_lock_nested(d_inode(dentry), I_MUTEX_XATTR);
inode_dio_wait(d_inode(dentry)); inode_dio_wait(d_inode(dentry));
err = reiserfs_setattr(&init_user_ns, dentry, &newattrs); err = reiserfs_setattr(&nop_mnt_idmap, dentry, &newattrs);
inode_unlock(d_inode(dentry)); inode_unlock(d_inode(dentry));
} else } else
update_ctime(inode); update_ctime(inode);

6
fs/sysv/file.c
View File

@ -29,13 +29,13 @@ const struct file_operations sysv_file_operations = {
.splice_read = generic_file_splice_read, .splice_read = generic_file_splice_read,
}; };
static int sysv_setattr(struct user_namespace *mnt_userns, static int sysv_setattr(struct mnt_idmap *idmap,
struct dentry *dentry, struct iattr *attr) struct dentry *dentry, struct iattr *attr)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
int error; int error;
error = setattr_prepare(&init_user_ns, dentry, attr); error = setattr_prepare(&nop_mnt_idmap, dentry, attr);
if (error) if (error)
return error; return error;
@ -48,7 +48,7 @@ static int sysv_setattr(struct user_namespace *mnt_userns,
sysv_truncate(inode); sysv_truncate(inode);
} }
setattr_copy(&init_user_ns, inode, attr); setattr_copy(&nop_mnt_idmap, inode, attr);
mark_inode_dirty(inode); mark_inode_dirty(inode);
return 0; return 0;
} }

4
fs/ubifs/file.c
View File

@ -1258,7 +1258,7 @@ static int do_setattr(struct ubifs_info *c, struct inode *inode,
return err; return err;
} }
int ubifs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, int ubifs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *attr) struct iattr *attr)
{ {
int err; int err;
@ -1267,7 +1267,7 @@ int ubifs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
dbg_gen("ino %lu, mode %#x, ia_valid %#x", dbg_gen("ino %lu, mode %#x, ia_valid %#x",
inode->i_ino, inode->i_mode, attr->ia_valid); inode->i_ino, inode->i_mode, attr->ia_valid);
err = setattr_prepare(&init_user_ns, dentry, attr); err = setattr_prepare(&nop_mnt_idmap, dentry, attr);
if (err) if (err)
return err; return err;

2
fs/ubifs/ubifs.h
View File

@ -2020,7 +2020,7 @@ int ubifs_calc_dark(const struct ubifs_info *c, int spc);
/* file.c */ /* file.c */
int ubifs_fsync(struct file *file, loff_t start, loff_t end, int datasync); int ubifs_fsync(struct file *file, loff_t start, loff_t end, int datasync);
int ubifs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, int ubifs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *attr); struct iattr *attr);
int ubifs_update_time(struct inode *inode, struct timespec64 *time, int flags); int ubifs_update_time(struct inode *inode, struct timespec64 *time, int flags);

6
fs/udf/file.c
View File

@ -256,14 +256,14 @@ const struct file_operations udf_file_operations = {
.llseek = generic_file_llseek, .llseek = generic_file_llseek,
}; };
static int udf_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, static int udf_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *attr) struct iattr *attr)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
struct super_block *sb = inode->i_sb; struct super_block *sb = inode->i_sb;
int error; int error;
error = setattr_prepare(&init_user_ns, dentry, attr); error = setattr_prepare(&nop_mnt_idmap, dentry, attr);
if (error) if (error)
return error; return error;
@ -286,7 +286,7 @@ static int udf_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
if (attr->ia_valid & ATTR_MODE) if (attr->ia_valid & ATTR_MODE)
udf_update_extra_perms(inode, attr->ia_mode); udf_update_extra_perms(inode, attr->ia_mode);
setattr_copy(&init_user_ns, inode, attr); setattr_copy(&nop_mnt_idmap, inode, attr);
mark_inode_dirty(inode); mark_inode_dirty(inode);
return 0; return 0;
} }

6
fs/ufs/inode.c
View File

@ -1212,14 +1212,14 @@ out:
return err; return err;
} }
int ufs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, int ufs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *attr) struct iattr *attr)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
unsigned int ia_valid = attr->ia_valid; unsigned int ia_valid = attr->ia_valid;
int error; int error;
error = setattr_prepare(&init_user_ns, dentry, attr); error = setattr_prepare(&nop_mnt_idmap, dentry, attr);
if (error) if (error)
return error; return error;
@ -1229,7 +1229,7 @@ int ufs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
return error; return error;
} }
setattr_copy(&init_user_ns, inode, attr); setattr_copy(&nop_mnt_idmap, inode, attr);
mark_inode_dirty(inode); mark_inode_dirty(inode);
return 0; return 0;
} }

2
fs/ufs/ufs.h
View File

@ -123,7 +123,7 @@ extern struct inode *ufs_iget(struct super_block *, unsigned long);
extern int ufs_write_inode (struct inode *, struct writeback_control *); extern int ufs_write_inode (struct inode *, struct writeback_control *);
extern int ufs_sync_inode (struct inode *); extern int ufs_sync_inode (struct inode *);
extern void ufs_evict_inode (struct inode *); extern void ufs_evict_inode (struct inode *);
extern int ufs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, extern int ufs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *attr); struct iattr *attr);
/* namei.c */ /* namei.c */

2
fs/vboxsf/utils.c
View File

@ -256,7 +256,7 @@ int vboxsf_getattr(struct user_namespace *mnt_userns, const struct path *path,
return 0; return 0;
} }
int vboxsf_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, int vboxsf_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *iattr) struct iattr *iattr)
{ {
struct vboxsf_inode *sf_i = VBOXSF_I(d_inode(dentry)); struct vboxsf_inode *sf_i = VBOXSF_I(d_inode(dentry));

2
fs/vboxsf/vfsmod.h
View File

@ -100,7 +100,7 @@ int vboxsf_inode_revalidate(struct dentry *dentry);
int vboxsf_getattr(struct user_namespace *mnt_userns, const struct path *path, int vboxsf_getattr(struct user_namespace *mnt_userns, const struct path *path,
struct kstat *kstat, u32 request_mask, struct kstat *kstat, u32 request_mask,
unsigned int query_flags); unsigned int query_flags);
int vboxsf_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, int vboxsf_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *iattr); struct iattr *iattr);
struct shfl_string *vboxsf_path_from_dentry(struct vboxsf_sbi *sbi, struct shfl_string *vboxsf_path_from_dentry(struct vboxsf_sbi *sbi,
struct dentry *dentry); struct dentry *dentry);

2
fs/xfs/xfs_file.c
View File

@ -1047,7 +1047,7 @@ xfs_file_fallocate(
iattr.ia_valid = ATTR_SIZE; iattr.ia_valid = ATTR_SIZE;
iattr.ia_size = new_size; iattr.ia_size = new_size;
error = xfs_vn_setattr_size(file_mnt_user_ns(file), error = xfs_vn_setattr_size(file_mnt_idmap(file),
file_dentry(file), &iattr); file_dentry(file), &iattr);
if (error) if (error)
goto out_unlock; goto out_unlock;

29
fs/xfs/xfs_iops.c
View File

@ -627,7 +627,7 @@ xfs_vn_getattr(
static int static int
xfs_vn_change_ok( xfs_vn_change_ok(
struct user_namespace *mnt_userns, struct mnt_idmap *idmap,
struct dentry *dentry, struct dentry *dentry,
struct iattr *iattr) struct iattr *iattr)
{ {
@ -639,7 +639,7 @@ xfs_vn_change_ok(
if (xfs_is_shutdown(mp)) if (xfs_is_shutdown(mp))
return -EIO; return -EIO;
return setattr_prepare(mnt_userns, dentry, iattr); return setattr_prepare(idmap, dentry, iattr);
} }
/* /*
@ -650,7 +650,7 @@ xfs_vn_change_ok(
*/ */
static int static int
xfs_setattr_nonsize( xfs_setattr_nonsize(
struct user_namespace *mnt_userns, struct mnt_idmap *idmap,
struct dentry *dentry, struct dentry *dentry,
struct xfs_inode *ip, struct xfs_inode *ip,
struct iattr *iattr) struct iattr *iattr)
@ -664,6 +664,7 @@ xfs_setattr_nonsize(
kgid_t gid = GLOBAL_ROOT_GID; kgid_t gid = GLOBAL_ROOT_GID;
struct xfs_dquot *udqp = NULL, *gdqp = NULL; struct xfs_dquot *udqp = NULL, *gdqp = NULL;
struct xfs_dquot *old_udqp = NULL, *old_gdqp = NULL; struct xfs_dquot *old_udqp = NULL, *old_gdqp = NULL;
struct user_namespace *mnt_userns = mnt_idmap_owner(idmap);
ASSERT((mask & ATTR_SIZE) == 0); ASSERT((mask & ATTR_SIZE) == 0);
@ -730,7 +731,7 @@ xfs_setattr_nonsize(
old_gdqp = xfs_qm_vop_chown(tp, ip, &ip->i_gdquot, gdqp); old_gdqp = xfs_qm_vop_chown(tp, ip, &ip->i_gdquot, gdqp);
} }
setattr_copy(mnt_userns, inode, iattr); setattr_copy(idmap, inode, iattr);
xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
XFS_STATS_INC(mp, xs_ig_attrchg); XFS_STATS_INC(mp, xs_ig_attrchg);
@ -779,7 +780,7 @@ out_dqrele:
*/ */
STATIC int STATIC int
xfs_setattr_size( xfs_setattr_size(
struct user_namespace *mnt_userns, struct mnt_idmap *idmap,
struct dentry *dentry, struct dentry *dentry,
struct xfs_inode *ip, struct xfs_inode *ip,
struct iattr *iattr) struct iattr *iattr)
@ -812,7 +813,7 @@ xfs_setattr_size(
* Use the regular setattr path to update the timestamps. * Use the regular setattr path to update the timestamps.
*/ */
iattr->ia_valid &= ~ATTR_SIZE; iattr->ia_valid &= ~ATTR_SIZE;
return xfs_setattr_nonsize(mnt_userns, dentry, ip, iattr); return xfs_setattr_nonsize(idmap, dentry, ip, iattr);
} }
/* /*
@ -956,7 +957,7 @@ xfs_setattr_size(
} }
ASSERT(!(iattr->ia_valid & (ATTR_UID | ATTR_GID))); ASSERT(!(iattr->ia_valid & (ATTR_UID | ATTR_GID)));
setattr_copy(mnt_userns, inode, iattr); setattr_copy(idmap, inode, iattr);
xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
XFS_STATS_INC(mp, xs_ig_attrchg); XFS_STATS_INC(mp, xs_ig_attrchg);
@ -977,7 +978,7 @@ out_trans_cancel:
int int
xfs_vn_setattr_size( xfs_vn_setattr_size(
struct user_namespace *mnt_userns, struct mnt_idmap *idmap,
struct dentry *dentry, struct dentry *dentry,
struct iattr *iattr) struct iattr *iattr)
{ {
@ -986,15 +987,15 @@ xfs_vn_setattr_size(
trace_xfs_setattr(ip); trace_xfs_setattr(ip);
error = xfs_vn_change_ok(mnt_userns, dentry, iattr); error = xfs_vn_change_ok(idmap, dentry, iattr);
if (error) if (error)
return error; return error;
return xfs_setattr_size(mnt_userns, dentry, ip, iattr); return xfs_setattr_size(idmap, dentry, ip, iattr);
} }
STATIC int STATIC int
xfs_vn_setattr( xfs_vn_setattr(
struct user_namespace *mnt_userns, struct mnt_idmap *idmap,
struct dentry *dentry, struct dentry *dentry,
struct iattr *iattr) struct iattr *iattr)
{ {
@ -1014,14 +1015,14 @@ xfs_vn_setattr(
return error; return error;
} }
error = xfs_vn_setattr_size(mnt_userns, dentry, iattr); error = xfs_vn_setattr_size(idmap, dentry, iattr);
xfs_iunlock(ip, XFS_MMAPLOCK_EXCL); xfs_iunlock(ip, XFS_MMAPLOCK_EXCL);
} else { } else {
trace_xfs_setattr(ip); trace_xfs_setattr(ip);
error = xfs_vn_change_ok(mnt_userns, dentry, iattr); error = xfs_vn_change_ok(idmap, dentry, iattr);
if (!error) if (!error)
error = xfs_setattr_nonsize(mnt_userns, dentry, ip, iattr); error = xfs_setattr_nonsize(idmap, dentry, ip, iattr);
} }
return error; return error;

2
fs/xfs/xfs_iops.h
View File

@ -13,7 +13,7 @@ extern const struct file_operations xfs_dir_file_operations;
extern ssize_t xfs_vn_listxattr(struct dentry *, char *data, size_t size); extern ssize_t xfs_vn_listxattr(struct dentry *, char *data, size_t size);
int xfs_vn_setattr_size(struct user_namespace *mnt_userns, int xfs_vn_setattr_size(struct mnt_idmap *idmap,
struct dentry *dentry, struct iattr *vap); struct dentry *dentry, struct iattr *vap);
int xfs_inode_init_security(struct inode *inode, struct inode *dir, int xfs_inode_init_security(struct inode *inode, struct inode *dir,

2
fs/xfs/xfs_pnfs.c
View File

@ -322,7 +322,7 @@ xfs_fs_commit_blocks(
xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
ASSERT(!(iattr->ia_valid & (ATTR_UID | ATTR_GID))); ASSERT(!(iattr->ia_valid & (ATTR_UID | ATTR_GID)));
setattr_copy(&init_user_ns, inode, iattr); setattr_copy(&nop_mnt_idmap, inode, iattr);
if (update_isize) { if (update_isize) {
i_size_write(inode, iattr->ia_size); i_size_write(inode, iattr->ia_size);
ip->i_disk_size = iattr->ia_size; ip->i_disk_size = iattr->ia_size;

8
fs/zonefs/super.c
View File

@ -600,7 +600,7 @@ unlock:
return ret; return ret;
} }
static int zonefs_inode_setattr(struct user_namespace *mnt_userns, static int zonefs_inode_setattr(struct mnt_idmap *idmap,
struct dentry *dentry, struct iattr *iattr) struct dentry *dentry, struct iattr *iattr)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
@ -609,7 +609,7 @@ static int zonefs_inode_setattr(struct user_namespace *mnt_userns,
if (unlikely(IS_IMMUTABLE(inode))) if (unlikely(IS_IMMUTABLE(inode)))
return -EPERM; return -EPERM;
ret = setattr_prepare(&init_user_ns, dentry, iattr); ret = setattr_prepare(&nop_mnt_idmap, dentry, iattr);
if (ret) if (ret)
return ret; return ret;
@ -626,7 +626,7 @@ static int zonefs_inode_setattr(struct user_namespace *mnt_userns,
!uid_eq(iattr->ia_uid, inode->i_uid)) || !uid_eq(iattr->ia_uid, inode->i_uid)) ||
((iattr->ia_valid & ATTR_GID) && ((iattr->ia_valid & ATTR_GID) &&
!gid_eq(iattr->ia_gid, inode->i_gid))) { !gid_eq(iattr->ia_gid, inode->i_gid))) {
ret = dquot_transfer(mnt_userns, inode, iattr); ret = dquot_transfer(&init_user_ns, inode, iattr);
if (ret) if (ret)
return ret; return ret;
} }
@ -637,7 +637,7 @@ static int zonefs_inode_setattr(struct user_namespace *mnt_userns,
return ret; return ret;
} }
setattr_copy(&init_user_ns, inode, iattr); setattr_copy(&nop_mnt_idmap, inode, iattr);
return 0; return 0;
} }

4
include/linux/evm.h
View File

@ -21,7 +21,7 @@ extern enum integrity_status evm_verifyxattr(struct dentry *dentry,
void *xattr_value, void *xattr_value,
size_t xattr_value_len, size_t xattr_value_len,
struct integrity_iint_cache *iint); struct integrity_iint_cache *iint);
extern int evm_inode_setattr(struct user_namespace *mnt_userns, extern int evm_inode_setattr(struct mnt_idmap *idmap,
struct dentry *dentry, struct iattr *attr); struct dentry *dentry, struct iattr *attr);
extern void evm_inode_post_setattr(struct dentry *dentry, int ia_valid); extern void evm_inode_post_setattr(struct dentry *dentry, int ia_valid);
extern int evm_inode_setxattr(struct user_namespace *mnt_userns, extern int evm_inode_setxattr(struct user_namespace *mnt_userns,
@ -90,7 +90,7 @@ static inline enum integrity_status evm_verifyxattr(struct dentry *dentry,
} }
#endif #endif
static inline int evm_inode_setattr(struct user_namespace *mnt_userns, static inline int evm_inode_setattr(struct mnt_idmap *idmap,
struct dentry *dentry, struct iattr *attr) struct dentry *dentry, struct iattr *attr)
{ {
return 0; return 0;

9
include/linux/fs.h
View File

@ -2152,8 +2152,7 @@ struct inode_operations {
umode_t,dev_t); umode_t,dev_t);
int (*rename) (struct user_namespace *, struct inode *, struct dentry *, int (*rename) (struct user_namespace *, struct inode *, struct dentry *,
struct inode *, struct dentry *, unsigned int); struct inode *, struct dentry *, unsigned int);
int (*setattr) (struct user_namespace *, struct dentry *, int (*setattr) (struct mnt_idmap *, struct dentry *, struct iattr *);
struct iattr *);
int (*getattr) (struct user_namespace *, const struct path *, int (*getattr) (struct user_namespace *, const struct path *,
struct kstat *, u32, unsigned int); struct kstat *, u32, unsigned int);
ssize_t (*listxattr) (struct dentry *, char *, size_t); ssize_t (*listxattr) (struct dentry *, char *, size_t);
@ -3313,7 +3312,7 @@ extern int dcache_dir_open(struct inode *, struct file *);
extern int dcache_dir_close(struct inode *, struct file *); extern int dcache_dir_close(struct inode *, struct file *);
extern loff_t dcache_dir_lseek(struct file *, loff_t, int); extern loff_t dcache_dir_lseek(struct file *, loff_t, int);
extern int dcache_readdir(struct file *, struct dir_context *); extern int dcache_readdir(struct file *, struct dir_context *);
extern int simple_setattr(struct user_namespace *, struct dentry *, extern int simple_setattr(struct mnt_idmap *, struct dentry *,
struct iattr *); struct iattr *);
extern int simple_getattr(struct user_namespace *, const struct path *, extern int simple_getattr(struct user_namespace *, const struct path *,
struct kstat *, u32, unsigned int); struct kstat *, u32, unsigned int);
@ -3368,9 +3367,9 @@ extern void generic_set_encrypted_ci_d_ops(struct dentry *dentry);
int may_setattr(struct user_namespace *mnt_userns, struct inode *inode, int may_setattr(struct user_namespace *mnt_userns, struct inode *inode,
unsigned int ia_valid); unsigned int ia_valid);
int setattr_prepare(struct user_namespace *, struct dentry *, struct iattr *); int setattr_prepare(struct mnt_idmap *, struct dentry *, struct iattr *);
extern int inode_newsize_ok(const struct inode *, loff_t offset); extern int inode_newsize_ok(const struct inode *, loff_t offset);
void setattr_copy(struct user_namespace *, struct inode *inode, void setattr_copy(struct mnt_idmap *, struct inode *inode,
const struct iattr *attr); const struct iattr *attr);
extern int file_update_time(struct file *file); extern int file_update_time(struct file *file);

2
include/linux/nfs_fs.h
View File

@ -405,7 +405,7 @@ extern int nfs_clear_invalid_mapping(struct address_space *mapping);
extern bool nfs_mapping_need_revalidate_inode(struct inode *inode); extern bool nfs_mapping_need_revalidate_inode(struct inode *inode);
extern int nfs_revalidate_mapping(struct inode *inode, struct address_space *mapping); extern int nfs_revalidate_mapping(struct inode *inode, struct address_space *mapping);
extern int nfs_revalidate_mapping_rcu(struct inode *inode); extern int nfs_revalidate_mapping_rcu(struct inode *inode);
extern int nfs_setattr(struct user_namespace *, struct dentry *, struct iattr *); extern int nfs_setattr(struct mnt_idmap *, struct dentry *, struct iattr *);
extern void nfs_setattr_update_inode(struct inode *inode, struct iattr *attr, struct nfs_fattr *); extern void nfs_setattr_update_inode(struct inode *inode, struct iattr *attr, struct nfs_fattr *);
extern void nfs_setsecurity(struct inode *inode, struct nfs_fattr *fattr); extern void nfs_setsecurity(struct inode *inode, struct nfs_fattr *fattr);
extern struct nfs_open_context *get_nfs_open_context(struct nfs_open_context *ctx); extern struct nfs_open_context *get_nfs_open_context(struct nfs_open_context *ctx);

4
include/linux/security.h
View File

@ -356,7 +356,7 @@ int security_inode_readlink(struct dentry *dentry);
int security_inode_follow_link(struct dentry *dentry, struct inode *inode, int security_inode_follow_link(struct dentry *dentry, struct inode *inode,
bool rcu); bool rcu);
int security_inode_permission(struct inode *inode, int mask); int security_inode_permission(struct inode *inode, int mask);
int security_inode_setattr(struct user_namespace *mnt_userns, int security_inode_setattr(struct mnt_idmap *idmap,
struct dentry *dentry, struct iattr *attr); struct dentry *dentry, struct iattr *attr);
int security_inode_getattr(const struct path *path); int security_inode_getattr(const struct path *path);
int security_inode_setxattr(struct user_namespace *mnt_userns, int security_inode_setxattr(struct user_namespace *mnt_userns,
@ -862,7 +862,7 @@ static inline int security_inode_permission(struct inode *inode, int mask)
return 0; return 0;
} }
static inline int security_inode_setattr(struct user_namespace *mnt_userns, static inline int security_inode_setattr(struct mnt_idmap *idmap,
struct dentry *dentry, struct dentry *dentry,
struct iattr *attr) struct iattr *attr)
{ {

4
mm/secretmem.c
View File

@ -162,7 +162,7 @@ const struct address_space_operations secretmem_aops = {
.migrate_folio = secretmem_migrate_folio, .migrate_folio = secretmem_migrate_folio,
}; };
static int secretmem_setattr(struct user_namespace *mnt_userns, static int secretmem_setattr(struct mnt_idmap *idmap,
struct dentry *dentry, struct iattr *iattr) struct dentry *dentry, struct iattr *iattr)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
@ -175,7 +175,7 @@ static int secretmem_setattr(struct user_namespace *mnt_userns,
if ((ia_valid & ATTR_SIZE) && inode->i_size) if ((ia_valid & ATTR_SIZE) && inode->i_size)
ret = -EINVAL; ret = -EINVAL;
else else
ret = simple_setattr(mnt_userns, dentry, iattr); ret = simple_setattr(idmap, dentry, iattr);
filemap_invalidate_unlock(mapping); filemap_invalidate_unlock(mapping);

6
mm/shmem.c
View File

@ -1082,7 +1082,7 @@ static int shmem_getattr(struct user_namespace *mnt_userns,
return 0; return 0;
} }
static int shmem_setattr(struct user_namespace *mnt_userns, static int shmem_setattr(struct mnt_idmap *idmap,
struct dentry *dentry, struct iattr *attr) struct dentry *dentry, struct iattr *attr)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
@ -1091,7 +1091,7 @@ static int shmem_setattr(struct user_namespace *mnt_userns,
bool update_mtime = false; bool update_mtime = false;
bool update_ctime = true; bool update_ctime = true;
error = setattr_prepare(&init_user_ns, dentry, attr); error = setattr_prepare(&nop_mnt_idmap, dentry, attr);
if (error) if (error)
return error; return error;
@ -1129,7 +1129,7 @@ static int shmem_setattr(struct user_namespace *mnt_userns,
} }
} }
setattr_copy(&init_user_ns, inode, attr); setattr_copy(&nop_mnt_idmap, inode, attr);
if (attr->ia_valid & ATTR_MODE) if (attr->ia_valid & ATTR_MODE)
error = posix_acl_chmod(&init_user_ns, dentry, inode->i_mode); error = posix_acl_chmod(&init_user_ns, dentry, inode->i_mode);
if (!error && update_ctime) { if (!error && update_ctime) {

4
net/socket.c
View File

@ -589,10 +589,10 @@ static ssize_t sockfs_listxattr(struct dentry *dentry, char *buffer,
return used; return used;
} }
static int sockfs_setattr(struct user_namespace *mnt_userns, static int sockfs_setattr(struct mnt_idmap *idmap,
struct dentry *dentry, struct iattr *iattr) struct dentry *dentry, struct iattr *iattr)
{ {
int err = simple_setattr(&init_user_ns, dentry, iattr); int err = simple_setattr(&nop_mnt_idmap, dentry, iattr);
if (!err && (iattr->ia_valid & ATTR_UID)) { if (!err && (iattr->ia_valid & ATTR_UID)) {
struct socket *sock = SOCKET_I(d_inode(dentry)); struct socket *sock = SOCKET_I(d_inode(dentry));

7
security/integrity/evm/evm_main.c
View File

@ -779,10 +779,11 @@ void evm_inode_post_removexattr(struct dentry *dentry, const char *xattr_name)
evm_update_evmxattr(dentry, xattr_name, NULL, 0); evm_update_evmxattr(dentry, xattr_name, NULL, 0);
} }
static int evm_attr_change(struct user_namespace *mnt_userns, static int evm_attr_change(struct mnt_idmap *idmap,
struct dentry *dentry, struct iattr *attr) struct dentry *dentry, struct iattr *attr)
{ {
struct inode *inode = d_backing_inode(dentry); struct inode *inode = d_backing_inode(dentry);
struct user_namespace *mnt_userns = mnt_idmap_owner(idmap);
unsigned int ia_valid = attr->ia_valid; unsigned int ia_valid = attr->ia_valid;
if (!i_uid_needs_update(mnt_userns, attr, inode) && if (!i_uid_needs_update(mnt_userns, attr, inode) &&
@ -800,7 +801,7 @@ static int evm_attr_change(struct user_namespace *mnt_userns,
* Permit update of file attributes when files have a valid EVM signature, * Permit update of file attributes when files have a valid EVM signature,
* except in the case of them having an immutable portable signature. * except in the case of them having an immutable portable signature.
*/ */
int evm_inode_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, int evm_inode_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct iattr *attr) struct iattr *attr)
{ {
unsigned int ia_valid = attr->ia_valid; unsigned int ia_valid = attr->ia_valid;
@ -827,7 +828,7 @@ int evm_inode_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
return 0; return 0;
if (evm_status == INTEGRITY_PASS_IMMUTABLE && if (evm_status == INTEGRITY_PASS_IMMUTABLE &&
!evm_attr_change(mnt_userns, dentry, attr)) !evm_attr_change(idmap, dentry, attr))
return 0; return 0;
integrity_audit_msg(AUDIT_INTEGRITY_METADATA, d_backing_inode(dentry), integrity_audit_msg(AUDIT_INTEGRITY_METADATA, d_backing_inode(dentry),

2
security/integrity/evm/evm_secfs.c
View File

@ -228,7 +228,7 @@ static ssize_t evm_write_xattrs(struct file *file, const char __user *buf,
newattrs.ia_valid = ATTR_MODE; newattrs.ia_valid = ATTR_MODE;
inode = evm_xattrs->d_inode; inode = evm_xattrs->d_inode;
inode_lock(inode); inode_lock(inode);
err = simple_setattr(&init_user_ns, evm_xattrs, &newattrs); err = simple_setattr(&nop_mnt_idmap, evm_xattrs, &newattrs);
inode_unlock(inode); inode_unlock(inode);
if (!err) if (!err)
err = count; err = count;

Some files were not shown because too many files have changed in this diff Show More