summaryrefslogtreecommitdiffstats
path: root/fs/crypto
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2018-04-30 18:51:40 -0400
committerTheodore Ts'o <tytso@mit.edu>2018-05-20 16:21:01 -0400
commit101c97a3e616f877a51201a4ff6ec2358b9a88d0 (patch)
tree567c41694197d23a75e51e5f64d08f616a613f3b /fs/crypto
parent1da2f0ac8ca57475e454e10180ee57a73b9566ec (diff)
fscrypt: don't clear flags on crypto transform
fscrypt is clearing the flags on the crypto_skcipher it allocates for each inode. But, this is unnecessary and may cause problems in the future because it will even clear flags that are meant to be internal to the crypto API, e.g. CRYPTO_TFM_NEED_KEY. Remove the unnecessary flag clearing. Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/crypto')
-rw-r--r--fs/crypto/keyinfo.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/crypto/keyinfo.c b/fs/crypto/keyinfo.c
index d09df8f751df..0f6a65c6483b 100644
--- a/fs/crypto/keyinfo.c
+++ b/fs/crypto/keyinfo.c
@@ -325,7 +325,6 @@ int fscrypt_get_encryption_info(struct inode *inode)
325 goto out; 325 goto out;
326 } 326 }
327 crypt_info->ci_ctfm = ctfm; 327 crypt_info->ci_ctfm = ctfm;
328 crypto_skcipher_clear_flags(ctfm, ~0);
329 crypto_skcipher_set_flags(ctfm, CRYPTO_TFM_REQ_WEAK_KEY); 328 crypto_skcipher_set_flags(ctfm, CRYPTO_TFM_REQ_WEAK_KEY);
330 /* 329 /*
331 * if the provided key is longer than keysize, we use the first 330 * if the provided key is longer than keysize, we use the first