Commit 52d1998d authored Nov 10, 2020 by Linus Torvalds

fscrypt

Pull fscrypt fix from Eric Biggers:
 "Fix a regression where a new WARN_ON() was reachable when using
  FSCRYPT_POLICY_FLAG_IV_INO_LBLK_32 on ext4, causing xfstest
  generic/602 to sometimes fail on ext4"

* tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt:
  fscrypt: remove reachable WARN in fscrypt_setup_iv_ino_lblk_32_key()

parents 8bff39bf 92cfcd03

fs/crypto/keysetup.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -269,9 +269,7 @@ static int fscrypt_setup_iv_ino_lblk_32_key(struct fscrypt_info *ci,
		* New inodes may not have an inode number assigned yet.
		* Hashing their inode number is delayed until later.
		*/
		if (ci->ci_inode->i_ino == 0)
		WARN_ON(!(ci->ci_inode->i_state & I_CREATING));
		else
		if (ci->ci_inode->i_ino)
		fscrypt_hash_inode_number(ci, mk);
		return 0;
		}