Re: [PATCH] audit: skip klog-fowarding if mcasts were sent

[Niels Ole Salscheider]

Any news on this?

> We currently skip forwarding audit messages to the kernel-log if auditd is
> running. However, if auditd is not running, but there are multicast
> listeners, we still forward those messages to the kerne-log. This causes
> generic log-daemons to get audit messages twice if auditd is not running.
> Once via the multicast message, and once via the kernel-log. As the
> kernel-log is much less convenient to parse, compared to netlink audit
> messages, we'd like to avoid dropping netlink support again.
> 
> Therefore, this patch makes the audit infrastructure forward audit
> messages only to the kernel-log if neither auditd nor a multicast
> listener is present.
> 
> Signed-off-by: David Herrmann <dh.herrmann <at> gmail.com>
> ---
> 
>  kernel/audit.c | 18 ++++++++++--------
>  1 file changed, 10 insertions(+), 8 deletions(-)
> 
> diff --git a/kernel/audit.c b/kernel/audit.c
> index 80983df..c087c6a 100644
> --- a/kernel/audit.c
> +++ b/kernel/audit.c
> 
>  <at>  <at>  -429,14 +429,9  <at>  <at>  static void kauditd_send_skb(struct
>  sk_buff *skb)>  
>   * This function doesn't consume an skb as might be expected since it has
>   to
>   * copy it anyways.
>   */
> 
> -static void kauditd_send_multicast_skb(struct sk_buff *skb)
> +static void kauditd_send_multicast_skb(struct sock *sock, struct sk_buff
> *skb)> 
>  {
>  
>  	struct sk_buff		*copy;
> 
> -	struct audit_net	*aunet = net_generic(&init_net, audit_net_id);
> -	struct sock		*sock = aunet->nlsk;
> -
> -	if (!netlink_has_listeners(sock, AUDIT_NLGRP_READLOG))
> -		return;
> 
>  	/*
>  	
>  	 * The seemingly wasteful skb_copy() rather than bumping the refcount
>  
>  <at>  <at>  -1947,9 +1942,14  <at>  <at>  void audit_log_end(struct
>  audit_buffer *ab)>  
>  		audit_log_lost("rate limit exceeded");
>  	
>  	} else {
>  	
>  		struct nlmsghdr *nlh = nlmsg_hdr(ab->skb);
> 
> +		struct audit_net *aunet = net_generic(&init_net, audit_net_id);
> +		struct sock *sock = aunet->nlsk;
> +		bool has_mc = netlink_has_listeners(sock, AUDIT_NLGRP_READLOG);
> 
>  		nlh->nlmsg_len = ab->skb->len;
> 
> -		kauditd_send_multicast_skb(ab->skb);
> +
> +		if (has_mc)
> +			kauditd_send_multicast_skb(sock, ab->skb);
> 
>  		/*
>  		
>  		 * The original kaudit unicast socket sends up messages with
>  
>  <at>  <at>  -1965,8 +1965,10  <at>  <at>  void audit_log_end(struct
>  audit_buffer *ab)>  
>  		if (audit_pid) {
>  		
>  			skb_queue_tail(&audit_skb_queue, ab->skb);
>  			wake_up_interruptible(&kauditd_wait);
> 
> -		} else {
> +		} else if (!has_mc) {
> 
>  			audit_printk_skb(ab->skb);
> 
> +		} else {
> +			audit_hold_skb(ab->skb);
> 
>  		}
>  		ab->skb = NULL;
>  	
>  	}
> 
> --
> 2.2.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/