From f97c469e4344d51baf29a367956428ec24d85191 Mon Sep 17 00:00:00 2001 From: Dmitry Kasatkin Date: Wed, 27 Jun 2012 11:26:14 +0300 Subject: [PATCH] --- yaml --- r: 329115 b: refs/heads/master c: d9d300cdb6f233c4c591348919c758062198a4f4 h: refs/heads/master i: 329113: 7b921cc5ecbe1e94f26a1be5cf5de90d3a920fe1 329111: fa507b0d45e94d97ae8bfaae7884b02f4b16a63a v: v3 --- [refs] | 2 +- trunk/security/integrity/ima/ima.h | 2 +- trunk/security/integrity/ima/ima_api.c | 4 ++-- trunk/security/integrity/ima/ima_main.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 25497e5d118d..50e3644fa6a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e23eb920b0f3978687c497de2ac3eb9e281dab32 +refs/heads/master: d9d300cdb6f233c4c591348919c758062198a4f4 diff --git a/trunk/security/integrity/ima/ima.h b/trunk/security/integrity/ima/ima.h index 069a4aa63e95..48aa0d46d3e7 100644 --- a/trunk/security/integrity/ima/ima.h +++ b/trunk/security/integrity/ima/ima.h @@ -108,7 +108,7 @@ static inline unsigned long ima_hash_key(u8 *digest) } /* LIM API function definitions */ -int ima_must_appraise_or_measure(struct inode *inode, int mask, int function); +int ima_get_action(struct inode *inode, int mask, int function); int ima_must_measure(struct inode *inode, int mask, int function); int ima_collect_measurement(struct integrity_iint_cache *iint, struct file *file); diff --git a/trunk/security/integrity/ima/ima_api.c b/trunk/security/integrity/ima/ima_api.c index 33d46859753a..f0d60e754b3e 100644 --- a/trunk/security/integrity/ima/ima_api.c +++ b/trunk/security/integrity/ima/ima_api.c @@ -97,7 +97,7 @@ void ima_add_violation(struct inode *inode, const unsigned char *filename, } /** - * ima_must_appraise_or_measure - appraise & measure decision based on policy. + * ima_get_action - appraise & measure decision based on policy. * @inode: pointer to inode to measure * @mask: contains the permission mask (MAY_READ, MAY_WRITE, MAY_EXECUTE) * @function: calling function (FILE_CHECK, BPRM_CHECK, FILE_MMAP) @@ -112,7 +112,7 @@ void ima_add_violation(struct inode *inode, const unsigned char *filename, * Returns IMA_MEASURE, IMA_APPRAISE mask. * */ -int ima_must_appraise_or_measure(struct inode *inode, int mask, int function) +int ima_get_action(struct inode *inode, int mask, int function) { int flags = IMA_MEASURE | IMA_APPRAISE; diff --git a/trunk/security/integrity/ima/ima_main.c b/trunk/security/integrity/ima/ima_main.c index df6521296051..60b047e96f4e 100644 --- a/trunk/security/integrity/ima/ima_main.c +++ b/trunk/security/integrity/ima/ima_main.c @@ -158,7 +158,7 @@ static int process_measurement(struct file *file, const unsigned char *filename, /* Determine if in appraise/measurement policy, * returns IMA_MEASURE, IMA_APPRAISE bitmask. */ - action = ima_must_appraise_or_measure(inode, mask, function); + action = ima_get_action(inode, mask, function); if (!action) return 0;