diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-06-20 18:51:09 -0700 |
|---|---|---|
| committer | Jarno Rajahalme <jarno@ovn.org> | 2016-06-20 18:51:09 -0700 |
| commit | 957e0057cf65fbe0dc741e054580a2960615ffa6 (patch) | |
| tree | 3832aed69e144bac9e42ee7e9abf9096827bc17e /datapath | |
| parent | 7f2ab8cd23cb6b64f931ece00b4cc1cda4cacb72 (diff) | |
| download | openvswitch-957e0057cf65fbe0dc741e054580a2960615ffa6.tar.gz | |
datapath: __nf_ct_l{3,4}proto_find() always return a valid pointer
Upstream commit:
commit 3b78155b1b3688dbe910fecdc3e003f431b46630
Author: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Tue May 3 11:13:29 2016 +0200
openvswitch: __nf_ct_l{3,4}proto_find() always return a valid pointer
If the protocol is not natively supported, this assigns generic protocol
tracker so we can always assume a valid pointer after these calls.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Joe Stringer <joe@ovn.org>
Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Jesse Gross <jesse@kernel.org>
Diffstat (limited to 'datapath')
| -rw-r--r-- | datapath/conntrack.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/datapath/conntrack.c b/datapath/conntrack.c index f30a3b736..490be321f 100644 --- a/datapath/conntrack.c +++ b/datapath/conntrack.c @@ -488,20 +488,12 @@ ovs_ct_find_existing(struct net *net, const struct nf_conntrack_zone *zone, u8 protonum; l3proto = __nf_ct_l3proto_find(l3num); - if (!l3proto) { - pr_debug("ovs_ct_find_existing: Can't get l3proto\n"); - return NULL; - } if (l3proto->get_l4proto(skb, skb_network_offset(skb), &dataoff, &protonum) <= 0) { pr_debug("ovs_ct_find_existing: Can't get protonum\n"); return NULL; } l4proto = __nf_ct_l4proto_find(l3num, protonum); - if (!l4proto) { - pr_debug("ovs_ct_find_existing: Can't get l4proto\n"); - return NULL; - } if (!nf_ct_get_tuple(skb, skb_network_offset(skb), dataoff, l3num, protonum, net, &tuple, l3proto, l4proto)) { pr_debug("ovs_ct_find_existing: Can't get tuple\n"); |