]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
netfilter: cttimeout: remove 'l3num' attr check
authorLin Ma <linma@zju.edu.cn>
Fri, 31 May 2024 01:28:47 +0000 (09:28 +0800)
committerPablo Neira Ayuso <pablo@netfilter.org>
Tue, 25 Jun 2024 22:54:53 +0000 (00:54 +0200)
After commit dd2934a95701 ("netfilter: conntrack: remove l3->l4 mapping
information"), the attribute of type `CTA_TIMEOUT_L3PROTO` is not used
any more in function cttimeout_default_set.

However, the previous commit ea9cf2a55a7b ("netfilter: cttimeout: remove
set but not used variable 'l3num'") forgot to remove the attribute
present check when removing the related variable.

This commit removes that check to ensure consistency.

Signed-off-by: Lin Ma <linma@zju.edu.cn>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/netfilter/nfnetlink_cttimeout.c

index f466af4f85317adc6dc7578ce266f78238d8c6bc..eab4f476b47fca74ae7ae7fe5b77af02a95ef487 100644 (file)
@@ -366,8 +366,7 @@ static int cttimeout_default_set(struct sk_buff *skb,
        __u8 l4num;
        int ret;
 
-       if (!cda[CTA_TIMEOUT_L3PROTO] ||
-           !cda[CTA_TIMEOUT_L4PROTO] ||
+       if (!cda[CTA_TIMEOUT_L4PROTO] ||
            !cda[CTA_TIMEOUT_DATA])
                return -EINVAL;