Skip to content

Commit 30d8764

Browse files
alexhenriemimizohar
authored andcommitted
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: Alex Henrie <[email protected]> Reviewed-by: Petr Vorel <[email protected]> Signed-off-by: Mimi Zohar <[email protected]>
1 parent eb0782b commit 30d8764

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

security/integrity/ima/ima_policy.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ struct ima_rule_entry {
7979
uuid_t fsuuid;
8080
kuid_t uid;
8181
kuid_t fowner;
82-
bool (*uid_op)(kuid_t, kuid_t); /* Handlers for operators */
83-
bool (*fowner_op)(kuid_t, kuid_t); /* uid_eq(), uid_gt(), uid_lt() */
82+
bool (*uid_op)(kuid_t cred_uid, kuid_t rule_uid); /* Handlers for operators */
83+
bool (*fowner_op)(kuid_t cred_uid, kuid_t rule_uid); /* uid_eq(), uid_gt(), uid_lt() */
8484
int pcr;
8585
unsigned int allowed_algos; /* bitfield of allowed hash algorithms */
8686
struct {
@@ -1550,8 +1550,10 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry)
15501550

15511551
result = kstrtoul(args[0].from, 10, &lnum);
15521552
if (!result) {
1553-
entry->fowner = make_kuid(current_user_ns(), (uid_t)lnum);
1554-
if (!uid_valid(entry->fowner) || (((uid_t)lnum) != lnum))
1553+
entry->fowner = make_kuid(current_user_ns(),
1554+
(uid_t)lnum);
1555+
if (!uid_valid(entry->fowner) ||
1556+
(((uid_t)lnum) != lnum))
15551557
result = -EINVAL;
15561558
else
15571559
entry->flags |= IMA_FOWNER;

0 commit comments

Comments
 (0)