Commit 1b7b533f65db9b31f76972b2899ec7ec6433ae77
Committed by
Eric Paris
Eric Paris
1 parent
4eb0f4abfb
Exists in
master
and in
16 other branches
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: Richard Guy Briggs <rgb@redhat.com> Reported-by: toshi.okajima@jp.fujitsu.com Tested-by: toshi.okajima@jp.fujitsu.com Signed-off-by: Eric Paris <eparis@redhat.com>
Showing 1 changed file with 2 additions and 0 deletions Side-by-side Diff
kernel/audit.c
| ... | ... | @@ -876,6 +876,7 @@ |
| 876 | 876 | if (err) |
| 877 | 877 | break; |
| 878 | 878 | } |
| 879 | + mutex_unlock(&audit_cmd_mutex); | |
| 879 | 880 | audit_log_common_recv_msg(&ab, msg_type); |
| 880 | 881 | if (msg_type != AUDIT_USER_TTY) |
| 881 | 882 | audit_log_format(ab, " msg='%.*s'", |
| ... | ... | @@ -893,6 +894,7 @@ |
| 893 | 894 | } |
| 894 | 895 | audit_set_portid(ab, NETLINK_CB(skb).portid); |
| 895 | 896 | audit_log_end(ab); |
| 897 | + mutex_lock(&audit_cmd_mutex); | |
| 896 | 898 | } |
| 897 | 899 | break; |
| 898 | 900 | case AUDIT_ADD_RULE: |