OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[AUDIT] Requeue messages at head of queue, up to audit_backlog 

If netlink_unicast() fails, requeue the skb back at the head of the queue
it just came from, instead of the tail. And do so unless we've exceeded
the audit_backlog limit; not according to some other arbitrary limit.

From: Chris Wright <chrisw@osdl.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
This commit is contained in:
Chris Wright 2005-04-29 17:19:14 +01:00 committed by
parent c94c257c88
commit 37509e749d
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/audit.c
View File

@ -142,7 +142,6 @@ struct audit_buffer {
int total; int total;
int type; int type;
int pid; int pid;
int count; /* Times requeued */
}; };
void audit_set_type(struct audit_buffer *ab, int type) void audit_set_type(struct audit_buffer *ab, int type)
@ -526,9 +525,9 @@ static inline int audit_log_drain(struct audit_buffer *ab)
retval = netlink_unicast(audit_sock, skb, audit_pid, retval = netlink_unicast(audit_sock, skb, audit_pid,
MSG_DONTWAIT); MSG_DONTWAIT);
} }
if (retval == -EAGAIN && ab->count < 5) { if (retval == -EAGAIN &&
++ab->count; (atomic_read(&audit_backlog)) < audit_backlog_limit) {
skb_queue_tail(&ab->sklist, skb); skb_queue_head(&ab->sklist, skb);
audit_log_end_irq(ab); audit_log_end_irq(ab);
return 1; return 1;
} }
@ -666,7 +665,6 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx)
ab->total = 0; ab->total = 0;
ab->type = AUDIT_KERNEL; ab->type = AUDIT_KERNEL;
ab->pid = 0; ab->pid = 0;
ab->count = 0;
#ifdef CONFIG_AUDITSYSCALL #ifdef CONFIG_AUDITSYSCALL
if (ab->ctx) if (ab->ctx)