[PATCH 1/15] don't reallocate buffer in every audit_sockaddr()

Andrew Morton akpm at linux-foundation.org
Wed Dec 17 07:49:27 UTC 2008


On Wed, 17 Dec 2008 05:11:10 +0000 Al Viro <viro at ftp.linux.org.uk> wrote:

>  int audit_sockaddr(int len, void *a)
>  {
> -	struct audit_aux_data_sockaddr *ax;
>  	struct audit_context *context = current->audit_context;
>  
>  	if (likely(!context || context->dummy))
>  		return 0;
>  
> -	ax = kmalloc(sizeof(*ax) + len, GFP_KERNEL);
> -	if (!ax)
> -		return -ENOMEM;
> -
> -	ax->len = len;
> -	memcpy(ax->a, a, len);
> +	if (!context->sockaddr) {
> +		void *p = kmalloc(sizeof(struct sockaddr_storage), GFP_KERNEL);

argh, I really hate having to run all around the code verifying that
the type passed to sizeof matches the type that we'll be storing there :(


> +		if (!p)
> +			return -ENOMEM;
> +		context->sockaddr = p;
> +	}
>  
> -	ax->d.type = AUDIT_SOCKADDR;
> -	ax->d.next = context->aux;
> -	context->aux = (void *)ax;
> +	context->sockaddr_len = len;
> +	memcpy(context->sockaddr, a, len);
>  	return 0;
>  }

stoopid question: can an audit_contect be shared between
threads/processes?  If so, is locking needed around the read/test/write
of context->sockaddr and friends?  




More information about the Linux-audit mailing list