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 2/3] kernel/audit: audit_string_contains_control can be boolean
Date: Tue, 29 Sep 2015 22:15:40 +0800 [thread overview]
Message-ID: <1443536141-5134-2-git-send-email-bywxiaobai@163.com> (raw)
In-Reply-To: <1443536141-5134-1-git-send-email-bywxiaobai@163.com>
This patch makes audit_string_contains_control return bool to improve
readability due to this particular function only using either one or
zero as its return value.
Signed-off-by: Yaowei Bai <bywxiaobai@163.com>
---
include/linux/audit.h | 2 +-
kernel/audit.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/linux/audit.h b/include/linux/audit.h
index 69844b6..20eba1e 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -457,7 +457,7 @@ extern struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp
extern __printf(2, 3)
void audit_log_format(struct audit_buffer *ab, const char *fmt, ...);
extern void audit_log_end(struct audit_buffer *ab);
-extern int audit_string_contains_control(const char *string,
+extern bool audit_string_contains_control(const char *string,
size_t len);
extern void audit_log_n_hex(struct audit_buffer *ab,
const unsigned char *buf,
diff --git a/kernel/audit.c b/kernel/audit.c
index 662c007..86d423c 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -1566,14 +1566,14 @@ void audit_log_n_string(struct audit_buffer *ab, const char *string,
* @string: string to be checked
* @len: max length of the string to check
*/
-int audit_string_contains_control(const char *string, size_t len)
+bool audit_string_contains_control(const char *string, size_t len)
{
const unsigned char *p;
for (p = string; p < (const unsigned char *)string + len; p++) {
if (*p == '"' || *p < 0x21 || *p > 0x7e)
- return 1;
+ return true;
}
- return 0;
+ return false;
}
/**
--
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 ` Yaowei Bai [this message]
2015-09-29 18:37 ` [PATCH 2/3] kernel/audit: audit_string_contains_control " Paul Moore
2015-09-29 14:15 ` [PATCH 3/3] kernel/audit: audit_tree_match " Yaowei Bai
2015-09-29 18:47 ` 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-2-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®