Commit f41bfc94 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 fixes from Ted Ts'o:
 "A collection of bug fixes destined for stable and some printk cleanups
  and a patch so that instead of BUG'ing we use the ext4_error()
  framework to mark the file system is corrupted"

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: add explicit casts when masking cluster sizes
  ext4: fix deadlock when writing in ENOSPC conditions
  jbd2: rename obsoleted msg JBD->JBD2
  jbd2: revise KERN_EMERG error messages
  jbd2: don't BUG but return ENOSPC if a handle runs out of space
  ext4: Do not reserve clusters when fs doesn't support extents
  ext4: fix del_timer() misuse for ->s_err_report
  ext4: check for overlapping extents in ext4_valid_extent_entries()
  ext4: fix use-after-free in ext4_mb_new_blocks
  ext4: call ext4_error_inode() if jbd2_journal_dirty_metadata() fails
parents c5fdd531 f5a44db5

fs/ext4/ext4.h

+10 −0
Original line number Diff line number Diff line
@@ -268,6 +268,16 @@ struct ext4_io_submit { 
/* Translate # of blks to # of clusters */

#define EXT4_NUM_B2C(sbi, blks)	(((blks) + (sbi)->s_cluster_ratio - 1) >> \

				 (sbi)->s_cluster_bits)

/* Mask out the low bits to get the starting block of the cluster */

#define EXT4_PBLK_CMASK(s, pblk) ((pblk) &				\

				  ~((ext4_fsblk_t) (s)->s_cluster_ratio - 1))

#define EXT4_LBLK_CMASK(s, lblk) ((lblk) &				\

				  ~((ext4_lblk_t) (s)->s_cluster_ratio - 1))

/* Get the cluster offset */

#define EXT4_PBLK_COFF(s, pblk) ((pblk) &				\

				 ((ext4_fsblk_t) (s)->s_cluster_ratio - 1))

#define EXT4_LBLK_COFF(s, lblk) ((lblk) &				\

				 ((ext4_lblk_t) (s)->s_cluster_ratio - 1))



/*

 * Structure of a blocks group descriptor

fs/ext4/ext4_jbd2.c

+9 −0
Original line number Diff line number Diff line
@@ -259,6 +259,15 @@ int __ext4_handle_dirty_metadata(const char *where, unsigned int line, 
		if (WARN_ON_ONCE(err)) {

			ext4_journal_abort_handle(where, line, __func__, bh,

						  handle, err);

			ext4_error_inode(inode, where, line,

					 bh->b_blocknr,

					 "journal_dirty_metadata failed: "

					 "handle type %u started at line %u, "

					 "credits %u/%u, errcode %d",

					 handle->h_type,

					 handle->h_line_no,

					 handle->h_requested_credits,

					 handle->h_buffer_credits, err);

		}

	} else {

		if (inode)

fs/ext4/extents.c

+30 −15
Original line number Diff line number Diff line
@@ -360,8 +360,10 @@ static int ext4_valid_extent(struct inode *inode, struct ext4_extent *ext) 
{

	ext4_fsblk_t block = ext4_ext_pblock(ext);

	int len = ext4_ext_get_actual_len(ext);

	ext4_lblk_t lblock = le32_to_cpu(ext->ee_block);

	ext4_lblk_t last = lblock + len - 1;



	if (len == 0)

	if (lblock > last)

		return 0;

	return ext4_data_block_valid(EXT4_SB(inode->i_sb), block, len);

}
@@ -387,11 +389,26 @@ static int ext4_valid_extent_entries(struct inode *inode, 
	if (depth == 0) {

		/* leaf entries */

		struct ext4_extent *ext = EXT_FIRST_EXTENT(eh);

		struct ext4_super_block *es = EXT4_SB(inode->i_sb)->s_es;

		ext4_fsblk_t pblock = 0;

		ext4_lblk_t lblock = 0;

		ext4_lblk_t prev = 0;

		int len = 0;

		while (entries) {

			if (!ext4_valid_extent(inode, ext))

				return 0;



			/* Check for overlapping extents */

			lblock = le32_to_cpu(ext->ee_block);

			len = ext4_ext_get_actual_len(ext);

			if ((lblock <= prev) && prev) {

				pblock = ext4_ext_pblock(ext);

				es->s_last_error_block = cpu_to_le64(pblock);

				return 0;

			}

			ext++;

			entries--;

			prev = lblock + len - 1;

		}

	} else {

		struct ext4_extent_idx *ext_idx = EXT_FIRST_INDEX(eh);
@@ -1834,8 +1851,7 @@ static unsigned int ext4_ext_check_overlap(struct ext4_sb_info *sbi, 
	depth = ext_depth(inode);

	if (!path[depth].p_ext)

		goto out;

	b2 = le32_to_cpu(path[depth].p_ext->ee_block);

	b2 &= ~(sbi->s_cluster_ratio - 1);

	b2 = EXT4_LBLK_CMASK(sbi, le32_to_cpu(path[depth].p_ext->ee_block));



	/*

	 * get the next allocated block if the extent in the path
@@ -1845,7 +1861,7 @@ static unsigned int ext4_ext_check_overlap(struct ext4_sb_info *sbi, 
		b2 = ext4_ext_next_allocated_block(path);

		if (b2 == EXT_MAX_BLOCKS)

			goto out;

		b2 &= ~(sbi->s_cluster_ratio - 1);

		b2 = EXT4_LBLK_CMASK(sbi, b2);

	}



	/* check for wrap through zero on extent logical start block*/
@@ -2504,7 +2520,7 @@ static int ext4_remove_blocks(handle_t *handle, struct inode *inode, 
		 * extent, we have to mark the cluster as used (store negative

		 * cluster number in partial_cluster).

		 */

		unaligned = pblk & (sbi->s_cluster_ratio - 1);

		unaligned = EXT4_PBLK_COFF(sbi, pblk);

		if (unaligned && (ee_len == num) &&

		    (*partial_cluster != -((long long)EXT4_B2C(sbi, pblk))))

			*partial_cluster = EXT4_B2C(sbi, pblk);
@@ -2598,7 +2614,7 @@ ext4_ext_rm_leaf(handle_t *handle, struct inode *inode, 
			 * accidentally freeing it later on

			 */

			pblk = ext4_ext_pblock(ex);

			if (pblk & (sbi->s_cluster_ratio - 1))

			if (EXT4_PBLK_COFF(sbi, pblk))

				*partial_cluster =

					-((long long)EXT4_B2C(sbi, pblk));

			ex--;
@@ -3753,7 +3769,7 @@ int ext4_find_delalloc_cluster(struct inode *inode, ext4_lblk_t lblk) 
{

	struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);

	ext4_lblk_t lblk_start, lblk_end;

	lblk_start = lblk & (~(sbi->s_cluster_ratio - 1));

	lblk_start = EXT4_LBLK_CMASK(sbi, lblk);

	lblk_end = lblk_start + sbi->s_cluster_ratio - 1;



	return ext4_find_delalloc_range(inode, lblk_start, lblk_end);
@@ -3812,9 +3828,9 @@ get_reserved_cluster_alloc(struct inode *inode, ext4_lblk_t lblk_start, 
	trace_ext4_get_reserved_cluster_alloc(inode, lblk_start, num_blks);



	/* Check towards left side */

	c_offset = lblk_start & (sbi->s_cluster_ratio - 1);

	c_offset = EXT4_LBLK_COFF(sbi, lblk_start);

	if (c_offset) {

		lblk_from = lblk_start & (~(sbi->s_cluster_ratio - 1));

		lblk_from = EXT4_LBLK_CMASK(sbi, lblk_start);

		lblk_to = lblk_from + c_offset - 1;



		if (ext4_find_delalloc_range(inode, lblk_from, lblk_to))
@@ -3822,7 +3838,7 @@ get_reserved_cluster_alloc(struct inode *inode, ext4_lblk_t lblk_start, 
	}



	/* Now check towards right. */

	c_offset = (lblk_start + num_blks) & (sbi->s_cluster_ratio - 1);

	c_offset = EXT4_LBLK_COFF(sbi, lblk_start + num_blks);

	if (allocated_clusters && c_offset) {

		lblk_from = lblk_start + num_blks;

		lblk_to = lblk_from + (sbi->s_cluster_ratio - c_offset) - 1;
@@ -4030,7 +4046,7 @@ static int get_implied_cluster_alloc(struct super_block *sb, 
				     struct ext4_ext_path *path)

{

	struct ext4_sb_info *sbi = EXT4_SB(sb);

	ext4_lblk_t c_offset = map->m_lblk & (sbi->s_cluster_ratio-1);

	ext4_lblk_t c_offset = EXT4_LBLK_COFF(sbi, map->m_lblk);

	ext4_lblk_t ex_cluster_start, ex_cluster_end;

	ext4_lblk_t rr_cluster_start;

	ext4_lblk_t ee_block = le32_to_cpu(ex->ee_block);
@@ -4048,8 +4064,7 @@ static int get_implied_cluster_alloc(struct super_block *sb, 
	    (rr_cluster_start == ex_cluster_start)) {

		if (rr_cluster_start == ex_cluster_end)

			ee_start += ee_len - 1;

		map->m_pblk = (ee_start & ~(sbi->s_cluster_ratio - 1)) +

			c_offset;

		map->m_pblk = EXT4_PBLK_CMASK(sbi, ee_start) + c_offset;

		map->m_len = min(map->m_len,

				 (unsigned) sbi->s_cluster_ratio - c_offset);

		/*
@@ -4203,7 +4218,7 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode, 
	 */

	map->m_flags &= ~EXT4_MAP_FROM_CLUSTER;

	newex.ee_block = cpu_to_le32(map->m_lblk);

	cluster_offset = map->m_lblk & (sbi->s_cluster_ratio-1);

	cluster_offset = EXT4_LBLK_CMASK(sbi, map->m_lblk);



	/*

	 * If we are doing bigalloc, check to see if the extent returned
@@ -4271,7 +4286,7 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode, 
	 * needed so that future calls to get_implied_cluster_alloc()

	 * work correctly.

	 */

	offset = map->m_lblk & (sbi->s_cluster_ratio - 1);

	offset = EXT4_LBLK_COFF(sbi, map->m_lblk);

	ar.len = EXT4_NUM_B2C(sbi, offset+allocated);

	ar.goal -= offset;

	ar.logical -= offset;

fs/ext4/inode.c

+0 −12
Original line number Diff line number Diff line
@@ -1206,7 +1206,6 @@ static int ext4_journalled_write_end(struct file *file, 
 */

static int ext4_da_reserve_metadata(struct inode *inode, ext4_lblk_t lblock)

{

	int retries = 0;

	struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);

	struct ext4_inode_info *ei = EXT4_I(inode);

	unsigned int md_needed;
@@ -1218,7 +1217,6 @@ static int ext4_da_reserve_metadata(struct inode *inode, ext4_lblk_t lblock) 
	 * in order to allocate nrblocks

	 * worse case is one extent per block

	 */

repeat:

	spin_lock(&ei->i_block_reservation_lock);

	/*

	 * ext4_calc_metadata_amount() has side effects, which we have
@@ -1238,10 +1236,6 @@ repeat: 
		ei->i_da_metadata_calc_len = save_len;

		ei->i_da_metadata_calc_last_lblock = save_last_lblock;

		spin_unlock(&ei->i_block_reservation_lock);

		if (ext4_should_retry_alloc(inode->i_sb, &retries)) {

			cond_resched();

			goto repeat;

		}

		return -ENOSPC;

	}

	ei->i_reserved_meta_blocks += md_needed;
@@ -1255,7 +1249,6 @@ repeat: 
 */

static int ext4_da_reserve_space(struct inode *inode, ext4_lblk_t lblock)

{

	int retries = 0;

	struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);

	struct ext4_inode_info *ei = EXT4_I(inode);

	unsigned int md_needed;
@@ -1277,7 +1270,6 @@ static int ext4_da_reserve_space(struct inode *inode, ext4_lblk_t lblock) 
	 * in order to allocate nrblocks

	 * worse case is one extent per block

	 */

repeat:

	spin_lock(&ei->i_block_reservation_lock);

	/*

	 * ext4_calc_metadata_amount() has side effects, which we have
@@ -1297,10 +1289,6 @@ repeat: 
		ei->i_da_metadata_calc_len = save_len;

		ei->i_da_metadata_calc_last_lblock = save_last_lblock;

		spin_unlock(&ei->i_block_reservation_lock);

		if (ext4_should_retry_alloc(inode->i_sb, &retries)) {

			cond_resched();

			goto repeat;

		}

		dquot_release_reservation_block(inode, EXT4_C2B(sbi, 1));

		return -ENOSPC;

	}

fs/ext4/mballoc.c

+11 −6
Original line number Diff line number Diff line
@@ -3442,6 +3442,9 @@ static void ext4_mb_pa_callback(struct rcu_head *head) 
{

	struct ext4_prealloc_space *pa;

	pa = container_of(head, struct ext4_prealloc_space, u.pa_rcu);



	BUG_ON(atomic_read(&pa->pa_count));

	BUG_ON(pa->pa_deleted == 0);

	kmem_cache_free(ext4_pspace_cachep, pa);

}
@@ -3455,11 +3458,13 @@ static void ext4_mb_put_pa(struct ext4_allocation_context *ac, 
	ext4_group_t grp;

	ext4_fsblk_t grp_blk;



	if (!atomic_dec_and_test(&pa->pa_count) || pa->pa_free != 0)

		return;



	/* in this short window concurrent discard can set pa_deleted */

	spin_lock(&pa->pa_lock);

	if (!atomic_dec_and_test(&pa->pa_count) || pa->pa_free != 0) {

		spin_unlock(&pa->pa_lock);

		return;

	}



	if (pa->pa_deleted == 1) {

		spin_unlock(&pa->pa_lock);

		return;
@@ -4121,7 +4126,7 @@ ext4_mb_initialize_context(struct ext4_allocation_context *ac, 
	ext4_get_group_no_and_offset(sb, goal, &group, &block);



	/* set up allocation goals */

	ac->ac_b_ex.fe_logical = ar->logical & ~(sbi->s_cluster_ratio - 1);

	ac->ac_b_ex.fe_logical = EXT4_LBLK_CMASK(sbi, ar->logical);

	ac->ac_status = AC_STATUS_CONTINUE;

	ac->ac_sb = sb;

	ac->ac_inode = ar->inode;
@@ -4663,7 +4668,7 @@ void ext4_free_blocks(handle_t *handle, struct inode *inode, 
	 * blocks at the beginning or the end unless we are explicitly

	 * requested to avoid doing so.

	 */

	overflow = block & (sbi->s_cluster_ratio - 1);

	overflow = EXT4_PBLK_COFF(sbi, block);

	if (overflow) {

		if (flags & EXT4_FREE_BLOCKS_NOFREE_FIRST_CLUSTER) {

			overflow = sbi->s_cluster_ratio - overflow;
@@ -4677,7 +4682,7 @@ void ext4_free_blocks(handle_t *handle, struct inode *inode, 
			count += overflow;

		}

	}

	overflow = count & (sbi->s_cluster_ratio - 1);

	overflow = EXT4_LBLK_COFF(sbi, count);

	if (overflow) {

		if (flags & EXT4_FREE_BLOCKS_NOFREE_LAST_CLUSTER) {

			if (count > overflow)

CRA Git | Maintained and supported by SUSTech CRA and CCSE