mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 02:39:48 +00:00
ext4: fix superblock checksum failure when setting password salt
commitdfd56c2c0c
upstream. When setting password salt in the superblock, we forget to recompute the superblock checksum so it will not match until the next superblock modification which recomputes the checksum. Fix it. CC: Michael Halcrow <mhalcrow@google.com> Reported-by: Andreas Dilger <adilger@dilger.ca> Fixes:9bd8212f98
("ext4 crypto: add encryption policy and password salt support") Signed-off-by: Jan Kara <jack@suse.cz> Link: https://lore.kernel.org/r/20201216101844.22917-8-jack@suse.cz Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
d00e517fa8
commit
9dd21048ad
1 changed files with 3 additions and 0 deletions
|
@ -1032,7 +1032,10 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
|
||||||
err = ext4_journal_get_write_access(handle, sbi->s_sbh);
|
err = ext4_journal_get_write_access(handle, sbi->s_sbh);
|
||||||
if (err)
|
if (err)
|
||||||
goto pwsalt_err_journal;
|
goto pwsalt_err_journal;
|
||||||
|
lock_buffer(sbi->s_sbh);
|
||||||
generate_random_uuid(sbi->s_es->s_encrypt_pw_salt);
|
generate_random_uuid(sbi->s_es->s_encrypt_pw_salt);
|
||||||
|
ext4_superblock_csum_set(sb);
|
||||||
|
unlock_buffer(sbi->s_sbh);
|
||||||
err = ext4_handle_dirty_metadata(handle, NULL,
|
err = ext4_handle_dirty_metadata(handle, NULL,
|
||||||
sbi->s_sbh);
|
sbi->s_sbh);
|
||||||
pwsalt_err_journal:
|
pwsalt_err_journal:
|
||||||
|
|
Loading…
Reference in a new issue