6:29 p.m.
On 3/18/08, Pavel Emelyanov <xemul(a)openvz.org> wrote:
Can we please just leave audit_pid as the one flag to tell us if
auditd is supposedly up there in userspace? Use audit_nlk_pid to send
messages to the right place, but leave everything else to do with
audit_pid alone.
diff --git a/kernel/audit.c b/kernel/audit.c
index 10c4930..40b3a34 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -78,8 +78,10 @@ static int audit_default;
/* If auditing cannot proceed, audit_failure selects what happens. */
static int audit_failure = AUDIT_FAIL_PRINTK;
-/* If audit records are to be written to the netlink socket, audit_pid
+/* If audit records are to be written to the netlink socket, audit_nlk_pid
/* If audit records are to be written to the netlink socket, audit_pid
contain the pid of the auditd process and audit_nlk_pid will contain
the pid to use to send netlink messages to that process. */
* contains the (non-zero) pid. */
+static int audit_nlk_pid;
+
int audit_pid;
/* If audit_rate_limit is non-zero, limit the rate of sending audit records
@@ -349,13 +351,13 @@ static int kauditd_thread(void *dummy)
skb = skb_dequeue(&audit_skb_queue);
wake_up(&audit_backlog_wait);
if (skb) {
- if (audit_pid) {
- int err = netlink_unicast(audit_sock, skb, audit_pid,
0);
+ if (audit_nlk_pid) {
unneeded change
+ int err =
netlink_unicast(audit_sock, skb, audit_nlk_pid, 0);
good.
if (err < 0) {
BUG_ON(err != -ECONNREFUSED); /* Shoudn't
happen */
- printk(KERN_ERR "audit: *NO* daemon at
audit_pid=%d\n", audit_pid);
+ printk(KERN_ERR "audit: *NO* daemon at
audit_nlk_pid=%d\n", audit_nlk_pid);
userspace is never going to care about audit_nlk_pid, its meaningless
at that level. This message should continue to use audit_pid.
audit_log_lost("auditd
dissapeared\n");
- audit_pid = 0;
We still need to 0 audit_pid otherwise all of the tests which use it
are bogus (aka things like audit_panic and audit_filter_syscall you
mentioned)
+ audit_nlk_pid = 0;
}
} else {
if (printk_ratelimit())
@@ -626,6 +628,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr
*nlh)
sid, 1);
audit_pid = new_pid;
+ audit_nlk_pid = NETLINK_CB(skb).pid;
}
if (status_get->mask & AUDIT_STATUS_RATE_LIMIT)
err = audit_set_rate_limit(status_get->rate_limit,
@@ -1354,7 +1357,7 @@ void audit_log_end(struct audit_buffer *ab)
audit_log_lost("rate limit exceeded");
} else {
struct nlmsghdr *nlh = nlmsg_hdr(ab->skb);
- if (audit_pid) {
+ if (audit_nlk_pid) {
don't need this if we zero audit_pid.
nlh->nlmsg_len = ab->skb->len -
NLMSG_SPACE(0);
skb_queue_tail(&audit_skb_queue, ab->skb);
ab->skb = NULL;
6:35 p.m.
New subject: [PATCH] Audit: netlink socket can be auto-bound to pid other than current->pid
On 3/18/08, Eric Paris <eparis(a)parisplace.org> wrote:
On 3/18/08, Pavel Emelyanov <xemul(a)openvz.org> wrote:
> @@ -626,6 +628,7 @@ static int audit_receive_msg(struct
sk_buff *skb, struct nlmsghdr *nlh)
> sid, 1);
>
> audit_pid = new_pid;
> + audit_nlk_pid = NETLINK_CB(skb).pid;
> }
> if (status_get->mask & AUDIT_STATUS_RATE_LIMIT)
> err = audit_set_rate_limit(status_get->rate_limit,
Shouldn't the above be:
if (audit_pid)
audit_nlk_pid = NETLINK_CB(skb).pid;
else
audit_nlk_pid = 0;
otherwise I don't see how you can cleanly stop the userspace auditd.....
6122
days inactive
6122
days old
linux-audit@lists.linux-audit.osci.io
1 comments
1 participants
participants (1)
-
Eric Paris