netfilter: nft_ct: Remove confirmation check for NFT_CT_ID
authorBrett Mastbergen <brett.mastbergen@gmail.com>
Tue, 8 Dec 2020 21:39:24 +0000 (16:39 -0500)
committerPablo Neira Ayuso <pablo@netfilter.org>
Wed, 9 Dec 2020 09:31:58 +0000 (10:31 +0100)
Since commit 656c8e9cc1ba ("netfilter: conntrack: Use consistent ct id
hash calculation") the ct id will not change from initialization to
confirmation.  Removing the confirmation check allows for things like
adding an element to a 'typeof ct id' set in prerouting upon reception
of the first packet of a new connection, and then being able to
reference that set consistently both before and after the connection
is confirmed.

Fixes: 656c8e9cc1ba ("netfilter: conntrack: Use consistent ct id hash calculation")
Signed-off-by: Brett Mastbergen <brett.mastbergen@gmail.com>
Acked-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/netfilter/nft_ct.c

index 322bd674963ee009fcc01f56e6f3b50e248031f6..a1b0aac46e9e03e514fc378a44a3c4c918cfa494 100644 (file)
@@ -177,8 +177,6 @@ static void nft_ct_get_eval(const struct nft_expr *expr,
        }
 #endif
        case NFT_CT_ID:
-               if (!nf_ct_is_confirmed(ct))
-                       goto err;
                *dest = nf_ct_get_id(ct);
                return;
        default: