lkml.org 
[lkml]   [2020]   [Jan]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 053/203] netfilter: nf_tables_offload: release flow_rule on error from commit path
    Date
    From: Pablo Neira Ayuso <pablo@netfilter.org>

    commit 23403cd8898dbc9808d3eb2f63bc1db8a340b751 upstream.

    If hardware offload commit path fails, release all flow_rule objects.

    Fixes: c9626a2cbdb2 ("netfilter: nf_tables: add hardware offload support")
    Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    net/netfilter/nf_tables_offload.c | 26 +++++++++++++++++++++-----
    1 file changed, 21 insertions(+), 5 deletions(-)

    --- a/net/netfilter/nf_tables_offload.c
    +++ b/net/netfilter/nf_tables_offload.c
    @@ -358,14 +358,14 @@ int nft_flow_rule_offload_commit(struct
    continue;

    if (trans->ctx.flags & NLM_F_REPLACE ||
    - !(trans->ctx.flags & NLM_F_APPEND))
    - return -EOPNOTSUPP;
    -
    + !(trans->ctx.flags & NLM_F_APPEND)) {
    + err = -EOPNOTSUPP;
    + break;
    + }
    err = nft_flow_offload_rule(trans->ctx.chain,
    nft_trans_rule(trans),
    nft_trans_flow_rule(trans),
    FLOW_CLS_REPLACE);
    - nft_flow_rule_destroy(nft_trans_flow_rule(trans));
    break;
    case NFT_MSG_DELRULE:
    if (!(trans->ctx.chain->flags & NFT_CHAIN_HW_OFFLOAD))
    @@ -379,7 +379,23 @@ int nft_flow_rule_offload_commit(struct
    }

    if (err)
    - return err;
    + break;
    + }
    +
    + list_for_each_entry(trans, &net->nft.commit_list, list) {
    + if (trans->ctx.family != NFPROTO_NETDEV)
    + continue;
    +
    + switch (trans->msg_type) {
    + case NFT_MSG_NEWRULE:
    + if (!(trans->ctx.chain->flags & NFT_CHAIN_HW_OFFLOAD))
    + continue;
    +
    + nft_flow_rule_destroy(nft_trans_flow_rule(trans));
    + break;
    + default:
    + break;
    + }
    }

    return err;

    \
     
     \ /
      Last update: 2020-01-17 00:47    [W:2.091 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site