summaryrefslogtreecommitdiffstats
path: root/kernel/audit.c
diff options
context:
space:
mode:
authorPaul Moore <pmoore@redhat.com>2014-12-09 20:38:30 +0100
committerPaul Moore <pmoore@redhat.com>2014-12-09 20:38:30 +0100
commit0f7e94ee40d06f7a04e039392dfee8244bd8a7e0 (patch)
tree4a14540900d72003b4bc5e06d1531fddba9bd4d5 /kernel/audit.c
parentaudit: keep inode pinned (diff)
parentaudit: convert status version to a feature bitmap (diff)
downloadlinux-0f7e94ee40d06f7a04e039392dfee8244bd8a7e0.tar.xz
linux-0f7e94ee40d06f7a04e039392dfee8244bd8a7e0.zip
Merge branch 'next' into upstream for v3.19
Diffstat (limited to 'kernel/audit.c')
-rw-r--r--kernel/audit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/audit.c b/kernel/audit.c
index 8ee4508f9666..f3a981db91ff 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -842,7 +842,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
s.backlog_limit = audit_backlog_limit;
s.lost = atomic_read(&audit_lost);
s.backlog = skb_queue_len(&audit_skb_queue);
- s.version = AUDIT_VERSION_LATEST;
+ s.feature_bitmap = AUDIT_FEATURE_BITMAP_ALL;
s.backlog_wait_time = audit_backlog_wait_time;
audit_send_reply(skb, seq, AUDIT_GET, 0, 0, &s, sizeof(s));
break;