aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYaowei Bai <bywxiaobai@163.com>2015-11-04 08:23:51 -0500
committerPaul Moore <pmoore@redhat.com>2015-11-04 08:23:51 -0500
commit6f1b5d7afe1d737b7ca726e08e26f2e0367876d2 (patch)
tree19d282f149497913afac9a9ed25389e5ee3f6199
parentaudit: audit_string_contains_control can be boolean (diff)
downloadlinux-dev-6f1b5d7afe1d737b7ca726e08e26f2e0367876d2.tar.xz
linux-dev-6f1b5d7afe1d737b7ca726e08e26f2e0367876d2.zip
audit: audit_tree_match can be boolean
This patch makes audit_tree_match return bool to improve readability due to this particular function only using either one or zero as its return value. No functional change. Signed-off-by: Yaowei Bai <bywxiaobai@163.com> [PM: tweaked the subject line] Signed-off-by: Paul Moore <pmoore@redhat.com>
-rw-r--r--kernel/audit.h2
-rw-r--r--kernel/audit_tree.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/kernel/audit.h b/kernel/audit.h
index dadf86a0e59e..de6cbb7cf547 100644
--- a/kernel/audit.h
+++ b/kernel/audit.h
@@ -301,7 +301,7 @@ extern int audit_exe_compare(struct task_struct *tsk, struct audit_fsnotify_mark
#ifdef CONFIG_AUDIT_TREE
extern struct audit_chunk *audit_tree_lookup(const struct inode *);
extern void audit_put_chunk(struct audit_chunk *);
-extern int audit_tree_match(struct audit_chunk *, struct audit_tree *);
+extern bool audit_tree_match(struct audit_chunk *, struct audit_tree *);
extern int audit_make_tree(struct audit_krule *, char *, u32);
extern int audit_add_tree_rule(struct audit_krule *);
extern int audit_remove_tree_rule(struct audit_krule *);
diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c
index 94ecdabda8e6..5efe9b299a12 100644
--- a/kernel/audit_tree.c
+++ b/kernel/audit_tree.c
@@ -197,13 +197,13 @@ struct audit_chunk *audit_tree_lookup(const struct inode *inode)
return NULL;
}
-int audit_tree_match(struct audit_chunk *chunk, struct audit_tree *tree)
+bool audit_tree_match(struct audit_chunk *chunk, struct audit_tree *tree)
{
int n;
for (n = 0; n < chunk->count; n++)
if (chunk->owners[n].owner == tree)
- return 1;
- return 0;
+ return true;
+ return false;
}
/* tagging and untagging inodes with trees */