lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6

Browse Source 
* '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
This commit is contained in:
Linus Torvalds
2009-10-09 13:30:14 -07:00
parent a372bf8b6a 36520be8e3
commit 4047df09a1
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fs/ecryptfs/Kconfig
View File

@@ -1,8 +1,9 @@
config ECRYPT_FS config ECRYPT_FS
tristate "eCrypt filesystem layer support (EXPERIMENTAL)" tristate "eCrypt filesystem layer support (EXPERIMENTAL)"
depends on EXPERIMENTAL && KEYS && NET depends on EXPERIMENTAL && KEYS && CRYPTO
select CRYPTO_ECB select CRYPTO_ECB
select CRYPTO_CBC select CRYPTO_CBC
select CRYPTO_MD5
help help
Encrypted filesystem that operates on the VFS layer. See Encrypted filesystem that operates on the VFS layer. See
<file:Documentation/filesystems/ecryptfs.txt> to learn more about <file:Documentation/filesystems/ecryptfs.txt> to learn more about

7
fs/ecryptfs/main.c
View File

@@ -35,6 +35,7 @@
#include <linux/key.h> #include <linux/key.h>
#include <linux/parser.h> #include <linux/parser.h>
#include <linux/fs_stack.h> #include <linux/fs_stack.h>
#include <linux/ima.h>
#include "ecryptfs_kernel.h" #include "ecryptfs_kernel.h"
/** /**
@@ -118,6 +119,7 @@ int ecryptfs_init_persistent_file(struct dentry *ecryptfs_dentry)
const struct cred *cred = current_cred(); const struct cred *cred = current_cred();
struct ecryptfs_inode_info *inode_info = struct ecryptfs_inode_info *inode_info =
ecryptfs_inode_to_private(ecryptfs_dentry->d_inode); ecryptfs_inode_to_private(ecryptfs_dentry->d_inode);
int opened_lower_file = 0;
int rc = 0; int rc = 0;
mutex_lock(&inode_info->lower_file_mutex); 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]; " "for lower_dentry [0x%p] and lower_mnt [0x%p]; "
"rc = [%d]\n", lower_dentry, lower_mnt, rc); "rc = [%d]\n", lower_dentry, lower_mnt, rc);
inode_info->lower_file = NULL; inode_info->lower_file = NULL;
} } else
opened_lower_file = 1;
} }
mutex_unlock(&inode_info->lower_file_mutex); mutex_unlock(&inode_info->lower_file_mutex);
if (opened_lower_file)
ima_counts_get(inode_info->lower_file);
return rc; return rc;
} }