From 0305ce1f71fa6e9ecfee79f4ec41876f0c0104e2 Mon Sep 17 00:00:00 2001 From: Ethan Jackson Date: Wed, 29 May 2013 16:19:20 -0700 Subject: [PATCH] ofproto-dpif: Fix facet_lookup_valid(). facet_lookup_valid() attempted to re-revalidate its facet after it had been removed. Added very recently in commit 5bf64ad (ofproto-dpif: Avoid redundant facet_find() in facet_lookup_valid()). Found by inspection (by Justin). Reported-by: Justin Pettit Signed-off-by: Ethan Jackson --- ofproto/ofproto-dpif.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index 633dc5ab3..2fc00a7bc 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c @@ -4882,10 +4882,7 @@ facet_lookup_valid(struct ofproto_dpif *ofproto, const struct flow *flow, || tag_set_intersects(&ofproto->backer->revalidate_set, facet->xout.tags)) && !facet_revalidate(facet)) { - facet_revalidate(facet); - - /* facet_revalidate() may have destroyed 'facet'. */ - facet = facet_find(ofproto, flow, hash); + return NULL; } return facet; -- 2.43.0