From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yaowei Bai Subject: [PATCH 2/3] kernel/audit: audit_string_contains_control can be boolean Date: Tue, 29 Sep 2015 22:15:40 +0800 Message-ID: <1443536141-5134-2-git-send-email-bywxiaobai@163.com> References: <1443536141-5134-1-git-send-email-bywxiaobai@163.com> Return-path: In-Reply-To: <1443536141-5134-1-git-send-email-bywxiaobai@163.com> Sender: linux-kernel-owner@vger.kernel.org To: paul@paul-moore.com, eparis@redhat.com Cc: linux-audit@redhat.com, linux-kernel@vger.kernel.org List-Id: linux-audit@redhat.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 --- 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