diff --git a/[refs] b/[refs] index a20960c552b5..2b0d689a9cd2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1bfbc608ba05951678eedc246c9baf62367764a0 +refs/heads/master: 9ce34218a8b63594c8958b5a4ef8cce24d511e1b diff --git a/trunk/kernel/auditfilter.c b/trunk/kernel/auditfilter.c index 359645cff5b2..df66a21fb360 100644 --- a/trunk/kernel/auditfilter.c +++ b/trunk/kernel/auditfilter.c @@ -1498,7 +1498,7 @@ int audit_receive_filter(int type, int pid, int uid, int seq, void *data, * auditctl to read from it... which isn't ever going to * happen if we're actually running in the context of auditctl * trying to _send_ the stuff */ - + dest = kmalloc(sizeof(struct audit_netlink_list), GFP_KERNEL); if (!dest) return -ENOMEM; @@ -1678,7 +1678,7 @@ int audit_filter_type(int type) { struct audit_entry *e; int result = 0; - + rcu_read_lock(); if (list_empty(&audit_filter_list[AUDIT_FILTER_TYPE])) goto unlock_and_return;