Commit 89b61ca4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ntfs3 updates from Konstantin Komarov:
 "Fixes:
   - reusing of the file index (could cause the file to be trimmed)
   - infinite dir enumeration
   - taking DOS names into account during link counting
   - le32_to_cpu conversion, 32 bit overflow, NULL check
   - some code was refactored

  Changes:
   - removed max link count info display during driver init

  Remove:
   - atomic_open has been removed for lack of use"

* tag 'ntfs3_for_6.10' of https://github.com/Paragon-Software-Group/linux-ntfs3:
  fs/ntfs3: Break dir enumeration if directory contents error
  fs/ntfs3: Fix case when index is reused during tree transformation
  fs/ntfs3: Mark volume as dirty if xattr is broken
  fs/ntfs3: Always make file nonresident on fallocate call
  fs/ntfs3: Redesign ntfs_create_inode to return error code instead of inode
  fs/ntfs3: Use variable length array instead of fixed size
  fs/ntfs3: Use 64 bit variable to avoid 32 bit overflow
  fs/ntfs3: Check 'folio' pointer for NULL
  fs/ntfs3: Missed le32_to_cpu conversion
  fs/ntfs3: Remove max link count info display during driver init
  fs/ntfs3: Taking DOS names into account during link counting
  fs/ntfs3: remove atomic_open
  fs/ntfs3: use kcalloc() instead of kzalloc()
parents 6c8b1a2d 302e9dca

fs/ntfs3/attrib.c

+32 −0
Original line number Diff line number Diff line
@@ -2558,3 +2558,35 @@ int attr_insert_range(struct ntfs_inode *ni, u64 vbo, u64 bytes) 


	goto out;

}



/*

 * attr_force_nonresident

 *

 * Convert default data attribute into non resident form.

 */

int attr_force_nonresident(struct ntfs_inode *ni)

{

	int err;

	struct ATTRIB *attr;

	struct ATTR_LIST_ENTRY *le = NULL;

	struct mft_inode *mi;



	attr = ni_find_attr(ni, NULL, &le, ATTR_DATA, NULL, 0, NULL, &mi);

	if (!attr) {

		ntfs_bad_inode(&ni->vfs_inode, "no data attribute");

		return -ENOENT;

	}



	if (attr->non_res) {

		/* Already non resident. */

		return 0;

	}



	down_write(&ni->file.run_lock);

	err = attr_make_nonresident(ni, attr, le, mi,

				    le32_to_cpu(attr->res.data_size),

				    &ni->file.run, &attr, NULL);

	up_write(&ni->file.run_lock);



	return err;

}

fs/ntfs3/dir.c

+1 −0
Original line number Diff line number Diff line
@@ -475,6 +475,7 @@ static int ntfs_readdir(struct file *file, struct dir_context *ctx) 
		vbo = (u64)bit << index_bits;

		if (vbo >= i_size) {

			ntfs_inode_err(dir, "Looks like your dir is corrupt");

			ctx->pos = eod;

			err = -EINVAL;

			goto out;

		}

fs/ntfs3/file.c

+9 −0
Original line number Diff line number Diff line
@@ -578,6 +578,15 @@ static long ntfs_fallocate(struct file *file, int mode, loff_t vbo, loff_t len) 
		/* Check new size. */

		u8 cluster_bits = sbi->cluster_bits;



		/* Be sure file is non resident. */

		if (is_resident(ni)) {

			ni_lock(ni);

			err = attr_force_nonresident(ni);

			ni_unlock(ni);

			if (err)

				goto out;

		}



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

		if (!is_supported_holes) {

			loff_t to_alloc = new_size - inode_get_bytes(inode);

fs/ntfs3/frecord.c

+1 −1
Original line number Diff line number Diff line
@@ -2636,7 +2636,7 @@ int ni_read_frame(struct ntfs_inode *ni, u64 frame_vbo, struct page **pages, 
		goto out1;

	}



	pages_disk = kzalloc(npages_disk * sizeof(struct page *), GFP_NOFS);

	pages_disk = kcalloc(npages_disk, sizeof(*pages_disk), GFP_NOFS);

	if (!pages_disk) {

		err = -ENOMEM;

		goto out2;

fs/ntfs3/fslog.c

+3 −2
Original line number Diff line number Diff line
@@ -517,7 +517,7 @@ static inline bool is_rst_area_valid(const struct RESTART_HDR *rhdr) 
		seq_bits -= 1;

	}



	if (seq_bits != ra->seq_num_bits)

	if (seq_bits != le32_to_cpu(ra->seq_num_bits))

		return false;



	/* The log page data offset and record header length must be quad-aligned. */
@@ -1184,7 +1184,8 @@ static int read_log_page(struct ntfs_log *log, u32 vbo, 
static int log_read_rst(struct ntfs_log *log, bool first,

			struct restart_info *info)

{

	u32 skip, vbo;

	u32 skip;

	u64 vbo;

	struct RESTART_HDR *r_page = NULL;



	/* Determine which restart area we are looking for. */