Просмотр исходного кода

netfilter: conntrack: __nf_ct_l4proto_find() always returns valid pointer

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>
Pablo Neira Ayuso 9 лет назад
Родитель
Сommit
4b4ceb9dbf
1 измененных файлов с 1 добавлено и 1 удалено
  1. 1 1
      net/netfilter/nf_conntrack_core.c

+ 1 - 1
net/netfilter/nf_conntrack_core.c

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