From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757420AbXLSChS (ORCPT ); Tue, 18 Dec 2007 21:37:18 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753265AbXLSChG (ORCPT ); Tue, 18 Dec 2007 21:37:06 -0500 Received: from an-out-0708.google.com ([209.85.132.250]:33765 "EHLO an-out-0708.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753460AbXLSChF (ORCPT ); Tue, 18 Dec 2007 21:37:05 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:to:content-type:date:message-id:mime-version:x-mailer:content-transfer-encoding:from; b=pFSY7SYr9ksJkB8fleP1FcpOnOjwDT/q9BkBYTCtNQydmDL+GO8/WjwPBI6JAYkMPc7gOSFoL0iDMNFbvNAW0NtzjBId7BfUdMlW1am29R8/onJ3ivm1VyezJ23vr8AVviODW571zhFgavzfhykOe9tl+yzDMBJtg9lAkOBuRfE= Subject: [PATCH] eCryptfs: Load each file decryption key only once To: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, ecryptfs-devel@lists.sourceforge.net, mhalcrow@us.ibm.com Content-Type: text/plain Date: Tue, 18 Dec 2007 20:37:02 -0600 Message-Id: <1198031822.6015.10.camel@buster2> Mime-Version: 1.0 X-Mailer: Evolution 2.12.1 Content-Transfer-Encoding: 7bit From: Trevor Highland Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Load each file decryption key only once Signed-off-by: Trevor Highland --- fs/ecryptfs/crypto.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c index 70f7aab..949fe44 100644 --- a/fs/ecryptfs/crypto.c +++ b/fs/ecryptfs/crypto.c @@ -353,7 +353,6 @@ static int encrypt_scatterlist(struct ecryptfs_crypt_stat *crypt_stat, ecryptfs_dump_hex(crypt_stat->key, crypt_stat->key_size); } - /* Consider doing this once, when the file is opened */ mutex_lock(&crypt_stat->cs_tfm_mutex); if (!(crypt_stat->flags & ECRYPTFS_KEY_SET)) { rc = crypto_blkcipher_setkey(crypt_stat->tfm, crypt_stat->key, @@ -687,10 +686,12 @@ static int decrypt_scatterlist(struct ecryptfs_crypt_stat *crypt_stat, }; int rc = 0; - /* 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); -- 1.5.2.5