public inbox for linux-audit@redhat.com
 help / color / mirror / Atom feed
From: Gao feng <gaofeng@cn.fujitsu.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-audit@redhat.com, linux-kernel@vger.kernel.org,
	rgb@redhat.com, eparis@redhat.com
Subject: Re: [PATCH 1/2] audit: print error message when fail to create audit socket
Date: Wed, 08 Jan 2014 09:18:00 +0800	[thread overview]
Message-ID: <52CCA748.4080709@cn.fujitsu.com> (raw)
In-Reply-To: <20140107165335.c276557412291786d745e0ab@linux-foundation.org>

On 01/08/2014 08:53 AM, Andrew Morton wrote:
> On Tue, 17 Dec 2013 11:10:41 +0800 Gao feng <gaofeng@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?

This patch is against Richard Guy Briggs's audit tree. the current kernel
doesn't have this problem.

BTW, Richard & Eric, when do you plan to push these changes to the upstream?
there are a lot of changes in Richard's tree.

  reply	other threads:[~2014-01-08  1:18 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-17  3:10 [PATCH 1/2] audit: print error message when fail to create audit socket Gao feng
2013-12-17  3:10 ` [PATCH 2/2] audit: fix incorrect set of audit_sock Gao feng
2013-12-17 16:02   ` Eric Paris
2013-12-20  1:38   ` Richard Guy Briggs
2013-12-17 15:56 ` [PATCH 1/2] audit: print error message when fail to create audit socket Eric Paris
2013-12-20  1:34   ` Richard Guy Briggs
2014-01-08  0:53 ` Andrew Morton
2014-01-08  1:18   ` Gao feng [this message]
2014-01-08  3:30     ` Richard Guy Briggs

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=52CCA748.4080709@cn.fujitsu.com \
    --to=gaofeng@cn.fujitsu.com \
    --cc=akpm@linux-foundation.org \
    --cc=eparis@redhat.com \
    --cc=linux-audit@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rgb@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox