| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <4FBE1678.7050903@cn.fujitsu.com>
Date: Thu, 24 May 2012 19:07:36 +0800
From: Gao feng <gaofeng@...fujitsu.com>
To: Pablo Neira Ayuso <pablo@...filter.org>
CC: netfilter-devel@...r.kernel.org, netdev@...r.kernel.org,
serge.hallyn@...onical.com, ebiederm@...ssion.com,
dlezcano@...ibm.com
Subject: Re: [PATCH 04/17] netfilter: add namespace support for l4proto_generic
于 2012年05月24日 17:52, Pablo Neira Ayuso 写道:
> On Thu, May 24, 2012 at 09:13:36AM +0800, Gao feng wrote:
>> 于 2012年05月23日 18:32, Pablo Neira Ayuso 写道:
>>> On Mon, May 14, 2012 at 04:52:14PM +0800, Gao feng wrote:
>>>> implement and export nf_conntrack_proto_generic_[init,fini],
>>>> nf_conntrack_[init,cleanup]_net call them to register or unregister
>>>> the sysctl of generic proto.
>>>>
>>>> implement generic_net_init,it's used to initial the pernet
>>>> data for generic proto.
>>>>
>>>> and use nf_generic_net.timeout to replace nf_ct_generic_timeout in
>>>> get_timeouts function.
>>>>
>>>> Acked-by: Eric W. Biederman <ebiederm@...ssion.com>
>>>> Signed-off-by: Gao feng <gaofeng@...fujitsu.com>
>>>> ---
>>>> include/net/netfilter/nf_conntrack_l4proto.h | 2 +
>>>> include/net/netns/conntrack.h | 6 +++
>>>> net/netfilter/nf_conntrack_core.c | 8 +++-
>>>> net/netfilter/nf_conntrack_proto.c | 21 +++++-----
>>>> net/netfilter/nf_conntrack_proto_generic.c | 55 ++++++++++++++++++++++++-
>>>> 5 files changed, 76 insertions(+), 16 deletions(-)
>>>>
>>>> diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h
>>>> index a93dcd5..0d329b9 100644
>>>> --- a/include/net/netfilter/nf_conntrack_l4proto.h
>>>> +++ b/include/net/netfilter/nf_conntrack_l4proto.h
>>>> @@ -118,6 +118,8 @@ struct nf_conntrack_l4proto {
>>>>
>>>> /* Existing built-in generic protocol */
>>>> extern struct nf_conntrack_l4proto nf_conntrack_l4proto_generic;
>>>> +extern int nf_conntrack_proto_generic_init(struct net *net);
>>>> +extern void nf_conntrack_proto_generic_fini(struct net *net);
>>>>
>>>> #define MAX_NF_CT_PROTO 256
>>>>
>>>> diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
>>>> index 94992e9..3381b80 100644
>>>> --- a/include/net/netns/conntrack.h
>>>> +++ b/include/net/netns/conntrack.h
>>>> @@ -20,7 +20,13 @@ struct nf_proto_net {
>>>> unsigned int users;
>>>> };
>>>>
>>>> +struct nf_generic_net {
>>>> + struct nf_proto_net pn;
>>>> + unsigned int timeout;
>>>> +};
>>>> +
>>>> struct nf_ip_net {
>>>> + struct nf_generic_net generic;
>>>> #if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
>>>> struct ctl_table_header *ctl_table_header;
>>>> struct ctl_table *ctl_table;
>>>> diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
>>>> index 32c5909..fd33e91 100644
>>>> --- a/net/netfilter/nf_conntrack_core.c
>>>> +++ b/net/netfilter/nf_conntrack_core.c
>>>> @@ -1353,6 +1353,7 @@ static void nf_conntrack_cleanup_net(struct net *net)
>>>> }
>>>>
>>>> nf_ct_free_hashtable(net->ct.hash, net->ct.htable_size);
>>>> + nf_conntrack_proto_generic_fini(net);
>>>> nf_conntrack_helper_fini(net);
>>>> nf_conntrack_timeout_fini(net);
>>>> nf_conntrack_ecache_fini(net);
>>>> @@ -1586,9 +1587,12 @@ static int nf_conntrack_init_net(struct net *net)
>>>> ret = nf_conntrack_helper_init(net);
>>>> if (ret < 0)
>>>> goto err_helper;
>>>> -
>>>> + ret = nf_conntrack_proto_generic_init(net);
>>>> + if (ret < 0)
>>>> + goto err_generic;
>>>> return 0;
>>>> -
>>>> +err_generic:
>>>> + nf_conntrack_helper_fini(net);
>>>> err_helper:
>>>> nf_conntrack_timeout_fini(net);
>>>> err_timeout:
>>>> diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
>>>> index 7ee6653..9b4bf6d 100644
>>>> --- a/net/netfilter/nf_conntrack_proto.c
>>>> +++ b/net/netfilter/nf_conntrack_proto.c
>>>> @@ -287,10 +287,16 @@ EXPORT_SYMBOL_GPL(nf_conntrack_l3proto_unregister);
>>>> static struct nf_proto_net *nf_ct_l4proto_net(struct net *net,
>>>> struct nf_conntrack_l4proto *l4proto)
>>>> {
>>>> - if (l4proto->net_id)
>>>> - return net_generic(net, *l4proto->net_id);
>>>> - else
>>>> - return NULL;
>>>> + switch (l4proto->l4proto) {
>>>> + case 255: /* l4proto_generic */
>>>> + return (struct nf_proto_net *)&net->ct.proto.generic;
>>>> + default:
>>>> + if (l4proto->net_id)
>>>> + return net_generic(net, *l4proto->net_id);
>>>> + else
>>>> + return NULL;
>>>> + }
>>>> + return NULL;
>>>> }
>>>>
>>>> int nf_ct_l4proto_register_sysctl(struct net *net,
>>>> @@ -457,11 +463,6 @@ EXPORT_SYMBOL_GPL(nf_conntrack_l4proto_unregister);
>>>> int nf_conntrack_proto_init(void)
>>>> {
>>>> unsigned int i;
>>>> - int err;
>>>> -
>>>> - err = nf_ct_l4proto_register_sysctl(&init_net, &nf_conntrack_l4proto_generic);
>>>> - if (err < 0)
>>>> - return err;
>>>
>>> I like that all protocols sysctl are registered by
>>> nf_conntrack_proto_init. Can you keep using that?
>>
>> you mean per-net's generic_proto sysctl are registered by
>> nf_conntrack_proto_init?
>>
>> such as
>>
>> int nf_conntrack_proto_init(struct net *net)
>> {
>> ...
>> err = nf_ct_l4proto_register_sysctl(net, &nf_conntrack_l4proto_generic);
>
> Yes, all protocol trackers included in nf_conntrack_proto_init:
>
> err = nf_conntrack_proto_generic_init(net);
> ...
> err = nf_conntrack_proto_tcp_init(net);
> ...
>
> and so on.
sounds good,but the l4protos except l4proto_generic are enabled by
insmod modules(such as nf_conntrack_ipv4,nf_conntrack_proto_udplite).
So I think it makes no sense to init all protocol here, unless we decide
to put those protos into module nf_conntrack.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists