diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-03-16 09:15:13 -0500 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-03-16 09:15:13 -0500 |
| commit | cb1b77804091cc3491da4338a3599e318f358b25 (patch) | |
| tree | 481372e91d926b566d7e59c08a97bd3c16c5026a /fs/ecryptfs/crypto.c | |
| parent | da5309cd28ffda6ed8a4147bd14f1e4fbbd6503d (diff) | |
| parent | 5bee17f18b595937e6beafeee5197868a3f74a06 (diff) | |
| download | kernel-crypto-cb1b77804091cc3491da4338a3599e318f358b25.tar.gz kernel-crypto-cb1b77804091cc3491da4338a3599e318f358b25.tar.xz kernel-crypto-cb1b77804091cc3491da4338a3599e318f358b25.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/ecryptfs/crypto.c')
| -rw-r--r-- | fs/ecryptfs/crypto.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c index f6caeb1d110..bdca1f4b3a3 100644 --- a/fs/ecryptfs/crypto.c +++ b/fs/ecryptfs/crypto.c @@ -946,6 +946,8 @@ static int ecryptfs_copy_mount_wide_sigs_to_inode_sigs( list_for_each_entry(global_auth_tok, &mount_crypt_stat->global_auth_tok_list, mount_crypt_stat_list) { + if (global_auth_tok->flags & ECRYPTFS_AUTH_TOK_FNEK) + continue; rc = ecryptfs_add_keysig(crypt_stat, global_auth_tok->sig); if (rc) { printk(KERN_ERR "Error adding keysig; rc = [%d]\n", rc); |