lkml.org 
[lkml]   [2019]   [Sep]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.2 077/124] netfilter: conntrack: make sysctls per-namespace again
    Date
    From: Florian Westphal <fw@strlen.de>

    [ Upstream commit 478553fd1b6f819390b64a2e13ac756c4d1a2836 ]

    When I merged the extension sysctl tables with the main one I forgot to
    reset them on netns creation. They currently read/write init_net settings.

    Fixes: d912dec12428 ("netfilter: conntrack: merge acct and helper sysctl table with main one")
    Fixes: cb2833ed0044 ("netfilter: conntrack: merge ecache and timestamp sysctl tables with main one")
    Reported-by: Shmulik Ladkani <shmulik.ladkani@gmail.com>
    Signed-off-by: Florian Westphal <fw@strlen.de>
    Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/netfilter/nf_conntrack_standalone.c | 5 +++++
    1 file changed, 5 insertions(+)

    diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
    index e0d392cb3075a..0006503d2da97 100644
    --- a/net/netfilter/nf_conntrack_standalone.c
    +++ b/net/netfilter/nf_conntrack_standalone.c
    @@ -1037,8 +1037,13 @@ static int nf_conntrack_standalone_init_sysctl(struct net *net)
    table[NF_SYSCTL_CT_COUNT].data = &net->ct.count;
    table[NF_SYSCTL_CT_CHECKSUM].data = &net->ct.sysctl_checksum;
    table[NF_SYSCTL_CT_LOG_INVALID].data = &net->ct.sysctl_log_invalid;
    + table[NF_SYSCTL_CT_ACCT].data = &net->ct.sysctl_acct;
    + table[NF_SYSCTL_CT_HELPER].data = &net->ct.sysctl_auto_assign_helper;
    #ifdef CONFIG_NF_CONNTRACK_EVENTS
    table[NF_SYSCTL_CT_EVENTS].data = &net->ct.sysctl_events;
    +#endif
    +#ifdef CONFIG_NF_CONNTRACK_TIMESTAMP
    + table[NF_SYSCTL_CT_TIMESTAMP].data = &net->ct.sysctl_tstamp;
    #endif
    table[NF_SYSCTL_CT_PROTO_TIMEOUT_GENERIC].data = &nf_generic_pernet(net)->timeout;
    table[NF_SYSCTL_CT_PROTO_TIMEOUT_ICMP].data = &nf_icmp_pernet(net)->timeout;
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-09-20 00:11    [W:7.006 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site