Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 396d1099 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:
 "The major change this cycle is deleting ext4's copy of the file system
  encryption code and switching things over to using the copies in
  fs/crypto.  I've updated the MAINTAINERS file to add an entry for
  fs/crypto listing Jaeguk Kim and myself as the maintainers.

  There are also a number of bug fixes, most notably for some problems
  found by American Fuzzy Lop (AFL) courtesy of Vegard Nossum.  Also
  fixed is a writeback deadlock detected by generic/130, and some
  potential races in the metadata checksum code"

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (21 commits)
  ext4: verify extent header depth
  ext4: short-cut orphan cleanup on error
  ext4: fix reference counting bug on block allocation error
  MAINTAINRES: fs-crypto maintainers update
  ext4 crypto: migrate into vfs's crypto engine
  ext2: fix filesystem deadlock while reading corrupted xattr block
  ext4: fix project quota accounting without quota limits enabled
  ext4: validate s_reserved_gdt_blocks on mount
  ext4: remove unused page_idx
  ext4: don't call ext4_should_journal_data() on the journal inode
  ext4: Fix WARN_ON_ONCE in ext4_commit_super()
  ext4: fix deadlock during page writeback
  ext4: correct error value of function verifying dx checksum
  ext4: avoid modifying checksum fields directly during checksum verification
  ext4: check for extents that wrap around
  jbd2: make journal y2038 safe
  jbd2: track more dependencies on transaction commit
  jbd2: move lockdep tracking to journal_s
  jbd2: move lockdep instrumentation for jbd2 handles
  ext4: respect the nobarrier mount option in nojournal mode
  ...
parents 59ebc44e 7bc94916

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -4942,6 +4942,13 @@ F: Documentation/filesystems/caching/ 
F:	fs/fscache/

F:	include/linux/fscache*.h



FS-CRYPTO: FILE SYSTEM LEVEL ENCRYPTION SUPPORT

M:	Theodore Y. Ts'o <tytso@mit.edu>

M:	Jaegeuk Kim <jaegeuk@kernel.org>

S:	Supported

F:	fs/crypto/

F:	include/linux/fscrypto.h



F2FS FILE SYSTEM

M:	Jaegeuk Kim <jaegeuk@kernel.org>

M:	Changman Lee <cm224.lee@samsung.com>

fs/ext2/balloc.c

+21 −0
Original line number Diff line number Diff line
@@ -1193,6 +1193,27 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi) 
	return 1;

}



/*

 * Returns 1 if the passed-in block region is valid; 0 if some part overlaps

 * with filesystem metadata blocksi.

 */

int ext2_data_block_valid(struct ext2_sb_info *sbi, ext2_fsblk_t start_blk,

			  unsigned int count)

{

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

	    (start_blk + count < start_blk) ||

	    (start_blk > le32_to_cpu(sbi->s_es->s_blocks_count)))

		return 0;



	/* Ensure we do not step over superblock */

	if ((start_blk <= sbi->s_sb_block) &&

	    (start_blk + count >= sbi->s_sb_block))

		return 0;





	return 1;

}



/*

 * ext2_new_blocks() -- core block(s) allocation function

 * @inode:		file inode

fs/ext2/ext2.h

+3 −0
Original line number Diff line number Diff line
@@ -367,6 +367,7 @@ struct ext2_inode { 
 */

#define	EXT2_VALID_FS			0x0001	/* Unmounted cleanly */

#define	EXT2_ERROR_FS			0x0002	/* Errors detected */

#define	EFSCORRUPTED			EUCLEAN	/* Filesystem is corrupted */



/*

 * Mount flags
@@ -739,6 +740,8 @@ extern unsigned long ext2_bg_num_gdb(struct super_block *sb, int group); 
extern ext2_fsblk_t ext2_new_block(struct inode *, unsigned long, int *);

extern ext2_fsblk_t ext2_new_blocks(struct inode *, unsigned long,

				unsigned long *, int *);

extern int ext2_data_block_valid(struct ext2_sb_info *sbi, ext2_fsblk_t start_blk,

				 unsigned int count);

extern void ext2_free_blocks (struct inode *, unsigned long,

			      unsigned long);

extern unsigned long ext2_count_free_blocks (struct super_block *);

fs/ext2/inode.c

+10 −0
Original line number Diff line number Diff line
@@ -1389,6 +1389,16 @@ struct inode *ext2_iget (struct super_block *sb, unsigned long ino) 
	ei->i_frag_size = raw_inode->i_fsize;

	ei->i_file_acl = le32_to_cpu(raw_inode->i_file_acl);

	ei->i_dir_acl = 0;



	if (ei->i_file_acl &&

	    !ext2_data_block_valid(EXT2_SB(sb), ei->i_file_acl, 1)) {

		ext2_error(sb, "ext2_iget", "bad extended attribute block %u",

			   ei->i_file_acl);

		brelse(bh);

		ret = -EFSCORRUPTED;

		goto bad_inode;

	}



	if (S_ISREG(inode->i_mode))

		inode->i_size |= ((__u64)le32_to_cpu(raw_inode->i_size_high)) << 32;

	else

fs/ext2/xattr.c

+9 −0
Original line number Diff line number Diff line
@@ -759,10 +759,19 @@ void 
ext2_xattr_delete_inode(struct inode *inode)

{

	struct buffer_head *bh = NULL;

	struct ext2_sb_info *sbi = EXT2_SB(inode->i_sb);



	down_write(&EXT2_I(inode)->xattr_sem);

	if (!EXT2_I(inode)->i_file_acl)

		goto cleanup;



	if (!ext2_data_block_valid(sbi, EXT2_I(inode)->i_file_acl, 0)) {

		ext2_error(inode->i_sb, "ext2_xattr_delete_inode",

			"inode %ld: xattr block %d is out of data blocks range",

			inode->i_ino, EXT2_I(inode)->i_file_acl);

		goto cleanup;

	}



	bh = sb_bread(inode->i_sb, EXT2_I(inode)->i_file_acl);

	if (!bh) {

		ext2_error(inode->i_sb, "ext2_xattr_delete_inode",