|
 |
ebb439 |
From 3211033ae3ed6a055d4bc296ee8ff847f571640c Mon Sep 17 00:00:00 2001
|
|
|
ebb439 |
From: Ilya Maximets <i.maximets@ovn.org>
|
|
|
ebb439 |
Date: Fri, 20 Nov 2020 01:17:20 +0100
|
|
|
ebb439 |
Subject: [PATCH 12/16] actions: Fix leak of dynamic string on fwd group
|
|
|
ebb439 |
encoding failure.
|
|
|
ebb439 |
|
|
|
ebb439 |
CC: Manoj Sharma <manoj.sharma@nutanix.com>
|
|
|
ebb439 |
Fixes: edb240081518 ("Forwarding group to load balance l2 traffic with liveness detection")
|
|
|
ebb439 |
Acked-by: Dumitru Ceara <dceara@redhat.com>
|
|
|
ebb439 |
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
|
|
|
ebb439 |
Signed-off-by: Numan Siddique <numans@ovn.org>
|
|
|
ebb439 |
|
|
|
ebb439 |
(cherry-picked from master commit 61d209bbf2abacb71cdb63555fe1fe6b0020daf3)
|
|
|
ebb439 |
---
|
|
|
ebb439 |
lib/actions.c | 2 ++
|
|
|
ebb439 |
1 file changed, 2 insertions(+)
|
|
|
ebb439 |
|
|
|
ebb439 |
diff --git a/lib/actions.c b/lib/actions.c
|
|
|
ebb439 |
index 156ebb2fe..3219ab3be 100644
|
|
|
ebb439 |
--- a/lib/actions.c
|
|
|
ebb439 |
+++ b/lib/actions.c
|
|
|
ebb439 |
@@ -3448,6 +3448,7 @@ encode_FWD_GROUP(const struct ovnact_fwd_group *fwd_group,
|
|
|
ebb439 |
|
|
|
ebb439 |
/* Find the tunnel key of the logical port */
|
|
|
ebb439 |
if (!ep->lookup_port(ep->aux, port_name, &port_tunnel_key)) {
|
|
|
ebb439 |
+ ds_destroy(&ds);
|
|
|
ebb439 |
return;
|
|
|
ebb439 |
}
|
|
|
ebb439 |
ds_put_format(&ds, ",bucket=");
|
|
|
ebb439 |
@@ -3455,6 +3456,7 @@ encode_FWD_GROUP(const struct ovnact_fwd_group *fwd_group,
|
|
|
ebb439 |
if (fwd_group->liveness) {
|
|
|
ebb439 |
/* Find the openflow port number of the tunnel port */
|
|
|
ebb439 |
if (!ep->tunnel_ofport(ep->aux, port_name, &ofport)) {
|
|
|
ebb439 |
+ ds_destroy(&ds);
|
|
|
ebb439 |
return;
|
|
|
ebb439 |
}
|
|
|
ebb439 |
|
|
|
ebb439 |
--
|
|
|
ebb439 |
2.28.0
|
|
|
ebb439 |
|