|
 |
6a7e4c |
From e91583fb20b584621dd48031bef68279945f7aa6 Mon Sep 17 00:00:00 2001
|
|
|
6a7e4c |
From: Quentin Armitage <quentin@armitage.org.uk>
|
|
|
6a7e4c |
Date: Tue, 20 Nov 2018 13:03:55 +0000
|
|
|
6a7e4c |
Subject: [PATCH] Fix double free when global data smtp_helo_name copied from
|
|
|
6a7e4c |
local_name
|
|
|
6a7e4c |
|
|
|
6a7e4c |
Issue #1071 identified a double free fault. It occurred when smtp_helo_name
|
|
|
6a7e4c |
was not set, in which case it was set to point to the same malloc'd memory
|
|
|
6a7e4c |
as local_name. At termination keepalived freed both local_name and
|
|
|
6a7e4c |
smtp_helo_name.
|
|
|
6a7e4c |
|
|
|
6a7e4c |
If keepalived needs to use local_name for smtp_helo_name it now malloc's
|
|
|
6a7e4c |
aadditional memory to copy the string into.
|
|
|
6a7e4c |
|
|
|
6a7e4c |
Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
|
|
|
6a7e4c |
---
|
|
|
6a7e4c |
keepalived/core/global_data.c | 6 ++++--
|
|
|
6a7e4c |
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
6a7e4c |
|
|
|
6a7e4c |
diff --git a/keepalived/core/global_data.c b/keepalived/core/global_data.c
|
|
|
6a7e4c |
index cd381d9b..be9fecbd 100644
|
|
|
6a7e4c |
--- a/keepalived/core/global_data.c
|
|
|
6a7e4c |
+++ b/keepalived/core/global_data.c
|
|
|
6a7e4c |
@@ -257,8 +257,10 @@ init_global_data(data_t * data, data_t *old_global_data)
|
|
|
6a7e4c |
if (!data->email_from)
|
|
|
6a7e4c |
set_default_email_from(data, data->local_name);
|
|
|
6a7e4c |
|
|
|
6a7e4c |
- if (!data->smtp_helo_name)
|
|
|
6a7e4c |
- data->smtp_helo_name = data->local_name;
|
|
|
6a7e4c |
+ if (!data->smtp_helo_name) {
|
|
|
6a7e4c |
+ data->smtp_helo_name = MALLOC(strlen(data->local_name) + 1);
|
|
|
6a7e4c |
+ strcpy(data->smtp_helo_name, data->local_name);
|
|
|
6a7e4c |
+ }
|
|
|
6a7e4c |
}
|
|
|
6a7e4c |
}
|
|
|
6a7e4c |
|
|
|
6a7e4c |
--
|
|
|
6a7e4c |
2.20.1
|
|
|
6a7e4c |
|