diff options
| author | Dmitry Kasatkin <dmitry.kasatkin@intel.com> | 2012-09-03 10:11:56 -0400 |
|---|---|---|
| committer | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2013-01-16 15:47:05 -0500 |
| commit | e90805656d4683f84d360276102ae63adc777a38 (patch) | |
| tree | b252fcd8e8b1f0fde0277c24413ad21c857515c2 | |
| parent | 7163a993840f0906d4ce1e3f193575c99dac21e1 (diff) | |
evm: remove unused cleanup functions
EVM cannot be built as a kernel module. Remove the unncessary __exit
functions.
Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@intel.com>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
| -rw-r--r-- | security/integrity/evm/evm.h | 1 | ||||
| -rw-r--r-- | security/integrity/evm/evm_main.c | 9 | ||||
| -rw-r--r-- | security/integrity/evm/evm_secfs.c | 6 |
3 files changed, 0 insertions, 16 deletions
diff --git a/security/integrity/evm/evm.h b/security/integrity/evm/evm.h index c885247ebcf7..3eb30c6db419 100644 --- a/security/integrity/evm/evm.h +++ b/security/integrity/evm/evm.h | |||
| @@ -45,6 +45,5 @@ extern int evm_calc_hash(struct dentry *dentry, const char *req_xattr_name, | |||
| 45 | extern int evm_init_hmac(struct inode *inode, const struct xattr *xattr, | 45 | extern int evm_init_hmac(struct inode *inode, const struct xattr *xattr, |
| 46 | char *hmac_val); | 46 | char *hmac_val); |
| 47 | extern int evm_init_secfs(void); | 47 | extern int evm_init_secfs(void); |
| 48 | extern void evm_cleanup_secfs(void); | ||
| 49 | 48 | ||
| 50 | #endif | 49 | #endif |
diff --git a/security/integrity/evm/evm_main.c b/security/integrity/evm/evm_main.c index eb5484504f50..a78a5e21ef70 100644 --- a/security/integrity/evm/evm_main.c +++ b/security/integrity/evm/evm_main.c | |||
| @@ -427,15 +427,6 @@ err: | |||
| 427 | return error; | 427 | return error; |
| 428 | } | 428 | } |
| 429 | 429 | ||
| 430 | static void __exit cleanup_evm(void) | ||
| 431 | { | ||
| 432 | evm_cleanup_secfs(); | ||
| 433 | if (hmac_tfm) | ||
| 434 | crypto_free_shash(hmac_tfm); | ||
| 435 | if (hash_tfm) | ||
| 436 | crypto_free_shash(hash_tfm); | ||
| 437 | } | ||
| 438 | |||
| 439 | /* | 430 | /* |
| 440 | * evm_display_config - list the EVM protected security extended attributes | 431 | * evm_display_config - list the EVM protected security extended attributes |
| 441 | */ | 432 | */ |
diff --git a/security/integrity/evm/evm_secfs.c b/security/integrity/evm/evm_secfs.c index ac7629950578..30f670ad6ac3 100644 --- a/security/integrity/evm/evm_secfs.c +++ b/security/integrity/evm/evm_secfs.c | |||
| @@ -100,9 +100,3 @@ int __init evm_init_secfs(void) | |||
| 100 | error = -EFAULT; | 100 | error = -EFAULT; |
| 101 | return error; | 101 | return error; |
| 102 | } | 102 | } |
| 103 | |||
| 104 | void __exit evm_cleanup_secfs(void) | ||
| 105 | { | ||
| 106 | if (evm_init_tpm) | ||
| 107 | securityfs_remove(evm_init_tpm); | ||
| 108 | } | ||
