Commit 94f94810 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

tty_audit: invert the condition in tty_audit_log() 



If we cannot obtain an audit buffer in tty_audit_log(), simply return
from the function. Apart this is mostly preferred in the kernel, it
allows to merge the split audit string while still keeping it readable.

Signed-off-by: default avatarJiri Slaby (SUSE) <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/20230621101611.10580-4-jirislaby@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e1488513

drivers/tty/tty_audit.c

+12 −12
Original line number Diff line number Diff line
@@ -66,21 +66,21 @@ static void tty_audit_log(const char *description, dev_t dev, 
	uid_t uid = from_kuid(&init_user_ns, task_uid(current));

	uid_t loginuid = from_kuid(&init_user_ns, audit_get_loginuid(current));

	unsigned int sessionid = audit_get_sessionid(current);

	char name[TASK_COMM_LEN];



	ab = audit_log_start(audit_context(), GFP_KERNEL, AUDIT_TTY);

	if (ab) {

		char name[TASK_COMM_LEN];

	if (!ab)

		return;



		audit_log_format(ab, "%s pid=%u uid=%u auid=%u ses=%u major=%d"

				 " minor=%d comm=", description, pid, uid,

				 loginuid, sessionid, MAJOR(dev), MINOR(dev));

	audit_log_format(ab, "%s pid=%u uid=%u auid=%u ses=%u major=%d minor=%d comm=",

			 description, pid, uid, loginuid, sessionid,

			 MAJOR(dev), MINOR(dev));

	get_task_comm(name, current);

	audit_log_untrustedstring(ab, name);

	audit_log_format(ab, " data=");

	audit_log_n_hex(ab, data, size);

	audit_log_end(ab);

}

}



/*

 *	tty_audit_buf_push	-	Push buffered data out