diff options
| author | Jan Kara <[email protected]> | 2020-12-16 11:18:43 +0100 |
|---|---|---|
| committer | Theodore Ts'o <[email protected]> | 2020-12-22 13:08:46 -0500 |
| commit | dfd56c2c0c0dbb11be939b804ddc8d5395ab3432 (patch) | |
| tree | 196205dd39f97215408a96f6f852ea70da18d203 | |
| parent | e92ad03fa53498f12b3f5ecb8822adc3bf815b28 (diff) | |
ext4: fix superblock checksum failure when setting password salt
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 <[email protected]>
Reported-by: Andreas Dilger <[email protected]>
Fixes: 9bd8212f981e ("ext4 crypto: add encryption policy and password salt support")
Signed-off-by: Jan Kara <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Theodore Ts'o <[email protected]>
| -rw-r--r-- | fs/ext4/ioctl.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c index f0381876a7e5..106bf149e8ca 100644 --- a/fs/ext4/ioctl.c +++ b/fs/ext4/ioctl.c @@ -1157,7 +1157,10 @@ resizefs_out: err = ext4_journal_get_write_access(handle, sbi->s_sbh); if (err) goto pwsalt_err_journal; + lock_buffer(sbi->s_sbh); 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, sbi->s_sbh); pwsalt_err_journal: |