netfilter: nft_extdhr: Drop pointless check of tprot_set
authorPhil Sutter <phil@nwl.cc>
Fri, 11 Jun 2021 17:08:26 +0000 (19:08 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Wed, 16 Jun 2021 20:25:01 +0000 (22:25 +0200)
Pablo says, tprot_set is only there to detect if tprot was set to
IPPROTO_IP as that evaluates to zero. Therefore, code asserting a
different value in tprot does not need to check tprot_set.

Fixes: 935b7f6430188 ("netfilter: nft_exthdr: add TCP option matching")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/netfilter/nft_exthdr.c

index 9cf86be2cff4bce50af96192fd06267b12893f3f..4f583d2e220e435ba563fbc99e0d78492809ff04 100644 (file)
@@ -164,7 +164,7 @@ nft_tcp_header_pointer(const struct nft_pktinfo *pkt,
 {
        struct tcphdr *tcph;
 
-       if (!pkt->tprot_set || pkt->tprot != IPPROTO_TCP)
+       if (pkt->tprot != IPPROTO_TCP)
                return NULL;
 
        tcph = skb_header_pointer(pkt->skb, nft_thoff(pkt), sizeof(*tcph), buffer);