[PATCH 1/2] audit: print error message when fail to create audit socket

Andrew Morton akpm at linux-foundation.org
Wed Jan 8 00:53:35 UTC 2014


On Tue, 17 Dec 2013 11:10:41 +0800 Gao feng <gaofeng at cn.fujitsu.com> wrote:

> print the error message and then return -ENOMEM.
> 
> ...
>
> --- a/kernel/audit.c
> +++ b/kernel/audit.c
> @@ -1083,12 +1083,11 @@ static int __net_init audit_net_init(struct net *net)
>  	pr_info("audit: initializing netlink socket in namespace\n");
>  
>  	aunet->nlsk = netlink_kernel_create(net, NETLINK_AUDIT, &cfg);
> -	if (aunet->nlsk == NULL)
> -		return -ENOMEM;
> -	if (!aunet->nlsk)
> +	if (aunet->nlsk == NULL) {
>  		audit_panic("cannot initialize netlink socket in namespace");
> -	else
> -		aunet->nlsk->sk_sndtimeo = MAX_SCHEDULE_TIMEOUT;
> +		return -ENOMEM;
> +	}
> +	aunet->nlsk->sk_sndtimeo = MAX_SCHEDULE_TIMEOUT;
>  	return 0;
>  }

What kernel version are these against?  Something ancient, I expect -
audit_net_init() doesn't exist.

Please check current kernels, redo and resend the patches if anything
needs changing?




More information about the Linux-audit mailing list