Skip to content

Commit

Permalink
ima: fix buffer overrun in ima_eventdigest_init_common
Browse files Browse the repository at this point in the history
commit 923168a upstream.

Function ima_eventdigest_init() calls ima_eventdigest_init_common()
with HASH_ALGO__LAST which is then used to access the array
hash_digest_size[] leading to buffer overrun. Have a conditional
statement to handle this.

Fixes: 9fab303 ("ima: fix violation measurement list record")
Signed-off-by: Samasth Norway Ananda <[email protected]>
Tested-by: Enrico Bravi (PhD at polito.it) <[email protected]>
Cc: [email protected] # 5.19+
Signed-off-by: Mimi Zohar <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
samasth-norway authored and gregkh committed Nov 22, 2024
1 parent c4d6453 commit 8a84765
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions security/integrity/ima/ima_template_lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -318,15 +318,21 @@ static int ima_eventdigest_init_common(const u8 *digest, u32 digestsize,
hash_algo_name[hash_algo]);
}

if (digest)
if (digest) {
memcpy(buffer + offset, digest, digestsize);
else
} else {
/*
* If digest is NULL, the event being recorded is a violation.
* Make room for the digest by increasing the offset by the
* hash algorithm digest size.
* hash algorithm digest size. If the hash algorithm is not
* specified increase the offset by IMA_DIGEST_SIZE which
* fits SHA1 or MD5
*/
offset += hash_digest_size[hash_algo];
if (hash_algo < HASH_ALGO__LAST)
offset += hash_digest_size[hash_algo];
else
offset += IMA_DIGEST_SIZE;
}

return ima_write_template_field_data(buffer, offset + digestsize,
fmt, field_data);
Expand Down

0 comments on commit 8a84765

Please sign in to comment.