mirror of
https://github.com/tbsdtv/linux_media.git
synced 2025-07-23 12:43:29 +02:00
inode: make init and permission helpers idmapped mount aware
The inode_owner_or_capable() helper determines whether the caller is the owner of the inode or is capable with respect to that inode. Allow it to handle idmapped mounts. If the inode is accessed through an idmapped mount it according to the mount's user namespace. Afterwards the checks are identical to non-idmapped mounts. If the initial user namespace is passed nothing changes so non-idmapped mounts will see identical behavior as before. Similarly, allow the inode_init_owner() helper to handle idmapped mounts. It initializes a new inode on idmapped mounts by mapping the fsuid and fsgid of the caller from the mount's user namespace. If the initial user namespace is passed nothing changes so non-idmapped mounts will see identical behavior as before. Link: https://lore.kernel.org/r/20210121131959.646623-7-christian.brauner@ubuntu.com Cc: Christoph Hellwig <hch@lst.de> Cc: David Howells <dhowells@redhat.com> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: linux-fsdevel@vger.kernel.org Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: James Morris <jamorris@linux.microsoft.com> Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
@@ -59,7 +59,7 @@ long reiserfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
|
||||
if (err)
|
||||
break;
|
||||
|
||||
if (!inode_owner_or_capable(inode)) {
|
||||
if (!inode_owner_or_capable(&init_user_ns, inode)) {
|
||||
err = -EPERM;
|
||||
goto setflags_out;
|
||||
}
|
||||
@@ -101,7 +101,7 @@ setflags_out:
|
||||
err = put_user(inode->i_generation, (int __user *)arg);
|
||||
break;
|
||||
case REISERFS_IOC_SETVERSION:
|
||||
if (!inode_owner_or_capable(inode)) {
|
||||
if (!inode_owner_or_capable(&init_user_ns, inode)) {
|
||||
err = -EPERM;
|
||||
break;
|
||||
}
|
||||
|
@@ -615,7 +615,7 @@ static int new_inode_init(struct inode *inode, struct inode *dir, umode_t mode)
|
||||
* the quota init calls have to know who to charge the quota to, so
|
||||
* we have to set uid and gid here
|
||||
*/
|
||||
inode_init_owner(inode, dir, mode);
|
||||
inode_init_owner(&init_user_ns, inode, dir, mode);
|
||||
return dquot_initialize(inode);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user