From: Kangmin Park <l4stpr0gr4m@gmail.com>
To: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: Jozsef Kadlecsik <kadlec@netfilter.org>,
Florian Westphal <fw@strlen.de>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
netfilter-devel@vger.kernel.org, coreteam@netfilter.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] netfilter: remove duplicate code
Date: Tue, 10 Aug 2021 03:35:10 +0900 [thread overview]
Message-ID: <CAKW4uUx=cOu46E0QCdmg1Jq3WJ3w6ROo6oKZaXA=g6gdhdiDdg@mail.gmail.com> (raw)
In-Reply-To: <20210807062106.2563-1-l4stpr0gr4m@gmail.com>
I checked the Changes Requested state in patchwork.
But I have not received any review mails.
I wonder if there is any problem.
I'm sorry if you just review a little late due to a busy schedule.
Kangmin Park
2021년 8월 7일 (토) 오후 3:21, Kangmin Park <l4stpr0gr4m@gmail.com>님이 작성:
>
> nf_nat_ipv4_fn() and nf_nat_ipv6_fn() call nf_nat_inet_fn().
> Those two functions are already contains routine that gets nf_conn
> object and checks the untrackable situation.
> So, the following code is duplicated.
>
> ```
> ct = nf_ct_get(skb, &ctinfo);
> if (!ct)
> return NF_ACCEPT;
> ```
>
> Therefore, define a function __nf_nat_inet_fn() that has the same
> contents as the nf_nat_inet_fn() except for routine gets and checks
> the nf_conn object.
> Then, separate the nf_nat_inet_fn() into a routine that gets a
> nf_conn object and a routine that calls the __nf_nat_inet_fn().
>
> Signed-off-by: Kangmin Park <l4stpr0gr4m@gmail.com>
> ---
> include/net/netfilter/nf_nat.h | 5 +++++
> net/netfilter/nf_nat_core.c | 37 ++++++++++++++++++++++------------
> net/netfilter/nf_nat_proto.c | 4 ++--
> 3 files changed, 31 insertions(+), 15 deletions(-)
>
> diff --git a/include/net/netfilter/nf_nat.h b/include/net/netfilter/nf_nat.h
> index 987111ae5240..a66f617c5054 100644
> --- a/include/net/netfilter/nf_nat.h
> +++ b/include/net/netfilter/nf_nat.h
> @@ -100,6 +100,11 @@ void nf_nat_ipv6_unregister_fn(struct net *net, const struct nf_hook_ops *ops);
> int nf_nat_inet_register_fn(struct net *net, const struct nf_hook_ops *ops);
> void nf_nat_inet_unregister_fn(struct net *net, const struct nf_hook_ops *ops);
>
> +unsigned int
> +__nf_nat_inet_fn(void *priv, struct sk_buff *skb,
> + const struct nf_hook_state *state, struct nf_conn *ct,
> + enum ip_conntrack_info ctinfo);
> +
> unsigned int
> nf_nat_inet_fn(void *priv, struct sk_buff *skb,
> const struct nf_hook_state *state);
> diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c
> index 7de595ead06a..98ebba2c0f6d 100644
> --- a/net/netfilter/nf_nat_core.c
> +++ b/net/netfilter/nf_nat_core.c
> @@ -682,25 +682,15 @@ unsigned int nf_nat_packet(struct nf_conn *ct,
> }
> EXPORT_SYMBOL_GPL(nf_nat_packet);
>
> unsigned int
> -nf_nat_inet_fn(void *priv, struct sk_buff *skb,
> - const struct nf_hook_state *state)
> +__nf_nat_inet_fn(void *priv, struct sk_buff *skb,
> + const struct nf_hook_state *state, struct nf_conn *ct,
> + enum ip_conntrack_info ctinfo)
> {
> - struct nf_conn *ct;
> - enum ip_conntrack_info ctinfo;
> struct nf_conn_nat *nat;
> /* maniptype == SRC for postrouting. */
> enum nf_nat_manip_type maniptype = HOOK2MANIP(state->hook);
>
> - ct = nf_ct_get(skb, &ctinfo);
> - /* Can't track? It's not due to stress, or conntrack would
> - * have dropped it. Hence it's the user's responsibilty to
> - * packet filter it out, or implement conntrack/NAT for that
> - * protocol. 8) --RR
> - */
> - if (!ct)
> - return NF_ACCEPT;
> -
> nat = nfct_nat(ct);
>
> switch (ctinfo) {
> @@ -755,6 +745,26 @@ nf_nat_inet_fn(void *priv, struct sk_buff *skb,
> nf_ct_kill_acct(ct, ctinfo, skb);
> return NF_DROP;
> }
> +EXPORT_SYMBOL_GPL(__nf_nat_inet_fn);
> +
> +unsigned int
> +nf_nat_inet_fn(void *priv, struct sk_buff *skb,
> + const struct nf_hook_state *state)
> +{
> + struct nf_conn *ct;
> + enum ip_conntrack_info ctinfo;
> +
> + ct = nf_ct_get(skb, &ctinfo);
> + /* Can't track? It's not due to stress, or conntrack would
> + * have dropped it. Hence it's the user's responsibilty to
> + * packet filter it out, or implement conntrack/NAT for that
> + * protocol. 8) --RR
> + */
> + if (!ct)
> + return NF_ACCEPT;
> +
> + return __nf_nat_inet_fn(priv, skb, state, ct, ctinfo);
> +}
> EXPORT_SYMBOL_GPL(nf_nat_inet_fn);
>
> struct nf_nat_proto_clean {
> diff --git a/net/netfilter/nf_nat_proto.c b/net/netfilter/nf_nat_proto.c
> index 48cc60084d28..897859730078 100644
> --- a/net/netfilter/nf_nat_proto.c
> +++ b/net/netfilter/nf_nat_proto.c
> @@ -642,7 +642,7 @@ nf_nat_ipv4_fn(void *priv, struct sk_buff *skb,
> }
> }
>
> - return nf_nat_inet_fn(priv, skb, state);
> + return __nf_nat_inet_fn(priv, skb, state, ct, ctinfo);
> }
>
> static unsigned int
> @@ -934,7 +934,7 @@ nf_nat_ipv6_fn(void *priv, struct sk_buff *skb,
> }
> }
>
> - return nf_nat_inet_fn(priv, skb, state);
> + return __nf_nat_inet_fn(priv, skb, state, ct, ctinfo);
> }
>
> static unsigned int
> --
> 2.26.2
>
next prev parent reply other threads:[~2021-08-09 18:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-07 6:21 [PATCH] netfilter: remove duplicate code Kangmin Park
2021-08-09 18:35 ` Kangmin Park [this message]
2021-08-12 14:31 ` Florian Westphal
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='CAKW4uUx=cOu46E0QCdmg1Jq3WJ3w6ROo6oKZaXA=g6gdhdiDdg@mail.gmail.com' \
--to=l4stpr0gr4m@gmail.com \
--cc=coreteam@netfilter.org \
--cc=davem@davemloft.net \
--cc=fw@strlen.de \
--cc=kadlec@netfilter.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/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;
as well as URLs for NNTP newsgroup(s).