Commit 1e098dec authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ntfs3_for_6.4' of https://github.com/Paragon-Software-Group/linux-ntfs3 

Pull ntfs3 updates from Konstantin Komarov:
 "New code:

   - add missed "nocase" in ntfs_show_options

   - extend information on failures/errors

   - small optimizations

  Fixes:

   - some logic errors

   - some dead code was removed

   - code is refactored and reformatted according to the new version of
     clang-format

  Code removal:

   - 'noacsrules' option.

     Currently, this option does not work properly, and its use leads to
     unstable results. If we figure out how to implement it without
     errors, we will add it later

   - writepage"

* tag 'ntfs3_for_6.4' of https://github.com/Paragon-Software-Group/linux-ntfs3: (30 commits)
  fs/ntfs3: Fix root inode checking
  fs/ntfs3: Print details about mount fails
  fs/ntfs3: Add missed "nocase" in ntfs_show_options
  fs/ntfs3: Code formatting and refactoring
  fs/ntfs3: Changed ntfs_get_acl() to use dentry
  fs/ntfs3: Remove field sbi->used.bitmap.set_tail
  fs/ntfs3: Undo critial modificatins to keep directory consistency
  fs/ntfs3: Undo endian changes
  fs/ntfs3: Optimization in ntfs_set_state()
  fs/ntfs3: Fix ntfs_create_inode()
  fs/ntfs3: Remove noacsrules
  fs/ntfs3: Use bh_read to simplify code
  fs/ntfs3: Fix a possible null-pointer dereference in ni_clear()
  fs/ntfs3: Refactoring of various minor issues
  fs/ntfs3: Restore overflow checking for attr size in mi_enum_attr
  fs/ntfs3: Check for extremely large size of $AttrDef
  fs/ntfs3: Improved checking of attribute's name length
  fs/ntfs3: Add null pointer checks
  fs/ntfs3: fix spelling mistake "attibute" -> "attribute"
  fs/ntfs3: Add length check in indx_get_root
  ...
parents 56c455b3 788ee160

Documentation/filesystems/ntfs3.rst

+0 −11
Original line number Diff line number Diff line
@@ -61,17 +61,6 @@ this table marked with no it means default is without **no**. 
       directories, fmask applies only to files and dmask only to directories.

   * - fmask=



   * - noacsrules

     - "No access rules" mount option sets access rights for files/folders to

       777 and owner/group to root. This mount option absorbs all other

       permissions.



       - Permissions change for files/folders will be reported as successful,

	 but they will remain 777.



       - Owner/group change will be reported as successful, butthey will stay

	 as root.



   * - nohidden

     - Files with the Windows-specific HIDDEN (FILE_ATTRIBUTE_HIDDEN) attribute

       will not be shown under Linux.

fs/ntfs3/attrib.c

+8 −9
Original line number Diff line number Diff line
@@ -405,8 +405,8 @@ int attr_set_size(struct ntfs_inode *ni, enum ATTR_TYPE type, 
	int err = 0;

	struct ntfs_sb_info *sbi = ni->mi.sbi;

	u8 cluster_bits = sbi->cluster_bits;

	bool is_mft =

		ni->mi.rno == MFT_REC_MFT && type == ATTR_DATA && !name_len;

	bool is_mft = ni->mi.rno == MFT_REC_MFT && type == ATTR_DATA &&

		      !name_len;

	u64 old_valid, old_size, old_alloc, new_alloc, new_alloc_tmp;

	struct ATTRIB *attr = NULL, *attr_b;

	struct ATTR_LIST_ENTRY *le, *le_b;
@@ -531,10 +531,9 @@ int attr_set_size(struct ntfs_inode *ni, enum ATTR_TYPE type, 
			pre_alloc = 0;

			if (type == ATTR_DATA && !name_len &&

			    sbi->options->prealloc) {

				pre_alloc =

					bytes_to_cluster(

						sbi,

						get_pre_allocated(new_size)) -

				pre_alloc = bytes_to_cluster(

						    sbi, get_pre_allocated(

								 new_size)) -

					    new_alen;

			}
@@ -573,8 +572,8 @@ int attr_set_size(struct ntfs_inode *ni, enum ATTR_TYPE type, 
			err = attr_allocate_clusters(

				sbi, run, vcn, lcn, to_allocate, &pre_alloc,

				is_mft ? ALLOCATE_MFT : ALLOCATE_DEF, &alen,

				is_mft ? 0

				       : (sbi->record_size -

				is_mft ? 0 :

					       (sbi->record_size -

					  le32_to_cpu(rec->used) + 8) /

							 3 +

						 1,

fs/ntfs3/bitmap.c

+13 −12
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ static struct kmem_cache *ntfs_enode_cachep; 


int __init ntfs3_init_bitmap(void)

{

	ntfs_enode_cachep =

		kmem_cache_create("ntfs3_enode_cache", sizeof(struct e_node), 0,

	ntfs_enode_cachep = kmem_cache_create("ntfs3_enode_cache",

					      sizeof(struct e_node), 0,

					      SLAB_RECLAIM_ACCOUNT, NULL);

	return ntfs_enode_cachep ? 0 : -ENOMEM;

}
@@ -286,9 +286,9 @@ static void wnd_add_free_ext(struct wnd_bitmap *wnd, size_t bit, size_t len, 
		if (wnd->uptodated != 1) {

			/* Check bits before 'bit'. */

			ib = wnd->zone_bit == wnd->zone_end ||

					     bit < wnd->zone_end

				     ? 0

				     : wnd->zone_end;

					     bit < wnd->zone_end ?

					   0 :

					   wnd->zone_end;



			while (bit > ib && wnd_is_free_hlp(wnd, bit - 1, 1)) {

				bit -= 1;
@@ -297,9 +297,9 @@ static void wnd_add_free_ext(struct wnd_bitmap *wnd, size_t bit, size_t len, 


			/* Check bits after 'end_in'. */

			ib = wnd->zone_bit == wnd->zone_end ||

					     end_in > wnd->zone_bit

				     ? wnd->nbits

				     : wnd->zone_bit;

					     end_in > wnd->zone_bit ?

					   wnd->nbits :

					   wnd->zone_bit;



			while (end_in < ib && wnd_is_free_hlp(wnd, end_in, 1)) {

				end_in += 1;
@@ -417,8 +417,8 @@ static void wnd_remove_free_ext(struct wnd_bitmap *wnd, size_t bit, size_t len) 
			return;

		n3 = rb_first(&wnd->count_tree);

		wnd->extent_max =

			n3 ? rb_entry(n3, struct e_node, count.node)->count.key

			   : 0;

			n3 ? rb_entry(n3, struct e_node, count.node)->count.key :

				   0;

		return;

	}
@@ -658,7 +658,8 @@ int wnd_init(struct wnd_bitmap *wnd, struct super_block *sb, size_t nbits) 
	if (!wnd->bits_last)

		wnd->bits_last = wbits;



	wnd->free_bits = kcalloc(wnd->nwnd, sizeof(u16), GFP_NOFS | __GFP_NOWARN);

	wnd->free_bits =

		kcalloc(wnd->nwnd, sizeof(u16), GFP_NOFS | __GFP_NOWARN);

	if (!wnd->free_bits)

		return -ENOMEM;

fs/ntfs3/file.c

+18 −32
Original line number Diff line number Diff line
@@ -22,20 +22,21 @@ static int ntfs_ioctl_fitrim(struct ntfs_sb_info *sbi, unsigned long arg) 
{

	struct fstrim_range __user *user_range;

	struct fstrim_range range;

	struct block_device *dev;

	int err;



	if (!capable(CAP_SYS_ADMIN))

		return -EPERM;



	if (!bdev_max_discard_sectors(sbi->sb->s_bdev))

	dev = sbi->sb->s_bdev;

	if (!bdev_max_discard_sectors(dev))

		return -EOPNOTSUPP;



	user_range = (struct fstrim_range __user *)arg;

	if (copy_from_user(&range, user_range, sizeof(range)))

		return -EFAULT;



	range.minlen = max_t(u32, range.minlen,

			     bdev_discard_granularity(sbi->sb->s_bdev));

	range.minlen = max_t(u32, range.minlen, bdev_discard_granularity(dev));



	err = ntfs_trim_fs(sbi, &range);

	if (err < 0)
@@ -190,8 +191,8 @@ static int ntfs_zero_range(struct inode *inode, u64 vbo, u64 vbo_to) 


	for (; idx < idx_end; idx += 1, from = 0) {

		page_off = (loff_t)idx << PAGE_SHIFT;

		to = (page_off + PAGE_SIZE) > vbo_to ? (vbo_to - page_off)

						     : PAGE_SIZE;

		to = (page_off + PAGE_SIZE) > vbo_to ? (vbo_to - page_off) :

							     PAGE_SIZE;

		iblock = page_off >> inode->i_blkbits;



		page = find_or_create_page(mapping, idx,
@@ -223,16 +224,10 @@ static int ntfs_zero_range(struct inode *inode, u64 vbo, u64 vbo_to) 
				set_buffer_uptodate(bh);



			if (!buffer_uptodate(bh)) {

				lock_buffer(bh);

				bh->b_end_io = end_buffer_read_sync;

				get_bh(bh);

				submit_bh(REQ_OP_READ, bh);



				wait_on_buffer(bh);

				if (!buffer_uptodate(bh)) {

				err = bh_read(bh, 0);

				if (err < 0) {

					unlock_page(page);

					put_page(page);

					err = -EIO;

					goto out;

				}

			}
@@ -570,13 +565,14 @@ static long ntfs_fallocate(struct file *file, int mode, loff_t vbo, loff_t len) 
		ni_unlock(ni);

	} else {

		/* Check new size. */

		u8 cluster_bits = sbi->cluster_bits;



		/* generic/213: expected -ENOSPC instead of -EFBIG. */

		if (!is_supported_holes) {

			loff_t to_alloc = new_size - inode_get_bytes(inode);



			if (to_alloc > 0 &&

			    (to_alloc >> sbi->cluster_bits) >

			    (to_alloc >> cluster_bits) >

				    wnd_zeroes(&sbi->used.bitmap)) {

				err = -ENOSPC;

				goto out;
@@ -597,7 +593,7 @@ static long ntfs_fallocate(struct file *file, int mode, loff_t vbo, loff_t len) 
		}



		if (is_supported_holes) {

			CLST vcn = vbo >> sbi->cluster_bits;

			CLST vcn = vbo >> cluster_bits;

			CLST cend = bytes_to_cluster(sbi, end);

			CLST cend_v = bytes_to_cluster(sbi, ni->i_valid);

			CLST lcn, clen;
@@ -660,22 +656,12 @@ static long ntfs_fallocate(struct file *file, int mode, loff_t vbo, loff_t len) 
int ntfs3_setattr(struct mnt_idmap *idmap, struct dentry *dentry,

		  struct iattr *attr)

{

	struct super_block *sb = dentry->d_sb;

	struct ntfs_sb_info *sbi = sb->s_fs_info;

	struct inode *inode = d_inode(dentry);

	struct ntfs_inode *ni = ntfs_i(inode);

	u32 ia_valid = attr->ia_valid;

	umode_t mode = inode->i_mode;

	int err;



	if (sbi->options->noacsrules) {

		/* "No access rules" - Force any changes of time etc. */

		attr->ia_valid |= ATTR_FORCE;

		/* and disable for editing some attributes. */

		attr->ia_valid &= ~(ATTR_UID | ATTR_GID | ATTR_MODE);

		ia_valid = attr->ia_valid;

	}



	err = setattr_prepare(idmap, dentry, attr);

	if (err)

		goto out;
@@ -719,7 +705,7 @@ int ntfs3_setattr(struct mnt_idmap *idmap, struct dentry *dentry, 
	}



	if (ia_valid & (ATTR_UID | ATTR_GID | ATTR_MODE))

		ntfs_save_wsl_perm(inode);

		ntfs_save_wsl_perm(inode, NULL);

	mark_inode_dirty(inode);

out:

	return err;
@@ -1065,8 +1051,8 @@ static ssize_t ntfs_file_write_iter(struct kiocb *iocb, struct iov_iter *from) 
	if (ret)

		goto out;



	ret = is_compressed(ni) ? ntfs_compress_write(iocb, from)

				: __generic_file_write_iter(iocb, from);

	ret = is_compressed(ni) ? ntfs_compress_write(iocb, from) :

					__generic_file_write_iter(iocb, from);



out:

	inode_unlock(inode);
@@ -1118,7 +1104,8 @@ static int ntfs_file_release(struct inode *inode, struct file *file) 
	int err = 0;



	/* If we are last writer on the inode, drop the block reservation. */

	if (sbi->options->prealloc && ((file->f_mode & FMODE_WRITE) &&

	if (sbi->options->prealloc &&

	    ((file->f_mode & FMODE_WRITE) &&

	     atomic_read(&inode->i_writecount) == 1)) {

		ni_lock(ni);

		down_write(&ni->file.run_lock);
@@ -1159,8 +1146,7 @@ const struct inode_operations ntfs_file_inode_operations = { 
	.getattr	= ntfs_getattr,

	.setattr	= ntfs3_setattr,

	.listxattr	= ntfs_listxattr,

	.permission	= ntfs_permission,

	.get_inode_acl	= ntfs_get_acl,

	.get_acl	= ntfs_get_acl,

	.set_acl	= ntfs_set_acl,

	.fiemap		= ntfs_fiemap,

};

fs/ntfs3/frecord.c

+23 −23
Original line number Diff line number Diff line
@@ -76,8 +76,8 @@ struct ATTR_STD_INFO *ni_std(struct ntfs_inode *ni) 
	const struct ATTRIB *attr;



	attr = mi_find_attr(&ni->mi, NULL, ATTR_STD, NULL, 0, NULL);

	return attr ? resident_data_ex(attr, sizeof(struct ATTR_STD_INFO))

		    : NULL;

	return attr ? resident_data_ex(attr, sizeof(struct ATTR_STD_INFO)) :

			    NULL;

}



/*
@@ -91,8 +91,8 @@ struct ATTR_STD_INFO5 *ni_std5(struct ntfs_inode *ni) 


	attr = mi_find_attr(&ni->mi, NULL, ATTR_STD, NULL, 0, NULL);



	return attr ? resident_data_ex(attr, sizeof(struct ATTR_STD_INFO5))

		    : NULL;

	return attr ? resident_data_ex(attr, sizeof(struct ATTR_STD_INFO5)) :

			    NULL;

}



/*
@@ -102,7 +102,7 @@ void ni_clear(struct ntfs_inode *ni) 
{

	struct rb_node *node;



	if (!ni->vfs_inode.i_nlink && is_rec_inuse(ni->mi.mrec))

	if (!ni->vfs_inode.i_nlink && ni->mi.mrec && is_rec_inuse(ni->mi.mrec))

		ni_delete_all(ni);



	al_destroy(ni);
@@ -1439,8 +1439,8 @@ int ni_insert_nonresident(struct ntfs_inode *ni, enum ATTR_TYPE type, 
	int err;

	CLST plen;

	struct ATTRIB *attr;

	bool is_ext =

		(flags & (ATTR_FLAG_SPARSED | ATTR_FLAG_COMPRESSED)) && !svcn;

	bool is_ext = (flags & (ATTR_FLAG_SPARSED | ATTR_FLAG_COMPRESSED)) &&

		      !svcn;

	u32 name_size = ALIGN(name_len * sizeof(short), 8);

	u32 name_off = is_ext ? SIZEOF_NONRESIDENT_EX : SIZEOF_NONRESIDENT;

	u32 run_off = name_off + name_size;
@@ -1756,9 +1756,9 @@ int ni_new_attr_flags(struct ntfs_inode *ni, enum FILE_ATTRIBUTE new_fa) 
	}



	/* Resize nonresident empty attribute in-place only. */

	new_asize = (new_aflags & (ATTR_FLAG_COMPRESSED | ATTR_FLAG_SPARSED))

			    ? (SIZEOF_NONRESIDENT_EX + 8)

			    : (SIZEOF_NONRESIDENT + 8);

	new_asize = (new_aflags & (ATTR_FLAG_COMPRESSED | ATTR_FLAG_SPARSED)) ?

				  (SIZEOF_NONRESIDENT_EX + 8) :

				  (SIZEOF_NONRESIDENT + 8);



	if (!mi_resize_attr(mi, attr, new_asize - le32_to_cpu(attr->size)))

		return -EOPNOTSUPP;
@@ -2965,14 +2965,14 @@ bool ni_remove_name_undo(struct ntfs_inode *dir_ni, struct ntfs_inode *ni, 
{

	struct ntfs_sb_info *sbi = ni->mi.sbi;

	struct ATTRIB *attr;

	u16 de_key_size = de2 ? le16_to_cpu(de2->key_size) : 0;

	u16 de_key_size;



	switch (undo_step) {

	case 4:

		de_key_size = le16_to_cpu(de2->key_size);

		if (ni_insert_resident(ni, de_key_size, ATTR_NAME, NULL, 0,

				       &attr, NULL, NULL)) {

				       &attr, NULL, NULL))

			return false;

		}

		memcpy(Add2Ptr(attr, SIZEOF_RESIDENT), de2 + 1, de_key_size);



		mi_get_ref(&ni->mi, &de2->ref);
@@ -2981,19 +2981,16 @@ bool ni_remove_name_undo(struct ntfs_inode *dir_ni, struct ntfs_inode *ni, 
		de2->flags = 0;

		de2->res = 0;



		if (indx_insert_entry(&dir_ni->dir, dir_ni, de2, sbi, NULL,

				      1)) {

		if (indx_insert_entry(&dir_ni->dir, dir_ni, de2, sbi, NULL, 1))

			return false;

		}

		fallthrough;



	case 2:

		de_key_size = le16_to_cpu(de->key_size);



		if (ni_insert_resident(ni, de_key_size, ATTR_NAME, NULL, 0,

				       &attr, NULL, NULL)) {

				       &attr, NULL, NULL))

			return false;

		}



		memcpy(Add2Ptr(attr, SIZEOF_RESIDENT), de + 1, de_key_size);

		mi_get_ref(&ni->mi, &de->ref);
@@ -3162,9 +3159,9 @@ static bool ni_update_parent(struct ntfs_inode *ni, struct NTFS_DUP_INFO *dup, 
			u64 data_size = le64_to_cpu(attr->nres.data_size);

			__le64 valid_le;



			dup->alloc_size = is_attr_ext(attr)

						  ? attr->nres.total_size

						  : attr->nres.alloc_size;

			dup->alloc_size = is_attr_ext(attr) ?

							attr->nres.total_size :

							attr->nres.alloc_size;

			dup->data_size = attr->nres.data_size;



			if (new_valid > data_size)
@@ -3258,6 +3255,9 @@ int ni_write_inode(struct inode *inode, int sync, const char *hint) 
		return 0;

	}



	if (!ni->mi.mrec)

		goto out;



	if (is_rec_inuse(ni->mi.mrec) &&

	    !(sbi->flags & NTFS_FLAGS_LOG_REPLAYING) && inode->i_nlink) {

		bool modified = false;
@@ -3360,7 +3360,7 @@ int ni_write_inode(struct inode *inode, int sync, const char *hint) 
	ni_unlock(ni);



	if (err) {

		ntfs_err(sb, "%s r=%lx failed, %d.", hint, inode->i_ino, err);

		ntfs_inode_err(inode, "%s failed, %d.", hint, err);

		ntfs_set_state(sbi, NTFS_DIRTY_ERROR);

		return err;

	}