lkml.org 
[lkml]   [2019]   [Dec]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 034/243] netfilter: nf_tables: dont use position attribute on rule replacement
    Date
    From: Florian Westphal <fw@strlen.de>

    [ Upstream commit 447750f281abef547be44fdcfe3bc4447b3115a8 ]

    Its possible to set both HANDLE and POSITION when replacing a rule.
    In this case, the rule at POSITION gets replaced using the
    userspace-provided handle. Rule handles are supposed to be generated
    by the kernel only.

    Duplicate handles should be harmless, however better disable this "feature"
    by only checking for the POSITION attribute on insert operations.

    Fixes: 5e94846686d0 ("netfilter: nf_tables: add insert operation")
    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_tables_api.c | 17 +++++++----------
    1 file changed, 7 insertions(+), 10 deletions(-)

    diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
    index ec0f8b5bde0aa..0e1b1f7f4745e 100644
    --- a/net/netfilter/nf_tables_api.c
    +++ b/net/netfilter/nf_tables_api.c
    @@ -2610,17 +2610,14 @@ static int nf_tables_newrule(struct net *net, struct sock *nlsk,

    if (chain->use == UINT_MAX)
    return -EOVERFLOW;
    - }
    -
    - if (nla[NFTA_RULE_POSITION]) {
    - if (!(nlh->nlmsg_flags & NLM_F_CREATE))
    - return -EOPNOTSUPP;

    - pos_handle = be64_to_cpu(nla_get_be64(nla[NFTA_RULE_POSITION]));
    - old_rule = __nft_rule_lookup(chain, pos_handle);
    - if (IS_ERR(old_rule)) {
    - NL_SET_BAD_ATTR(extack, nla[NFTA_RULE_POSITION]);
    - return PTR_ERR(old_rule);
    + if (nla[NFTA_RULE_POSITION]) {
    + pos_handle = be64_to_cpu(nla_get_be64(nla[NFTA_RULE_POSITION]));
    + old_rule = __nft_rule_lookup(chain, pos_handle);
    + if (IS_ERR(old_rule)) {
    + NL_SET_BAD_ATTR(extack, nla[NFTA_RULE_POSITION]);
    + return PTR_ERR(old_rule);
    + }
    }
    }

    --
    2.20.1


    \
     
     \ /
      Last update: 2019-12-11 16:19    [W:4.110 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site