|
 |
60de42 |
From eee00ca63ec56182cb784ffd37d90d467140cde1 Mon Sep 17 00:00:00 2001
|
|
|
60de42 |
From: rpm-build <rpm-build>
|
|
|
60de42 |
Date: Tue, 23 May 2017 10:27:45 -0500
|
|
|
60de42 |
Subject: [PATCH] Fix: PE: Prevent use-after-free when creating bundle
|
|
|
60de42 |
constraints
|
|
|
60de42 |
|
|
|
60de42 |
Equivalent of upstream ff426526 by Andrew Beekhof for 7.4 context
|
|
|
60de42 |
---
|
|
|
60de42 |
pengine/container.c | 5 +----
|
|
|
60de42 |
1 file changed, 1 insertion(+), 4 deletions(-)
|
|
|
60de42 |
|
|
|
60de42 |
diff --git a/pengine/container.c b/pengine/container.c
|
|
|
60de42 |
index 5bde89d..7ec390e 100644
|
|
|
60de42 |
--- a/pengine/container.c
|
|
|
60de42 |
+++ b/pengine/container.c
|
|
|
60de42 |
@@ -155,7 +155,6 @@ container_internal_constraints(resource_t * rsc, pe_working_set_t * data_set)
|
|
|
60de42 |
|
|
|
60de42 |
get_container_variant_data(container_data, rsc);
|
|
|
60de42 |
for (GListPtr gIter = container_data->tuples; gIter != NULL; gIter = gIter->next) {
|
|
|
60de42 |
- char *id = NULL;
|
|
|
60de42 |
container_grouping_t *tuple = (container_grouping_t *)gIter->data;
|
|
|
60de42 |
|
|
|
60de42 |
CRM_ASSERT(tuple);
|
|
|
60de42 |
@@ -172,9 +171,7 @@ container_internal_constraints(resource_t * rsc, pe_working_set_t * data_set)
|
|
|
60de42 |
new_rsc_order(tuple->docker, RSC_STOP, tuple->ip, RSC_STOP,
|
|
|
60de42 |
pe_order_implies_first|pe_order_preserve, data_set);
|
|
|
60de42 |
|
|
|
60de42 |
- id = crm_strdup_printf("%s-ip-with-docker-%d", rsc->id, tuple->offset);
|
|
|
60de42 |
- rsc_colocation_new(id, NULL, INFINITY, tuple->ip, tuple->docker, NULL, NULL, data_set);
|
|
|
60de42 |
- free(id);
|
|
|
60de42 |
+ rsc_colocation_new("ip-with-docker", NULL, INFINITY, tuple->ip, tuple->docker, NULL, NULL, data_set);
|
|
|
60de42 |
}
|
|
|
60de42 |
|
|
|
60de42 |
if(tuple->remote) {
|
|
|
60de42 |
--
|
|
|
60de42 |
1.8.3.1
|
|
|
60de42 |
|