netfilter: conntrack: __nf_ct_l4proto_find() always returns valid pointer
authorPablo Neira Ayuso <pablo@netfilter.org>
Sat, 30 Apr 2016 22:34:37 +0000 (00:34 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Thu, 5 May 2016 14:39:48 +0000 (16:39 +0200)
Remove unnecessary check for non-nul pointer in destroy_conntrack()
given that __nf_ct_l4proto_find() returns the generic protocol tracker
if the protocol is not supported.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/netfilter/nf_conntrack_core.c

index e3787cf334277a132b6d22e5c3bf9aafd75634e6..f72ede19354c82785fda91d2e90fc9ff6620b73b 100644 (file)
@@ -363,7 +363,7 @@ destroy_conntrack(struct nf_conntrack *nfct)
        }
        rcu_read_lock();
        l4proto = __nf_ct_l4proto_find(nf_ct_l3num(ct), nf_ct_protonum(ct));
-       if (l4proto && l4proto->destroy)
+       if (l4proto->destroy)
                l4proto->destroy(ct);
 
        rcu_read_unlock();