Commit 0260b0a7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'exfat-for-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat 

Pull exfat updates from Namjae Jeon:

 - Fix deadlock issue reported by syzbot

 - Handle idmapped mounts

* tag 'exfat-for-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat:
  exfat: fix potential deadlock on __exfat_get_dentry_set
  exfat: handle idmapped mounts
parents a1b547f0 89fc5487

fs/exfat/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -813,7 +813,7 @@ static int __exfat_get_dentry_set(struct exfat_entry_set_cache *es, 


	num_bh = EXFAT_B_TO_BLK_ROUND_UP(off + num_entries * DENTRY_SIZE, sb);

	if (num_bh > ARRAY_SIZE(es->__bh)) {

		es->bh = kmalloc_array(num_bh, sizeof(*es->bh), GFP_KERNEL);

		es->bh = kmalloc_array(num_bh, sizeof(*es->bh), GFP_NOFS);

		if (!es->bh) {

			brelse(bh);

			return -ENOMEM;

fs/exfat/file.c

+13 −9
Original line number Diff line number Diff line
@@ -89,12 +89,14 @@ static int exfat_cont_expand(struct inode *inode, loff_t size) 
	return -EIO;

}



static bool exfat_allow_set_time(struct exfat_sb_info *sbi, struct inode *inode)

static bool exfat_allow_set_time(struct mnt_idmap *idmap,

				 struct exfat_sb_info *sbi, struct inode *inode)

{

	mode_t allow_utime = sbi->options.allow_utime;



	if (!uid_eq(current_fsuid(), inode->i_uid)) {

		if (in_group_p(inode->i_gid))

	if (!vfsuid_eq_kuid(i_uid_into_vfsuid(idmap, inode),

			    current_fsuid())) {

		if (vfsgid_in_group_p(i_gid_into_vfsgid(idmap, inode)))

			allow_utime >>= 3;

		if (allow_utime & MAY_WRITE)

			return true;
@@ -283,7 +285,7 @@ int exfat_getattr(struct mnt_idmap *idmap, const struct path *path, 
	struct inode *inode = d_backing_inode(path->dentry);

	struct exfat_inode_info *ei = EXFAT_I(inode);



	generic_fillattr(&nop_mnt_idmap, request_mask, inode, stat);

	generic_fillattr(idmap, request_mask, inode, stat);

	exfat_truncate_atime(&stat->atime);

	stat->result_mask |= STATX_BTIME;

	stat->btime.tv_sec = ei->i_crtime.tv_sec;
@@ -311,20 +313,22 @@ int exfat_setattr(struct mnt_idmap *idmap, struct dentry *dentry, 
	/* Check for setting the inode time. */

	ia_valid = attr->ia_valid;

	if ((ia_valid & (ATTR_MTIME_SET | ATTR_ATIME_SET | ATTR_TIMES_SET)) &&

	    exfat_allow_set_time(sbi, inode)) {

	    exfat_allow_set_time(idmap, sbi, inode)) {

		attr->ia_valid &= ~(ATTR_MTIME_SET | ATTR_ATIME_SET |

				ATTR_TIMES_SET);

	}



	error = setattr_prepare(&nop_mnt_idmap, dentry, attr);

	error = setattr_prepare(idmap, dentry, attr);

	attr->ia_valid = ia_valid;

	if (error)

		goto out;



	if (((attr->ia_valid & ATTR_UID) &&

	     !uid_eq(attr->ia_uid, sbi->options.fs_uid)) ||

	      (!uid_eq(from_vfsuid(idmap, i_user_ns(inode), attr->ia_vfsuid),

	       sbi->options.fs_uid))) ||

	    ((attr->ia_valid & ATTR_GID) &&

	     !gid_eq(attr->ia_gid, sbi->options.fs_gid)) ||

	      (!gid_eq(from_vfsgid(idmap, i_user_ns(inode), attr->ia_vfsgid),

	       sbi->options.fs_gid))) ||

	    ((attr->ia_valid & ATTR_MODE) &&

	     (attr->ia_mode & ~(S_IFREG | S_IFLNK | S_IFDIR | 0777)))) {

		error = -EPERM;
@@ -343,7 +347,7 @@ int exfat_setattr(struct mnt_idmap *idmap, struct dentry *dentry, 
	if (attr->ia_valid & ATTR_SIZE)

		inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));



	setattr_copy(&nop_mnt_idmap, inode, attr);

	setattr_copy(idmap, inode, attr);

	exfat_truncate_inode_atime(inode);



	if (attr->ia_valid & ATTR_SIZE) {

fs/exfat/super.c

+1 −1
Original line number Diff line number Diff line
@@ -788,7 +788,7 @@ static struct file_system_type exfat_fs_type = { 
	.init_fs_context	= exfat_init_fs_context,

	.parameters		= exfat_parameters,

	.kill_sb		= exfat_kill_sb,

	.fs_flags		= FS_REQUIRES_DEV,

	.fs_flags		= FS_REQUIRES_DEV | FS_ALLOW_IDMAP,

};



static void exfat_inode_init_once(void *foo)