Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b7b533f authored by Richard Guy Briggs's avatar Richard Guy Briggs Committed by Eric Paris
Browse files

audit: drop audit_cmd_lock in AUDIT_USER family of cases 



We do not need to hold the audit_cmd_mutex for this family of cases.  The
possible exception to this is the call to audit_filter_user(), so drop the lock
immediately after.  To help in fixing the race we are trying to avoid, make
sure that nothing called by audit_filter_user() calls audit_log_start().  In
particular, watch out for *_audit_rule_match().

This fix will take care of systemd and anything USING audit.  It still means
that we could race with something configuring audit and auditd shutting down.

Signed-off-by: default avatarRichard Guy Briggs <rgb@redhat.com>
Reported-by: default avatar <toshi.okajima@jp.fujitsu.com>
Tested-by: default avatar <toshi.okajima@jp.fujitsu.com>
Signed-off-by: default avatarEric Paris <eparis@redhat.com>
parent 4eb0f4ab

kernel/audit.c

+2 −0
Original line number Diff line number Diff line
@@ -876,6 +876,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) 
				if (err)

					break;

			}

			mutex_unlock(&audit_cmd_mutex);

			audit_log_common_recv_msg(&ab, msg_type);

			if (msg_type != AUDIT_USER_TTY)

				audit_log_format(ab, " msg='%.*s'",
@@ -893,6 +894,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) 
			}

			audit_set_portid(ab, NETLINK_CB(skb).portid);

			audit_log_end(ab);

			mutex_lock(&audit_cmd_mutex);

		}

		break;

	case AUDIT_ADD_RULE: