packages/keepalived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add upstream patch

Browse Source
This commit is contained in:
wangxp006 2021-06-10 09:43:12 +08:00
parent 2bb87dc150
commit 5798c18150
2 changed files with 109 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
0010-vrrp-Don-t-segfault-when-a-VRID-is-changed-on-a-VMAC.patch Normal file
View File

@ -0,0 +1,81 @@
From d00153b11938f973816d39fabfd7edb6c69e46e8 Mon Sep 17 00:00:00 2001
From: Quentin Armitage <quentin@armitage.org.uk>
Date: Tue, 17 Nov 2020 16:14:18 +0000
Subject: [PATCH 447/691] vrrp: Don't segfault when a VRID is changed on a VMAC
when reloading
With many thanks to Louis Scalbert (@louis-oui) for identifying the
issue and providing a patch that formed the basis of this patch.
Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
---
keepalived/vrrp/vrrp_daemon.c | 16 ++++++++--------
keepalived/vrrp/vrrp_if.c | 18 ++++++++++--------
2 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/keepalived/vrrp/vrrp_daemon.c b/keepalived/vrrp/vrrp_daemon.c
index ea950c9..aa3052d 100644
--- a/keepalived/vrrp/vrrp_daemon.c
+++ b/keepalived/vrrp/vrrp_daemon.c
@@ -551,6 +551,14 @@ start_vrrp(data_t *prev_global_data)
}
}
+ /* Init & start the VRRP packet dispatcher */
+ if (!reload && global_data->vrrp_startup_delay) {
+ log_message(LOG_INFO, "Delaying startup for %g seconds", global_data->vrrp_startup_delay / TIMER_HZ_DOUBLE);
+ thread_add_timer(master, vrrp_dispatcher_init, NULL,
+ global_data->vrrp_startup_delay);
+ } else
+ thread_add_event(master, vrrp_dispatcher_init, NULL, 0);
+
/* Complete VRRP initialization */
if (!vrrp_complete_init()) {
stop_vrrp(KEEPALIVED_EXIT_CONFIG);
@@ -610,14 +618,6 @@ start_vrrp(data_t *prev_global_data)
if (__test_bit(DUMP_CONF_BIT, &debug))
dump_data_vrrp(NULL);
- /* Init & start the VRRP packet dispatcher */
- if (!reload && global_data->vrrp_startup_delay) {
- log_message(LOG_INFO, "Delaying startup for %g seconds", global_data->vrrp_startup_delay / TIMER_HZ_DOUBLE);
- thread_add_timer(master, vrrp_dispatcher_init, NULL,
- global_data->vrrp_startup_delay);
- } else
- thread_add_event(master, vrrp_dispatcher_init, NULL, 0);
-
/* Set the process priority and non swappable if configured */
set_process_priorities(global_data->vrrp_realtime_priority,
#if HAVE_DECL_RLIMIT_RTTIME == 1
diff --git a/keepalived/vrrp/vrrp_if.c b/keepalived/vrrp/vrrp_if.c
index 6847df9..d40f9f1 100644
--- a/keepalived/vrrp/vrrp_if.c
+++ b/keepalived/vrrp/vrrp_if.c
@@ -1311,14 +1311,16 @@ cleanup_lost_interface(interface_t *ifp)
#endif
/* Find the sockpool entry. If none, then we have closed the socket */
- if (vrrp->sockets->fd_in != -1) {
- thread_cancel_read(master, vrrp->sockets->fd_in);
- close(vrrp->sockets->fd_in);
- vrrp->sockets->fd_in = -1;
- }
- if (vrrp->sockets->fd_out != -1) {
- close(vrrp->sockets->fd_out);
- vrrp->sockets->fd_out = -1;
+ if (vrrp->sockets) {
+ if (vrrp->sockets->fd_in != -1) {
+ thread_cancel_read(master, vrrp->sockets->fd_in);
+ close(vrrp->sockets->fd_in);
+ vrrp->sockets->fd_in = -1;
+ }
+ if (vrrp->sockets->fd_out != -1) {
+ close(vrrp->sockets->fd_out);
+ vrrp->sockets->fd_out = -1;
+ }
}
if (IF_ISUP(ifp))
--
1.8.3.1

28
0011-vrrp-clear-old_vrrp_data-and-old_global_data-when-me.patch Normal file
View File

@ -0,0 +1,28 @@
From 988fd158b25a5ea08b2bef3bac6d0a2cd7bb53ec Mon Sep 17 00:00:00 2001
From: Quentin Armitage <quentin@armitage.org.uk>
Date: Tue, 15 Dec 2020 15:33:05 +0000
Subject: [PATCH 483/691] vrrp: clear old_vrrp_data and old_global_data when
memory freed
Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
---
keepalived/vrrp/vrrp_daemon.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/keepalived/vrrp/vrrp_daemon.c b/keepalived/vrrp/vrrp_daemon.c
index aa3052d..8d0fe70 100644
--- a/keepalived/vrrp/vrrp_daemon.c
+++ b/keepalived/vrrp/vrrp_daemon.c
@@ -817,7 +817,9 @@ reload_vrrp_thread(__attribute__((unused)) thread_ref_t thread)
/* free backup data */
free_vrrp_data(old_vrrp_data);
+ old_vrrp_data = NULL;
free_global_data(old_global_data);
+ old_global_data = NULL;
free_old_interface_queue();
--
1.8.3.1