Merge tag 'audit-pr-20201012' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit (01fb1e2f) · Commits · 戴 / test

Pull audit updates from Paul Moore: "A small set of audit patches for v5.10. There are only three patches in total, and all three are trivial fixes that don't really warrant any explanations beyond their descriptions. As usual, all three patches pass our test suite" * tag 'audit-pr-20201012' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit: audit: Remove redundant null check audit: uninitialize variable audit_sig_sid audit: change unnecessary globals into statics

kernel/audit.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -123,9 +123,9 @@ static u32 audit_backlog_limit = 64;
		static u32 audit_backlog_wait_time = AUDIT_BACKLOG_WAIT_TIME;

		/* The identity of the user shutting down the audit system. */
		kuid_t audit_sig_uid = INVALID_UID;
		pid_t audit_sig_pid = -1;
		u32 audit_sig_sid = 0;
		static kuid_t audit_sig_uid = INVALID_UID;
		static pid_t audit_sig_pid = -1;
		static u32 audit_sig_sid;

		/* Records can be lost in several ways:
		0) [suppressed in audit_alloc]
		@@ -934,7 +934,6 @@ static void audit_free_reply(struct audit_reply *reply)
		if (!reply)
		return;

		if (reply->skb)
		kfree_skb(reply->skb);
		if (reply->net)
		put_net(reply->net);

kernel/audit.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -327,10 +327,6 @@ static inline int audit_signal_info_syscall(struct task_struct *t)

		extern char audit_unpack_string(void bufp, size_t remain, size_t len);

		extern pid_t audit_sig_pid;
		extern kuid_t audit_sig_uid;
		extern u32 audit_sig_sid;

		extern int audit_filter(int msgtype, unsigned int listtype);

		extern void audit_ctl_lock(void);

Admin message