Re: [PATCH 3/3] kernel/audit: audit_tree_match can be boolean

Paul Moore
2015-09-29T18:47:25Z

On Tuesday, September 29, 2015 10:15:41 PM Yaowei Bai wrote:
> 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>
> ---
> kernel/audit.h | 2 +-
> kernel/audit_tree.c | 6 +++---
> 2 files changed, 4 insertions(+), 4 deletions(-)

Applied, thanks.

> diff --git a/kernel/audit.h b/kernel/audit.h
> index dadf86a..de6cbb7 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 94ecdab..5efe9b29 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 */