fs: crypto: remove key derivation code duplication



Class key support is enabled by default for file encryption.
This code unnecessary derives keys which are eventually overridden
subsequently.

Change-Id: I470b54a7345e65b8f4bf226613f6be51b8741256
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>

parent 4595c095

fs/crypto/keyinfo.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -117,7 +117,6 @@ static int validate_user_key(struct fscrypt_info *crypt_info,
		res = -ENOKEY;
		goto out;
		}
		res = derive_key_aes(ctx->nonce, master_key, crypt_info->ci_raw_key);
		/* If we don't need to derive, we still want to do everything
		* up until now to validate the key. It's cleaner to fail now
		* than to fail in block I/O.