UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ima: remove unneeded size_limit argument from ima_eventdigest_init_common() 

This patch removes the 'size_limit' argument from
ima_eventdigest_init_common(). Since the 'd' field will never include
the hash algorithm as prefix and the 'd-ng' will always have it, we can
use the hash algorithm to differentiate the two cases in the modified
function (it is equal to HASH_ALGO__LAST in the first case, the opposite
in the second).

Signed-off-by: Roberto Sassu <roberto.sassu@polito.it>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
This commit is contained in:
Roberto Sassu 2013-11-08 19:21:37 +01:00 committed by Mimi Zohar
parent ef8894b0ca
commit dcf4e39286
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
security/integrity/ima/ima_template_lib.c
View File

@ -158,8 +158,7 @@ void ima_show_template_sig(struct seq_file *m, enum ima_show_type show,
} }
static int ima_eventdigest_init_common(u8 *digest, u32 digestsize, u8 hash_algo, static int ima_eventdigest_init_common(u8 *digest, u32 digestsize, u8 hash_algo,
struct ima_field_data *field_data, struct ima_field_data *field_data)
bool size_limit)
{ {
/* /*
* digest formats: * digest formats:
@ -172,11 +171,10 @@ static int ima_eventdigest_init_common(u8 *digest, u32 digestsize, u8 hash_algo,
enum data_formats fmt = DATA_FMT_DIGEST; enum data_formats fmt = DATA_FMT_DIGEST;
u32 offset = 0; u32 offset = 0;
if (!size_limit) { if (hash_algo < HASH_ALGO__LAST) {
fmt = DATA_FMT_DIGEST_WITH_ALGO; fmt = DATA_FMT_DIGEST_WITH_ALGO;
if (hash_algo < HASH_ALGO__LAST) offset += snprintf(buffer, CRYPTO_MAX_ALG_NAME + 1, "%s",
offset += snprintf(buffer, CRYPTO_MAX_ALG_NAME + 1, hash_algo_name[hash_algo]);
"%s", hash_algo_name[hash_algo]);
buffer[offset] = ':'; buffer[offset] = ':';
offset += 2; offset += 2;
} }
@ -240,7 +238,7 @@ int ima_eventdigest_init(struct integrity_iint_cache *iint, struct file *file,
cur_digestsize = hash.hdr.length; cur_digestsize = hash.hdr.length;
out: out:
return ima_eventdigest_init_common(cur_digest, cur_digestsize, return ima_eventdigest_init_common(cur_digest, cur_digestsize,
HASH_ALGO__LAST, field_data, true); HASH_ALGO__LAST, field_data);
} }
/* /*
@ -264,7 +262,7 @@ int ima_eventdigest_ng_init(struct integrity_iint_cache *iint,
hash_algo = iint->ima_hash->algo; hash_algo = iint->ima_hash->algo;
out: out:
return ima_eventdigest_init_common(cur_digest, cur_digestsize, return ima_eventdigest_init_common(cur_digest, cur_digestsize,
hash_algo, field_data, false); hash_algo, field_data);
} }
static int ima_eventname_init_common(struct integrity_iint_cache *iint, static int ima_eventname_init_common(struct integrity_iint_cache *iint,