diff options
| author |   Dmitry Kasatkin <dmitry.kasatkin@huawei.com> | 2014-10-30 12:39:39 +0200 |
|---|---|---|
| committer |   Mimi Zohar <zohar@linux.vnet.ibm.com> | 2016-02-18 17:13:32 -0500 |
| commit | 1525b06d99b117198ea8d6c128ee5bf28ceb6723 (patch) | |
| tree | c85888e65dc37bf76cb7004f2bf775e6c7a797b6 /security/integrity/ima/ima_crypto.c | |
| parent | IMA: fix non-ANSI declaration of ima_check_policy() (diff) | |
| download | linux-dev-1525b06d99b117198ea8d6c128ee5bf28ceb6723.tar.xz linux-dev-1525b06d99b117198ea8d6c128ee5bf28ceb6723.zip | |
ima: separate 'security.ima' reading functionality from collect
Instead of passing pointers to pointers to ima_collect_measurent() to
read and return the 'security.ima' xattr value, this patch moves the
functionality to the calling process_measurement() to directly read
the xattr and pass only the hash algo to the ima_collect_measurement().
Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@huawei.com>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Diffstat (limited to 'security/integrity/ima/ima_crypto.c')
| -rw-r--r-- | security/integrity/ima/ima_crypto.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/integrity/ima/ima_crypto.c b/security/integrity/ima/ima_crypto.c index 6eb62936c672..fb30ce406af4 100644 --- a/security/integrity/ima/ima_crypto.c +++ b/security/integrity/ima/ima_crypto.c @@ -24,7 +24,7 @@ #include <linux/err.h> #include <linux/slab.h> #include <crypto/hash.h> -#include <crypto/hash_info.h> + #include "ima.h" struct ahash_completion { |