author: Trevor Highland <trevor.highland@gmail.com> 2008-02-06 01:38:33 -0800
committer: Linus Torvalds <torvalds@woody.linux-foundation.org> 2008-02-06 10:41:12 -0800
commit: 8e3a6f16ba5874b69968cd450334829262513fd1
parent: cc11beffdf80ca31dff21422fa2a5e54d25f1494
Commit Summary:
Diffstat:
1 file changed, 5 insertions, 2 deletions
diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c
index 4d1b2b4eb79e..7eaa395a77bd 100644
--- a/fs/ecryptfs/crypto.c
+++ b/fs/ecryptfs/crypto.c
@@ -355,8 +355,11 @@ static int encrypt_scatterlist(struct ecryptfs_crypt_stat *crypt_stat,
}
/* Consider doing this once, when the file is opened */
mutex_lock(&crypt_stat->cs_tfm_mutex);
- rc = crypto_blkcipher_setkey(crypt_stat->tfm, crypt_stat->key,
- crypt_stat->key_size);
+ if (!(crypt_stat->flags & ECRYPTFS_KEY_SET)) {
+ rc = crypto_blkcipher_setkey(crypt_stat->tfm, crypt_stat->key,
+ crypt_stat->key_size);
+ crypt_stat->flags |= ECRYPTFS_KEY_SET;
+ }
if (rc) {
ecryptfs_printk(KERN_ERR, "Error setting key; rc = [%d]\n",
rc);