Commit 3e968c9f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 

Pull ext4 updates from Ted Ts'o:
 "Cleanups and bugfixes for ext4, including some fixes to make ext4 more
  robust against maliciously crafted file system images.

  (I still don't recommend that container folks hold any delusions that
  mounting arbitary images that can be crafted by malicious attackers
  should be considered sane thing to do, though!)"

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (29 commits)
  ext4: force revalidation of directory pointer after seekdir(2)
  ext4: add extra checks to ext4_xattr_block_get()
  ext4: add bounds checking to ext4_xattr_find_entry()
  ext4: move call to ext4_error() into ext4_xattr_check_block()
  ext4: don't show data=<mode> option if defaulted
  ext4: omit init_itable=n in procfs when disabled
  ext4: show more binary mount options in procfs
  ext4: simplify kobject usage
  ext4: remove unused parameters in sysfs code
  ext4: null out kobject* during sysfs cleanup
  ext4: don't allow r/w mounts if metadata blocks overlap the superblock
  ext4: always initialize the crc32c checksum driver
  ext4: fail ext4_iget for root directory if unallocated
  ext4: limit xattr size to INT_MAX
  ext4: add validity checks for bitmap block numbers
  ext4: fix comments in ext4_swap_extents()
  ext4: use generic_writepages instead of __writepage/write_cache_pages
  ext4: don't complain about incorrect features when probing
  ext4: remove EXT4_STATE_DIOREAD_LOCK flag
  ext4: fix offset overflow on 32-bit archs in ext4_iomap_begin()
  ...
parents a8f8e8ac e40ff213

fs/ext4/balloc.c

+15 −4
Original line number Diff line number Diff line
@@ -243,8 +243,6 @@ static int ext4_init_block_bitmap(struct super_block *sb, 
	 */

	ext4_mark_bitmap_end(num_clusters_in_group(sb, block_group),

			     sb->s_blocksize * 8, bh->b_data);

	ext4_block_bitmap_csum_set(sb, block_group, gdp, bh);

	ext4_group_desc_csum_set(sb, block_group, gdp);

	return 0;

}
@@ -340,20 +338,25 @@ static ext4_fsblk_t ext4_valid_block_bitmap(struct super_block *sb, 
	/* check whether block bitmap block number is set */

	blk = ext4_block_bitmap(sb, desc);

	offset = blk - group_first_block;

	if (!ext4_test_bit(EXT4_B2C(sbi, offset), bh->b_data))

	if (offset < 0 || EXT4_B2C(sbi, offset) >= sb->s_blocksize ||

	    !ext4_test_bit(EXT4_B2C(sbi, offset), bh->b_data))

		/* bad block bitmap */

		return blk;



	/* check whether the inode bitmap block number is set */

	blk = ext4_inode_bitmap(sb, desc);

	offset = blk - group_first_block;

	if (!ext4_test_bit(EXT4_B2C(sbi, offset), bh->b_data))

	if (offset < 0 || EXT4_B2C(sbi, offset) >= sb->s_blocksize ||

	    !ext4_test_bit(EXT4_B2C(sbi, offset), bh->b_data))

		/* bad block bitmap */

		return blk;



	/* check whether the inode table block number is set */

	blk = ext4_inode_table(sb, desc);

	offset = blk - group_first_block;

	if (offset < 0 || EXT4_B2C(sbi, offset) >= sb->s_blocksize ||

	    EXT4_B2C(sbi, offset + sbi->s_itb_per_group) >= sb->s_blocksize)

		return blk;

	next_zero_bit = ext4_find_next_zero_bit(bh->b_data,

			EXT4_B2C(sbi, offset + sbi->s_itb_per_group),

			EXT4_B2C(sbi, offset));
@@ -419,6 +422,7 @@ struct buffer_head * 
ext4_read_block_bitmap_nowait(struct super_block *sb, ext4_group_t block_group)

{

	struct ext4_group_desc *desc;

	struct ext4_sb_info *sbi = EXT4_SB(sb);

	struct buffer_head *bh;

	ext4_fsblk_t bitmap_blk;

	int err;
@@ -427,6 +431,12 @@ ext4_read_block_bitmap_nowait(struct super_block *sb, ext4_group_t block_group) 
	if (!desc)

		return ERR_PTR(-EFSCORRUPTED);

	bitmap_blk = ext4_block_bitmap(sb, desc);

	if ((bitmap_blk <= le32_to_cpu(sbi->s_es->s_first_data_block)) ||

	    (bitmap_blk >= ext4_blocks_count(sbi->s_es))) {

		ext4_error(sb, "Invalid block bitmap block %llu in "

			   "block_group %u", bitmap_blk, block_group);

		return ERR_PTR(-EFSCORRUPTED);

	}

	bh = sb_getblk(sb, bitmap_blk);

	if (unlikely(!bh)) {

		ext4_error(sb, "Cannot get buffer for block bitmap - "
@@ -448,6 +458,7 @@ ext4_read_block_bitmap_nowait(struct super_block *sb, ext4_group_t block_group) 
		err = ext4_init_block_bitmap(sb, bh, block_group, desc);

		set_bitmap_uptodate(bh);

		set_buffer_uptodate(bh);

		set_buffer_verified(bh);

		ext4_unlock_group(sb, block_group);

		unlock_buffer(bh);

		if (err) {

fs/ext4/dir.c

+5 −3
Original line number Diff line number Diff line
@@ -365,13 +365,15 @@ static loff_t ext4_dir_llseek(struct file *file, loff_t offset, int whence) 
{

	struct inode *inode = file->f_mapping->host;

	int dx_dir = is_dx_dir(inode);

	loff_t htree_max = ext4_get_htree_eof(file);

	loff_t ret, htree_max = ext4_get_htree_eof(file);



	if (likely(dx_dir))

		return generic_file_llseek_size(file, offset, whence,

		ret = generic_file_llseek_size(file, offset, whence,

						    htree_max, htree_max);

	else

		return ext4_llseek(file, offset, whence);

		ret = ext4_llseek(file, offset, whence);

	file->f_version = inode_peek_iversion(inode) - 1;

	return ret;

}



/*

fs/ext4/ext4.h

+0 −17
Original line number Diff line number Diff line
@@ -1522,8 +1522,6 @@ enum { 
	EXT4_STATE_EXT_MIGRATE,		/* Inode is migrating */

	EXT4_STATE_DIO_UNWRITTEN,	/* need convert on dio done*/

	EXT4_STATE_NEWENTRY,		/* File just added to dir */

	EXT4_STATE_DIOREAD_LOCK,	/* Disable support for dio read

					   nolocking */

	EXT4_STATE_MAY_INLINE_DATA,	/* may have in-inode data */

	EXT4_STATE_EXT_PRECACHED,	/* extents have been precached */

	EXT4_STATE_LUSTRE_EA_INODE,	/* Lustre-style ea_inode */
@@ -3181,21 +3179,6 @@ static inline void set_bitmap_uptodate(struct buffer_head *bh) 
	set_bit(BH_BITMAP_UPTODATE, &(bh)->b_state);

}



/*

 * Disable DIO read nolock optimization, so new dioreaders will be forced

 * to grab i_mutex

 */

static inline void ext4_inode_block_unlocked_dio(struct inode *inode)

{

	ext4_set_inode_state(inode, EXT4_STATE_DIOREAD_LOCK);

	smp_mb();

}

static inline void ext4_inode_resume_unlocked_dio(struct inode *inode)

{

	smp_mb();

	ext4_clear_inode_state(inode, EXT4_STATE_DIOREAD_LOCK);

}



#define in_range(b, first, len)	((b) >= (first) && (b) <= (first) + (len) - 1)



/* For ioend & aio unwritten conversion wait queues */

fs/ext4/ext4_jbd2.c

+0 −7
Original line number Diff line number Diff line
@@ -166,13 +166,6 @@ int __ext4_journal_get_write_access(const char *where, unsigned int line, 
	might_sleep();



	if (ext4_handle_valid(handle)) {

		struct super_block *sb;



		sb = handle->h_transaction->t_journal->j_private;

		if (unlikely(ext4_forced_shutdown(EXT4_SB(sb)))) {

			jbd2_journal_abort_handle(handle);

			return -EIO;

		}

		err = jbd2_journal_get_write_access(handle, bh);

		if (err)

			ext4_journal_abort_handle(where, line, __func__, bh,

fs/ext4/extents.c

+7 −16
Original line number Diff line number Diff line
@@ -4796,7 +4796,6 @@ static long ext4_zero_range(struct file *file, loff_t offset, 
		flags |= EXT4_GET_BLOCKS_KEEP_SIZE;



	/* Wait all existing dio workers, newcomers will block on i_mutex */

	ext4_inode_block_unlocked_dio(inode);

	inode_dio_wait(inode);



	/* Preallocate the range including the unaligned edges */
@@ -4807,7 +4806,7 @@ static long ext4_zero_range(struct file *file, loff_t offset, 
				 round_down(offset, 1 << blkbits)) >> blkbits,

				new_size, flags);

		if (ret)

			goto out_dio;

			goto out_mutex;



	}
@@ -4824,7 +4823,7 @@ static long ext4_zero_range(struct file *file, loff_t offset, 
		ret = ext4_update_disksize_before_punch(inode, offset, len);

		if (ret) {

			up_write(&EXT4_I(inode)->i_mmap_sem);

			goto out_dio;

			goto out_mutex;

		}

		/* Now release the pages and zero block aligned part of pages */

		truncate_pagecache_range(inode, start, end - 1);
@@ -4834,10 +4833,10 @@ static long ext4_zero_range(struct file *file, loff_t offset, 
					     flags);

		up_write(&EXT4_I(inode)->i_mmap_sem);

		if (ret)

			goto out_dio;

			goto out_mutex;

	}

	if (!partial_begin && !partial_end)

		goto out_dio;

		goto out_mutex;



	/*

	 * In worst case we have to writeout two nonadjacent unwritten
@@ -4850,7 +4849,7 @@ static long ext4_zero_range(struct file *file, loff_t offset, 
	if (IS_ERR(handle)) {

		ret = PTR_ERR(handle);

		ext4_std_error(inode->i_sb, ret);

		goto out_dio;

		goto out_mutex;

	}



	inode->i_mtime = inode->i_ctime = current_time(inode);
@@ -4875,8 +4874,6 @@ static long ext4_zero_range(struct file *file, loff_t offset, 
		ext4_handle_sync(handle);



	ext4_journal_stop(handle);

out_dio:

	ext4_inode_resume_unlocked_dio(inode);

out_mutex:

	inode_unlock(inode);

	return ret;
@@ -4964,11 +4961,9 @@ long ext4_fallocate(struct file *file, int mode, loff_t offset, loff_t len) 
	}



	/* Wait all existing dio workers, newcomers will block on i_mutex */

	ext4_inode_block_unlocked_dio(inode);

	inode_dio_wait(inode);



	ret = ext4_alloc_file_blocks(file, lblk, max_blocks, new_size, flags);

	ext4_inode_resume_unlocked_dio(inode);

	if (ret)

		goto out;
@@ -5485,7 +5480,6 @@ int ext4_collapse_range(struct inode *inode, loff_t offset, loff_t len) 
	}



	/* Wait for existing dio to complete */

	ext4_inode_block_unlocked_dio(inode);

	inode_dio_wait(inode);



	/*
@@ -5562,7 +5556,6 @@ out_stop: 
	ext4_journal_stop(handle);

out_mmap:

	up_write(&EXT4_I(inode)->i_mmap_sem);

	ext4_inode_resume_unlocked_dio(inode);

out_mutex:

	inode_unlock(inode);

	return ret;
@@ -5635,7 +5628,6 @@ int ext4_insert_range(struct inode *inode, loff_t offset, loff_t len) 
	}



	/* Wait for existing dio to complete */

	ext4_inode_block_unlocked_dio(inode);

	inode_dio_wait(inode);



	/*
@@ -5737,7 +5729,6 @@ out_stop: 
	ext4_journal_stop(handle);

out_mmap:

	up_write(&EXT4_I(inode)->i_mmap_sem);

	ext4_inode_resume_unlocked_dio(inode);

out_mutex:

	inode_unlock(inode);

	return ret;
@@ -5751,7 +5742,7 @@ out_mutex: 
 * @lblk1:	Start block for first inode

 * @lblk2:	Start block for second inode

 * @count:	Number of blocks to swap

 * @mark_unwritten: Mark second inode's extents as unwritten after swap

 * @unwritten: Mark second inode's extents as unwritten after swap

 * @erp:	Pointer to save error value

 *

 * This helper routine does exactly what is promise "swap extents". All other

CRA Git | Maintained and supported by SUSTech CRA and CCSE