On 13/12/17, Eric Paris wrote:
> On Tue, 2013-12-17 at 11:10 +0800, Gao feng wrote:
> > print the error message and then return -ENOMEM.
> >
> > Signed-off-by: Gao feng <gaof...@cn.fujitsu.com>
>
> Haha. If it's NULL return. No no, if it's REALLY null audit_panic().
Wow, who committed *that* crap!?! :P
Thanks for the catch.
> Acked-by: Eric Paris <epa...@redhat.com>
> > ---
> > kernel/audit.c | 9 ++++-----
> > 1 file changed, 4 insertions(+), 5 deletions(-)
> >
> > diff --git a/kernel/audit.c b/kernel/audit.c
> > index 2a0ed0b..041b951 100644
> > --- 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;
> > }
- RGB
--
Richard Guy Briggs <rbri...@redhat.com>
Senior Software Engineer, Kernel Security, AMER ENG Base Operating Systems, Red
Hat
Remote, Ottawa, Canada
Voice: +1.647.777.2635, Internal: (81) 32635, Alt: +1.613.693.0684x3545
--
Linux-audit mailing list
Linux-audit@redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit
