audit: audit_string_contains_control can be boolean

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>
[PM: tweaked subject line]
Signed-off-by: Paul Moore <pmoore@redhat.com>

diff --git a/include/linux/audit.h b/include/linux/audit.h
index 69844b680fcc2ded2c70b4bb785cb6da422bf640..20eba1eb0a3cc2e1eb1e982f1f330f259fa03cab 100644 (file)
--- 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 5ca21033585cdb16bd80a11f5492aa496112c01f..a7223bc7931d6f18e951c0d10cbe9790b54bbfa4 100644 (file)
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -1581,14 +1581,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;
 }
 
 /**