Skip to content

Commit a8220b0

Browse files
committed
Merge tag 'audit-pr-20241112' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit
Pull audit updates from Paul Moore: "The audit patches are minimal this time around with one patch to correct some kdoc function parameters and one to leverage the `str_yes_no()` function; nothing very exciting" * tag 'audit-pr-20241112' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit: audit: Use str_yes_no() helper function audit: Reorganize kerneldoc parameter names
2 parents 8350142 + 89282be commit a8220b0

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

kernel/audit.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2102,8 +2102,8 @@ bool audit_string_contains_control(const char *string, size_t len)
21022102
/**
21032103
* audit_log_n_untrustedstring - log a string that may contain random characters
21042104
* @ab: audit_buffer
2105-
* @len: length of string (not including trailing null)
21062105
* @string: string to be logged
2106+
* @len: length of string (not including trailing null)
21072107
*
21082108
* This code will escape a string that is passed to it if the string
21092109
* contains a control character, unprintable character, double quote mark,

kernel/auditsc.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1653,8 +1653,8 @@ static void audit_log_uring(struct audit_context *ctx)
16531653
audit_log_format(ab, "uring_op=%d", ctx->uring_op);
16541654
if (ctx->return_valid != AUDITSC_INVALID)
16551655
audit_log_format(ab, " success=%s exit=%ld",
1656-
(ctx->return_valid == AUDITSC_SUCCESS ?
1657-
"yes" : "no"),
1656+
str_yes_no(ctx->return_valid ==
1657+
AUDITSC_SUCCESS),
16581658
ctx->return_code);
16591659
audit_log_format(ab,
16601660
" items=%d"
@@ -1696,8 +1696,8 @@ static void audit_log_exit(void)
16961696
audit_log_format(ab, " per=%lx", context->personality);
16971697
if (context->return_valid != AUDITSC_INVALID)
16981698
audit_log_format(ab, " success=%s exit=%ld",
1699-
(context->return_valid == AUDITSC_SUCCESS ?
1700-
"yes" : "no"),
1699+
str_yes_no(context->return_valid ==
1700+
AUDITSC_SUCCESS),
17011701
context->return_code);
17021702
audit_log_format(ab,
17031703
" a0=%lx a1=%lx a2=%lx a3=%lx items=%d",

0 commit comments

Comments
 (0)