[PATCH] netlink: simplify nfnetlink_bind

Richard Guy Briggs rgb at redhat.com
Mon Mar 24 13:56:07 UTC 2014


On 14/03/24, Pablo Neira Ayuso wrote:
> On Fri, Mar 21, 2014 at 12:44:09PM -0400, Richard Guy Briggs wrote:
> > Remove duplicity and simplify code flow by moving the rcu_read_unlock() above
> > the condition and let the flow control exit naturally at the end of the
> > function.
> > 
> > Signed-off-by: Richard Guy Briggs <rgb at redhat.com>
> > ---
> >  net/netfilter/nfnetlink.c |    4 +---
> >  1 files changed, 1 insertions(+), 3 deletions(-)
> > 
> > diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c
> > index 046aa13..75619f9 100644
> > --- a/net/netfilter/nfnetlink.c
> > +++ b/net/netfilter/nfnetlink.c
> > @@ -399,12 +399,10 @@ static void nfnetlink_bind(int group)
> >  
> >  	rcu_read_lock();
> >  	ss = nfnetlink_get_subsys(type);
> > +	rcu_read_unlock();
> >  	if (!ss) {
> > -		rcu_read_unlock();
> >  		request_module("nfnetlink-subsys-%d", type);
> > -		return;
> >  	}
> > -	rcu_read_unlock();
> 
> Applied with minor glitch. Removed the brackets in that if branch.

Good point!  Thanks.

> Thanks

- RGB

--
Richard Guy Briggs <rbriggs at 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




More information about the Linux-audit mailing list