Commit a8220b0c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 8350142a 89282bea

kernel/audit.c

+1 −1
Original line number Diff line number Diff line
@@ -2102,8 +2102,8 @@ bool audit_string_contains_control(const char *string, size_t len) 
/**

 * audit_log_n_untrustedstring - log a string that may contain random characters

 * @ab: audit_buffer

 * @len: length of string (not including trailing null)

 * @string: string to be logged

 * @len: length of string (not including trailing null)

 *

 * This code will escape a string that is passed to it if the string

 * contains a control character, unprintable character, double quote mark,

kernel/auditsc.c

+4 −4
Original line number Diff line number Diff line
@@ -1653,8 +1653,8 @@ static void audit_log_uring(struct audit_context *ctx) 
	audit_log_format(ab, "uring_op=%d", ctx->uring_op);

	if (ctx->return_valid != AUDITSC_INVALID)

		audit_log_format(ab, " success=%s exit=%ld",

				 (ctx->return_valid == AUDITSC_SUCCESS ?

				  "yes" : "no"),

				 str_yes_no(ctx->return_valid ==

					    AUDITSC_SUCCESS),

				 ctx->return_code);

	audit_log_format(ab,

			 " items=%d"
@@ -1696,8 +1696,8 @@ static void audit_log_exit(void) 
			audit_log_format(ab, " per=%lx", context->personality);

		if (context->return_valid != AUDITSC_INVALID)

			audit_log_format(ab, " success=%s exit=%ld",

					 (context->return_valid == AUDITSC_SUCCESS ?

					  "yes" : "no"),

					 str_yes_no(context->return_valid ==

						    AUDITSC_SUCCESS),

					 context->return_code);

		audit_log_format(ab,

				 " a0=%lx a1=%lx a2=%lx a3=%lx items=%d",