30 lines
1006 B
Diff
30 lines
1006 B
Diff
|
From 8cdf840f1af1c6da0459cb3a056c122762cd7fd6 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ben Pfaff <blp@ovn.org>
|
||
|
|
Date: Mon, 14 Oct 2019 15:34:21 -0700
|
||
|
|
Subject: ofproto-dpif-xlate: Restore table ID on error in xlate_table_action().
|
||
|
|
|
||
|
|
Found by inspection.
|
||
|
|
|
||
|
|
Acked-by: Yi-Hung Wei <yihung.wei@gmail.com>
|
||
|
|
Signed-off-by: Ben Pfaff <blp@ovn.org>
|
||
|
|
---
|
||
|
|
ofproto/ofproto-dpif-xlate.c | 1 +
|
||
|
|
1 file changed, 1 insertion(+)
|
||
|
|
|
||
|
|
diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c
|
||
|
|
index 0dc43d17a..09096ed6f 100644
|
||
|
|
--- a/ofproto/ofproto-dpif-xlate.c
|
||
|
|
+++ b/ofproto/ofproto-dpif-xlate.c
|
||
|
|
@@ -4331,6 +4331,7 @@ xlate_table_action(struct xlate_ctx *ctx, ofp_port_t in_port, uint8_t table_id,
|
||
|
|
!is_ip_any(&ctx->xin->flow)) {
|
||
|
|
xlate_report_error(ctx,
|
||
|
|
"resubmit(ct) with non-tracked or non-IP packet!");
|
||
|
|
+ ctx->table_id = old_table_id;
|
||
|
|
return;
|
||
|
|
}
|
||
|
|
tuple_swap(&ctx->xin->flow, ctx->wc);
|
||
|
|
--
|
||
|
|
2.14.1
|
||
|
|
|
||
|
|
|