[PATCH 3/6] ima: remove unneeded size_limit argument from ima_eventdigest_init_common()

[Roberto Sassu]

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.sa...@polito.it>
Signed-off-by: Mimi Zohar <zo...@linux.vnet.ibm.com>
---
 security/integrity/ima/ima_template_lib.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/security/integrity/ima/ima_template_lib.c 
b/security/integrity/ima/ima_template_lib.c
index 4752a53..6d01c69 100644
--- a/security/integrity/ima/ima_template_lib.c
+++ b/security/integrity/ima/ima_template_lib.c
@@ -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,
-                                      struct ima_field_data *field_data,
-                                      bool size_limit)
+                                      struct ima_field_data *field_data)
 {
        /*
         * 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;
        u32 offset = 0;
 
-       if (!size_limit) {
+       if (hash_algo < HASH_ALGO__LAST) {
                fmt = DATA_FMT_DIGEST_WITH_ALGO;
-               if (hash_algo < HASH_ALGO__LAST)
-                       offset += snprintf(buffer, CRYPTO_MAX_ALG_NAME + 1,
-                                          "%s", hash_algo_name[hash_algo]);
+               offset += snprintf(buffer, CRYPTO_MAX_ALG_NAME + 1, "%s",
+                                  hash_algo_name[hash_algo]);
                buffer[offset] = ':';
                offset += 2;
        }
@@ -240,7 +238,7 @@ int ima_eventdigest_init(struct integrity_iint_cache *iint, 
struct file *file,
        cur_digestsize = hash.hdr.length;
 out:
        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;
 out:
        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,
-- 
1.8.1.4

smime.p7s
Description: S/MIME cryptographic signature