Skip to content

Commit 95526d1

Browse files
robertosassumimizohar
authored andcommitted
ima: Fix build warnings
Fix build warnings (function parameters description) for ima_collect_modsig(), ima_match_policy() and ima_parse_add_rule(). Fixes: 1558822 ("ima: Collect modsig") # v5.4+ Fixes: 2fe5d6d ("ima: integrity appraisal extension") # v5.14+ Fixes: 4af4662 ("integrity: IMA policy") # v3.2+ Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com> Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
1 parent 996e0a9 commit 95526d1

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

security/integrity/ima/ima_modsig.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,9 @@ int ima_read_modsig(enum ima_hooks func, const void *buf, loff_t buf_len,
8989

9090
/**
9191
* ima_collect_modsig - Calculate the file hash without the appended signature.
92+
* @modsig: parsed module signature
93+
* @buf: data to verify the signature on
94+
* @size: data size
9295
*
9396
* Since the modsig is part of the file contents, the hash used in its signature
9497
* isn't the same one ordinarily calculated by IMA. Therefore PKCS7 code

security/integrity/ima/ima_policy.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -721,6 +721,7 @@ static int get_subaction(struct ima_rule_entry *rule, enum ima_hooks func)
721721
* @secid: LSM secid of the task to be validated
722722
* @func: IMA hook identifier
723723
* @mask: requested action (MAY_READ | MAY_WRITE | MAY_APPEND | MAY_EXEC)
724+
* @flags: IMA actions to consider (e.g. IMA_MEASURE | IMA_APPRAISE)
724725
* @pcr: set the pcr to extend
725726
* @template_desc: the template that should be used for this rule
726727
* @func_data: func specific data, may be NULL
@@ -1915,7 +1916,7 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry)
19151916

19161917
/**
19171918
* ima_parse_add_rule - add a rule to ima_policy_rules
1918-
* @rule - ima measurement policy rule
1919+
* @rule: ima measurement policy rule
19191920
*
19201921
* Avoid locking by allowing just one writer at a time in ima_write_policy()
19211922
* Returns the length of the rule parsed, an error code on failure

0 commit comments

Comments
 (0)