From: Yaowei Bai <bywxiaobai@163.com>
To: paul@paul-moore.com, eparis@redhat.com
Cc: linux-audit@redhat.com, linux-kernel@vger.kernel.org
Subject: [PATCH 3/3] kernel/audit: audit_tree_match can be boolean
Date: Tue, 29 Sep 2015 22:15:41 +0800 [thread overview]
Message-ID: <1443536141-5134-3-git-send-email-bywxiaobai@163.com> (raw)
In-Reply-To: <1443536141-5134-1-git-send-email-bywxiaobai@163.com>
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(-)
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 */
--
1.9.1
next prev parent reply other threads:[~2015-09-29 14:19 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-29 14:15 [PATCH 1/3] kernel/audit: audit_dummy_context " Yaowei Bai
2015-09-29 14:15 ` [PATCH 2/3] kernel/audit: audit_string_contains_control " Yaowei Bai
2015-09-29 18:37 ` Paul Moore
2015-09-29 14:15 ` Yaowei Bai [this message]
2015-09-29 18:47 ` [PATCH 3/3] kernel/audit: audit_tree_match " Paul Moore
2015-09-29 18:23 ` [PATCH 1/3] kernel/audit: audit_dummy_context " Paul Moore
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1443536141-5134-3-git-send-email-bywxiaobai@163.com \
--to=bywxiaobai@163.com \
--cc=eparis@redhat.com \
--cc=linux-audit@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=paul@paul-moore.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®