Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 717e4277 authored Jun 06, 2023 by Roberto Sassu Committed by Greg Kroah-Hartman Jul 27, 2023

ima: Fix build warnings



[ Upstream commit 95526d13038c2bbddd567a4d8e39fac42484e182 ]

Fix build warnings (function parameters description) for
ima_collect_modsig(), ima_match_policy() and ima_parse_add_rule().

Fixes: 15588227 ("ima: Collect modsig") # v5.4+
Fixes: 2fe5d6de ("ima: integrity appraisal extension") # v5.14+
Fixes: 4af4662f ("integrity: IMA policy") # v3.2+
Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 8430a8e8

security/integrity/ima/ima_modsig.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -109,6 +109,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

security/integrity/ima/ima_policy.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -500,6 +500,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
		*
		@@ -1266,7 +1267,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