diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-09 13:30:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-09 13:30:14 -0700 |
| commit | 4047df09a1581284218cb378208a87eaa36f2d2c (patch) | |
| tree | 16e0f13b10d68f645b545a1c919714c66f75b863 /fs | |
| parent | a372bf8b6a12f23f68e716113ccaea4bf646dd0f (diff) | |
| parent | 36520be8e32b49bd85a63b7b8b40cd07c3da59a5 (diff) | |
| download | linux-rpi-4047df09a1581284218cb378208a87eaa36f2d2c.tar.gz linux-rpi-4047df09a1581284218cb378208a87eaa36f2d2c.tar.bz2 linux-rpi-4047df09a1581284218cb378208a87eaa36f2d2c.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:
ima: ecryptfs fix imbalance message
eCryptfs: Remove Kconfig NET dependency and select MD5
ecryptfs: depends on CRYPTO
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ecryptfs/Kconfig | 3 | ||||
| -rw-r--r-- | fs/ecryptfs/main.c | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/fs/ecryptfs/Kconfig b/fs/ecryptfs/Kconfig index 8aadb99b7634..1cd6d9d3e29a 100644 --- a/fs/ecryptfs/Kconfig +++ b/fs/ecryptfs/Kconfig @@ -1,8 +1,9 @@ config ECRYPT_FS tristate "eCrypt filesystem layer support (EXPERIMENTAL)" - depends on EXPERIMENTAL && KEYS && NET + depends on EXPERIMENTAL && KEYS && CRYPTO select CRYPTO_ECB select CRYPTO_CBC + select CRYPTO_MD5 help Encrypted filesystem that operates on the VFS layer. See <file:Documentation/filesystems/ecryptfs.txt> to learn more about diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c index 101fe4c7b1ee..c6ac85d6c701 100644 --- a/fs/ecryptfs/main.c +++ b/fs/ecryptfs/main.c @@ -35,6 +35,7 @@ #include <linux/key.h> #include <linux/parser.h> #include <linux/fs_stack.h> +#include <linux/ima.h> #include "ecryptfs_kernel.h" /** @@ -118,6 +119,7 @@ int ecryptfs_init_persistent_file(struct dentry *ecryptfs_dentry) const struct cred *cred = current_cred(); struct ecryptfs_inode_info *inode_info = ecryptfs_inode_to_private(ecryptfs_dentry->d_inode); + int opened_lower_file = 0; int rc = 0; mutex_lock(&inode_info->lower_file_mutex); @@ -134,9 +136,12 @@ int ecryptfs_init_persistent_file(struct dentry *ecryptfs_dentry) "for lower_dentry [0x%p] and lower_mnt [0x%p]; " "rc = [%d]\n", lower_dentry, lower_mnt, rc); inode_info->lower_file = NULL; - } + } else + opened_lower_file = 1; } mutex_unlock(&inode_info->lower_file_mutex); + if (opened_lower_file) + ima_counts_get(inode_info->lower_file); return rc; } |