Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+8
-2
+2
-1
fs/ecryptfs/Kconfig
+2
-1
fs/ecryptfs/Kconfig
···
1
1
config ECRYPT_FS
2
2
tristate "eCrypt filesystem layer support (EXPERIMENTAL)"
3
-
depends on EXPERIMENTAL && KEYS && NET
3
+
depends on EXPERIMENTAL && KEYS && CRYPTO
4
4
select CRYPTO_ECB
5
5
select CRYPTO_CBC
6
+
select CRYPTO_MD5
6
7
help
7
8
Encrypted filesystem that operates on the VFS layer. See
8
9
<file:Documentation/filesystems/ecryptfs.txt> to learn more about
+6
-1
fs/ecryptfs/main.c
+6
-1
fs/ecryptfs/main.c
···
35
35
#include <linux/key.h>
36
36
#include <linux/parser.h>
37
37
#include <linux/fs_stack.h>
38
+
#include <linux/ima.h>
38
39
#include "ecryptfs_kernel.h"
39
40
40
41
/**
···
119
118
const struct cred *cred = current_cred();
120
119
struct ecryptfs_inode_info *inode_info =
121
120
ecryptfs_inode_to_private(ecryptfs_dentry->d_inode);
121
+
int opened_lower_file = 0;
122
122
int rc = 0;
123
123
124
124
mutex_lock(&inode_info->lower_file_mutex);
···
136
134
"for lower_dentry [0x%p] and lower_mnt [0x%p]; "
137
135
"rc = [%d]\n", lower_dentry, lower_mnt, rc);
138
136
inode_info->lower_file = NULL;
139
-
}
137
+
} else
138
+
opened_lower_file = 1;
140
139
}
141
140
mutex_unlock(&inode_info->lower_file_mutex);
141
+
if (opened_lower_file)
142
+
ima_counts_get(inode_info->lower_file);
142
143
return rc;
143
144
}
144
145