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

Commit a9c47317 authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Theodore Ts'o
Browse files

ext4: calculate and verify superblock checksum 



Calculate and verify the superblock checksum.  Since the UUID and
block group number are embedded in each copy of the superblock, we
need only checksum the entire block.  Refactor some of the code to
eliminate open-coding of the checksum update call.

Signed-off-by: default avatarDarrick J. Wong <djwong@us.ibm.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 0441984a

fs/ext4/ext4.h

+10 −0
Original line number Diff line number Diff line
@@ -1280,6 +1280,9 @@ struct ext4_sb_info { 


	/* Reference to checksum algorithm driver via cryptoapi */

	struct crypto_shash *s_chksum_driver;



	/* Precomputed FS UUID checksum for seeding other checksums */

	__u32 s_csum_seed;

};



static inline struct ext4_sb_info *EXT4_SB(struct super_block *sb)
@@ -2004,6 +2007,10 @@ extern int ext4_group_extend(struct super_block *sb, 
extern int ext4_resize_fs(struct super_block *sb, ext4_fsblk_t n_blocks_count);



/* super.c */

extern int ext4_superblock_csum_verify(struct super_block *sb,

				       struct ext4_super_block *es);

extern void ext4_superblock_csum_set(struct super_block *sb,

				     struct ext4_super_block *es);

extern void *ext4_kvmalloc(size_t size, gfp_t flags);

extern void *ext4_kvzalloc(size_t size, gfp_t flags);

extern void ext4_kvfree(void *ptr);
@@ -2279,6 +2286,9 @@ static inline void ext4_unlock_group(struct super_block *sb, 


static inline void ext4_mark_super_dirty(struct super_block *sb)

{

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



	ext4_superblock_csum_set(sb, es);

	if (EXT4_SB(sb)->s_journal == NULL)

		sb->s_dirt =1;

}

fs/ext4/ext4_jbd2.c

+8 −1
Original line number Diff line number Diff line
@@ -138,16 +138,23 @@ int __ext4_handle_dirty_metadata(const char *where, unsigned int line, 
}



int __ext4_handle_dirty_super(const char *where, unsigned int line,

			      handle_t *handle, struct super_block *sb)

			      handle_t *handle, struct super_block *sb,

			      int now)

{

	struct buffer_head *bh = EXT4_SB(sb)->s_sbh;

	int err = 0;



	if (ext4_handle_valid(handle)) {

		ext4_superblock_csum_set(sb,

				(struct ext4_super_block *)bh->b_data);

		err = jbd2_journal_dirty_metadata(handle, bh);

		if (err)

			ext4_journal_abort_handle(where, line, __func__,

						  bh, handle, err);

	} else if (now) {

		ext4_superblock_csum_set(sb,

				(struct ext4_super_block *)bh->b_data);

		mark_buffer_dirty(bh);

	} else

		sb->s_dirt = 1;

	return err;

fs/ext4/ext4_jbd2.h

+5 −2
Original line number Diff line number Diff line
@@ -213,7 +213,8 @@ int __ext4_handle_dirty_metadata(const char *where, unsigned int line, 
				 struct buffer_head *bh);



int __ext4_handle_dirty_super(const char *where, unsigned int line,

			      handle_t *handle, struct super_block *sb);

			      handle_t *handle, struct super_block *sb,

			      int now);



#define ext4_journal_get_write_access(handle, bh) \

	__ext4_journal_get_write_access(__func__, __LINE__, (handle), (bh))
@@ -225,8 +226,10 @@ int __ext4_handle_dirty_super(const char *where, unsigned int line, 
#define ext4_handle_dirty_metadata(handle, inode, bh) \

	__ext4_handle_dirty_metadata(__func__, __LINE__, (handle), (inode), \

				     (bh))

#define ext4_handle_dirty_super_now(handle, sb) \

	__ext4_handle_dirty_super(__func__, __LINE__, (handle), (sb), 1)

#define ext4_handle_dirty_super(handle, sb) \

	__ext4_handle_dirty_super(__func__, __LINE__, (handle), (sb))

	__ext4_handle_dirty_super(__func__, __LINE__, (handle), (sb), 0)



handle_t *ext4_journal_start_sb(struct super_block *sb, int nblocks);

int __ext4_journal_stop(const char *where, unsigned int line, handle_t *handle);

fs/ext4/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -3936,7 +3936,7 @@ static int ext4_do_update_inode(handle_t *handle, 
			EXT4_SET_RO_COMPAT_FEATURE(sb,

					EXT4_FEATURE_RO_COMPAT_LARGE_FILE);

			ext4_handle_sync(handle);

			err = ext4_handle_dirty_super(handle, sb);

			err = ext4_handle_dirty_super_now(handle, sb);

		}

	}

	raw_inode->i_generation = cpu_to_le32(inode->i_generation);

fs/ext4/namei.c

+2 −2
Original line number Diff line number Diff line
@@ -2021,7 +2021,7 @@ int ext4_orphan_add(handle_t *handle, struct inode *inode) 
	/* Insert this inode at the head of the on-disk orphan list... */

	NEXT_ORPHAN(inode) = le32_to_cpu(EXT4_SB(sb)->s_es->s_last_orphan);

	EXT4_SB(sb)->s_es->s_last_orphan = cpu_to_le32(inode->i_ino);

	err = ext4_handle_dirty_metadata(handle, NULL, EXT4_SB(sb)->s_sbh);

	err = ext4_handle_dirty_super_now(handle, sb);

	rc = ext4_mark_iloc_dirty(handle, inode, &iloc);

	if (!err)

		err = rc;
@@ -2094,7 +2094,7 @@ int ext4_orphan_del(handle_t *handle, struct inode *inode) 
		if (err)

			goto out_brelse;

		sbi->s_es->s_last_orphan = cpu_to_le32(ino_next);

		err = ext4_handle_dirty_metadata(handle, NULL, sbi->s_sbh);

		err = ext4_handle_dirty_super_now(handle, inode->i_sb);

	} else {

		struct ext4_iloc iloc2;

		struct inode *i_prev =