Commit 30d8764a authored by Alex Henrie's avatar Alex Henrie Committed by Mimi Zohar
Browse files

ima: fix uid code style problems 



scripts/checkpatch.pl wants function arguments to have names; and Mimi
prefers to keep the line length in functions to 80 characters or less.

Signed-off-by: default avatarAlex Henrie <alexh@vpitech.com>
Reviewed-by: default avatarPetr Vorel <pvorel@suse.cz>
Signed-off-by: default avatarMimi Zohar <zohar@linux.ibm.com>
parent eb0782bb

security/integrity/ima/ima_policy.c

+6 −4
Original line number Diff line number Diff line
@@ -79,8 +79,8 @@ struct ima_rule_entry { 
	uuid_t fsuuid;

	kuid_t uid;

	kuid_t fowner;

	bool (*uid_op)(kuid_t, kuid_t);    /* Handlers for operators       */

	bool (*fowner_op)(kuid_t, kuid_t); /* uid_eq(), uid_gt(), uid_lt() */

	bool (*uid_op)(kuid_t cred_uid, kuid_t rule_uid);    /* Handlers for operators       */

	bool (*fowner_op)(kuid_t cred_uid, kuid_t rule_uid); /* uid_eq(), uid_gt(), uid_lt() */

	int pcr;

	unsigned int allowed_algos; /* bitfield of allowed hash algorithms */

	struct {
@@ -1550,8 +1550,10 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry) 


			result = kstrtoul(args[0].from, 10, &lnum);

			if (!result) {

				entry->fowner = make_kuid(current_user_ns(), (uid_t)lnum);

				if (!uid_valid(entry->fowner) || (((uid_t)lnum) != lnum))

				entry->fowner = make_kuid(current_user_ns(),

							  (uid_t)lnum);

				if (!uid_valid(entry->fowner) ||

				    (((uid_t)lnum) != lnum))

					result = -EINVAL;

				else

					entry->flags |= IMA_FOWNER;