* [PATCH] netlink: simplify nfnetlink_bind
@ 2014-03-21 16:44 Richard Guy Briggs
2014-03-24 11:10 ` Pablo Neira Ayuso
0 siblings, 1 reply; 3+ messages in thread
From: Richard Guy Briggs @ 2014-03-21 16:44 UTC (permalink / raw)
To: linux-audit, linux-kernel, netfilter-devel, netdev
Cc: Richard Guy Briggs, eparis, sgrubb, hadi, davem
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@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();
}
#endif
--
1.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] netlink: simplify nfnetlink_bind
2014-03-21 16:44 [PATCH] netlink: simplify nfnetlink_bind Richard Guy Briggs
@ 2014-03-24 11:10 ` Pablo Neira Ayuso
2014-03-24 13:56 ` Richard Guy Briggs
0 siblings, 1 reply; 3+ messages in thread
From: Pablo Neira Ayuso @ 2014-03-24 11:10 UTC (permalink / raw)
To: Richard Guy Briggs
Cc: linux-audit, linux-kernel, netfilter-devel, netdev, eparis,
sgrubb, hadi, davem
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@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.
Thanks
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] netlink: simplify nfnetlink_bind
2014-03-24 11:10 ` Pablo Neira Ayuso
@ 2014-03-24 13:56 ` Richard Guy Briggs
0 siblings, 0 replies; 3+ messages in thread
From: Richard Guy Briggs @ 2014-03-24 13:56 UTC (permalink / raw)
To: Pablo Neira Ayuso
Cc: linux-audit, linux-kernel, netfilter-devel, netdev, eparis,
sgrubb, hadi, davem
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@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@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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-03-24 13:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-21 16:44 [PATCH] netlink: simplify nfnetlink_bind Richard Guy Briggs
2014-03-24 11:10 ` Pablo Neira Ayuso
2014-03-24 13:56 ` Richard Guy Briggs
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).