Merge branch 'work.sane_pwd' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[GitHub/MotorolaMobilityLLC/kernel-slsi.git] / kernel / auditfilter.c

diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
index 239d11c3122c99cfa9b3da5f4a1658eb43ce34b6..0b0aa5854dac1ed41959f9383af95d4097ad4646 100644 (file)
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
@@ -1033,7 +1033,7 @@ out:
 }
 
 /* List rules using struct audit_rule_data. */
-static void audit_list_rules(__u32 portid, int seq, struct sk_buff_head *q)
+static void audit_list_rules(int seq, struct sk_buff_head *q)
 {
        struct sk_buff *skb;
        struct audit_krule *r;
@@ -1048,15 +1048,15 @@ static void audit_list_rules(__u32 portid, int seq, struct sk_buff_head *q)
                        data = audit_krule_to_data(r);
                        if (unlikely(!data))
                                break;
-                       skb = audit_make_reply(portid, seq, AUDIT_LIST_RULES,
-                                              0, 1, data,
+                       skb = audit_make_reply(seq, AUDIT_LIST_RULES, 0, 1,
+                                              data,
                                               sizeof(*data) + data->buflen);
                        if (skb)
                                skb_queue_tail(q, skb);
                        kfree(data);
                }
        }
-       skb = audit_make_reply(portid, seq, AUDIT_LIST_RULES, 1, 1, NULL, 0);
+       skb = audit_make_reply(seq, AUDIT_LIST_RULES, 1, 1, NULL, 0);
        if (skb)
                skb_queue_tail(q, skb);
 }
@@ -1085,13 +1085,11 @@ static void audit_log_rule_change(char *action, struct audit_krule *rule, int re
 /**
  * audit_rule_change - apply all rules to the specified message type
  * @type: audit message type
- * @portid: target port id for netlink audit messages
  * @seq: netlink audit message sequence (serial) number
  * @data: payload data
  * @datasz: size of payload data
  */
-int audit_rule_change(int type, __u32 portid, int seq, void *data,
-                       size_t datasz)
+int audit_rule_change(int type, int seq, void *data, size_t datasz)
 {
        int err = 0;
        struct audit_entry *entry;
@@ -1150,7 +1148,7 @@ int audit_list_rules_send(struct sk_buff *request_skb, int seq)
        skb_queue_head_init(&dest->q);
 
        mutex_lock(&audit_filter_mutex);
-       audit_list_rules(portid, seq, &dest->q);
+       audit_list_rules(seq, &dest->q);
        mutex_unlock(&audit_filter_mutex);
 
        tsk = kthread_run(audit_send_list, dest, "audit_send_list");