Merge remote-tracking branch 'audit/next'

[deliverable/linux.git] / kernel / audit.c

diff --git a/kernel/audit.c b/kernel/audit.c
index 02bde12685bd8da96aa4496226028e05cb13c0f8..f1ca11613379fa2950aa7e33e732d85462f1fb57 100644 (file)
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -938,7 +938,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
                if (!audit_enabled && msg_type != AUDIT_USER_AVC)
                        return 0;
 
-               err = audit_filter_user(msg_type);
+               err = audit_filter(msg_type, AUDIT_FILTER_USER);
                if (err == 1) { /* match or error */
                        err = 0;
                        if (msg_type == AUDIT_USER_TTY) {
@@ -1385,7 +1385,7 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask,
        if (audit_initialized != AUDIT_INITIALIZED)
                return NULL;
 
-       if (unlikely(audit_filter_type(type)))
+       if (unlikely(!audit_filter(type, AUDIT_FILTER_TYPE)))
                return NULL;
 
        if (gfp_mask & __GFP_DIRECT_RECLAIM) {