| Message ID | 20230606074113.2120632-2-roberto.sassu@huaweicloud.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | [1/2] evm: Fix build warnings | expand |
On Tue Jun 6, 2023 at 10:41 AM EEST, Roberto Sassu wrote: > From: Roberto Sassu <roberto.sassu@huawei.com> > > Fix build warnings (function parameters description) for > ima_collect_modsig(), ima_match_policy() and ima_parse_add_rule(). > > Fixes: 15588227e086 ("ima: Collect modsig") > Fixes: 2fe5d6def167 ("ima: integrity appraisal extension") > Fixes: 4af4662fa4a9 ("integrity: IMA policy") > Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com> > --- > security/integrity/ima/ima_modsig.c | 3 +++ > security/integrity/ima/ima_policy.c | 3 ++- > 2 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/security/integrity/ima/ima_modsig.c b/security/integrity/ima/ima_modsig.c > index fb25723c65b..3e7bee30080 100644 > --- a/security/integrity/ima/ima_modsig.c > +++ b/security/integrity/ima/ima_modsig.c > @@ -89,6 +89,9 @@ int ima_read_modsig(enum ima_hooks func, const void *buf, loff_t buf_len, > > /** > * ima_collect_modsig - Calculate the file hash without the appended signature. > + * @modsig: parsed module signature > + * @buf: data to verify the signature on > + * @size: data size > * > * Since the modsig is part of the file contents, the hash used in its signature > * isn't the same one ordinarily calculated by IMA. Therefore PKCS7 code > diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c > index 3ca8b7348c2..c9b3bd8f1bb 100644 > --- a/security/integrity/ima/ima_policy.c > +++ b/security/integrity/ima/ima_policy.c > @@ -721,6 +721,7 @@ static int get_subaction(struct ima_rule_entry *rule, enum ima_hooks func) > * @secid: LSM secid of the task to be validated > * @func: IMA hook identifier > * @mask: requested action (MAY_READ | MAY_WRITE | MAY_APPEND | MAY_EXEC) > + * @flags: IMA actions to consider (e.g. IMA_MEASURE | IMA_APPRAISE) > * @pcr: set the pcr to extend > * @template_desc: the template that should be used for this rule > * @func_data: func specific data, may be NULL > @@ -1915,7 +1916,7 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry) > > /** > * ima_parse_add_rule - add a rule to ima_policy_rules > - * @rule - ima measurement policy rule > + * @rule: ima measurement policy rule > * > * Avoid locking by allowing just one writer at a time in ima_write_policy() > * Returns the length of the rule parsed, an error code on failure Acked-by: Jarkko Sakkinen <jarkko@kernel.org> BR, Jarkko
diff --git a/security/integrity/ima/ima_modsig.c b/security/integrity/ima/ima_modsig.c index fb25723c65b..3e7bee30080 100644 --- a/security/integrity/ima/ima_modsig.c +++ b/security/integrity/ima/ima_modsig.c @@ -89,6 +89,9 @@ int ima_read_modsig(enum ima_hooks func, const void *buf, loff_t buf_len, /** * ima_collect_modsig - Calculate the file hash without the appended signature. + * @modsig: parsed module signature + * @buf: data to verify the signature on + * @size: data size * * Since the modsig is part of the file contents, the hash used in its signature * isn't the same one ordinarily calculated by IMA. Therefore PKCS7 code diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c index 3ca8b7348c2..c9b3bd8f1bb 100644 --- a/security/integrity/ima/ima_policy.c +++ b/security/integrity/ima/ima_policy.c @@ -721,6 +721,7 @@ static int get_subaction(struct ima_rule_entry *rule, enum ima_hooks func) * @secid: LSM secid of the task to be validated * @func: IMA hook identifier * @mask: requested action (MAY_READ | MAY_WRITE | MAY_APPEND | MAY_EXEC) + * @flags: IMA actions to consider (e.g. IMA_MEASURE | IMA_APPRAISE) * @pcr: set the pcr to extend * @template_desc: the template that should be used for this rule * @func_data: func specific data, may be NULL @@ -1915,7 +1916,7 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry) /** * ima_parse_add_rule - add a rule to ima_policy_rules - * @rule - ima measurement policy rule + * @rule: ima measurement policy rule * * Avoid locking by allowing just one writer at a time in ima_write_policy() * Returns the length of the rule parsed, an error code on failure