| Message ID | 1462272863-23946-1-git-send-email-pablo@netfilter.org |
|---|---|
| State | Not Applicable |
| Headers | show |
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com> > On May 3, 2016, at 3:54 AM, Pablo Neira Ayuso <pablo@netfilter.org> wrote: > > 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> > --- > net/openvswitch/conntrack.c | 8 -------- > 1 file changed, 8 deletions(-) > > diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c > index 9741a76..9f0bc49 100644 > --- a/net/openvswitch/conntrack.c > +++ b/net/openvswitch/conntrack.c > @@ -439,20 +439,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"); > -- > 2.1.4 > > -- > To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
On 3 May 2016 at 03:54, Pablo Neira Ayuso <pablo@netfilter.org> wrote: > 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> Thanks for the cleanup. Acked-by: Joe Stringer <joe@ovn.org>
diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c index 9741a76..9f0bc49 100644 --- a/net/openvswitch/conntrack.c +++ b/net/openvswitch/conntrack.c @@ -439,20 +439,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");
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> --- net/openvswitch/conntrack.c | 8 -------- 1 file changed, 8 deletions(-)