lkml.org 
[lkml]   [2022]   [Jun]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.17 165/298] netfilter: nf_tables: release new hooks on unsupported flowtable flags
    Date
    From: Pablo Neira Ayuso <pablo@netfilter.org>

    [ Upstream commit c271cc9febaaa1bcbc0842d1ee30466aa6148ea8 ]

    Release the list of new hooks that are pending to be registered in case
    that unsupported flowtable flags are provided.

    Fixes: 78d9f48f7f44 ("netfilter: nf_tables: add devices to existing flowtable")
    Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/netfilter/nf_tables_api.c | 12 ++++++++----
    1 file changed, 8 insertions(+), 4 deletions(-)

    diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
    index ee7adb42a97d..2abad256f0aa 100644
    --- a/net/netfilter/nf_tables_api.c
    +++ b/net/netfilter/nf_tables_api.c
    @@ -7348,11 +7348,15 @@ static int nft_flowtable_update(struct nft_ctx *ctx, const struct nlmsghdr *nlh,

    if (nla[NFTA_FLOWTABLE_FLAGS]) {
    flags = ntohl(nla_get_be32(nla[NFTA_FLOWTABLE_FLAGS]));
    - if (flags & ~NFT_FLOWTABLE_MASK)
    - return -EOPNOTSUPP;
    + if (flags & ~NFT_FLOWTABLE_MASK) {
    + err = -EOPNOTSUPP;
    + goto err_flowtable_update_hook;
    + }
    if ((flowtable->data.flags & NFT_FLOWTABLE_HW_OFFLOAD) ^
    - (flags & NFT_FLOWTABLE_HW_OFFLOAD))
    - return -EOPNOTSUPP;
    + (flags & NFT_FLOWTABLE_HW_OFFLOAD)) {
    + err = -EOPNOTSUPP;
    + goto err_flowtable_update_hook;
    + }
    } else {
    flags = flowtable->data.flags;
    }
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-13 16:36    [W:4.029 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site