84 lines
2.9 KiB
Diff
84 lines
2.9 KiB
Diff
|
diff -ur keepalived-2.1.5/keepalived/core/global_parser.c keepalived-2.1.5.patched/keepalived/core/global_parser.c
|
||
|
|
--- keepalived-2.1.5/keepalived/core/global_parser.c 2020-07-10 17:41:46.000000000 +0100
|
||
|
|
+++ keepalived-2.1.5.patched/keepalived/core/global_parser.c 2024-12-02 14:06:44.469215491 +0000
|
||
|
|
@@ -955,6 +955,22 @@
|
||
|
|
}
|
||
|
|
}
|
||
|
|
#ifdef _HAVE_LIBIPSET_
|
||
|
|
+static bool
|
||
|
|
+check_valid_ipset_name(const vector_t *strvec, unsigned entry, const char *log_name)
|
||
|
|
+{
|
||
|
|
+ if (strlen(strvec_slot(strvec, entry)) >= IPSET_MAXNAMELEN - 1) {
|
||
|
|
+ report_config_error(CONFIG_GENERAL_ERROR, "VRRP Error : ipset %s name too long - ignored", log_name);
|
||
|
|
+ return false;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ if (strlen(strvec_slot(strvec, entry)) == 0) {
|
||
|
|
+ report_config_error(CONFIG_GENERAL_ERROR, "VRRP Error : ipset %s name empty - ignored", log_name);
|
||
|
|
+ return false;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ return true;
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
static void
|
||
|
|
vrrp_ipsets_handler(const vector_t *strvec)
|
||
|
|
{
|
||
|
|
@@ -974,17 +990,13 @@
|
||
|
|
return;
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (strlen(strvec_slot(strvec,1)) >= IPSET_MAXNAMELEN - 1) {
|
||
|
|
- report_config_error(CONFIG_GENERAL_ERROR, "VRRP Error : ipset address name too long - ignored");
|
||
|
|
+ if (!check_valid_ipset_name(strvec, 1, "address"))
|
||
|
|
return;
|
||
|
|
- }
|
||
|
|
global_data->vrrp_ipset_address = STRDUP(strvec_slot(strvec,1));
|
||
|
|
|
||
|
|
if (vector_size(strvec) >= 3) {
|
||
|
|
- if (strlen(strvec_slot(strvec,2)) >= IPSET_MAXNAMELEN - 1) {
|
||
|
|
- report_config_error(CONFIG_GENERAL_ERROR, "VRRP Error : ipset IPv6 address name too long - ignored");
|
||
|
|
+ if (!check_valid_ipset_name(strvec, 2, "IPv6 address"))
|
||
|
|
return;
|
||
|
|
- }
|
||
|
|
global_data->vrrp_ipset_address6 = STRDUP(strvec_slot(strvec,2));
|
||
|
|
}
|
||
|
|
else {
|
||
|
|
@@ -995,10 +1007,8 @@
|
||
|
|
global_data->vrrp_ipset_address6 = STRDUP(set_name);
|
||
|
|
}
|
||
|
|
if (vector_size(strvec) >= 4) {
|
||
|
|
- if (strlen(strvec_slot(strvec,3)) >= IPSET_MAXNAMELEN - 1) {
|
||
|
|
- report_config_error(CONFIG_GENERAL_ERROR, "VRRP Error : ipset IPv6 address_iface name too long - ignored");
|
||
|
|
+ if (!check_valid_ipset_name(strvec, 3, "IPv6 address_iface"))
|
||
|
|
return;
|
||
|
|
- }
|
||
|
|
global_data->vrrp_ipset_address_iface6 = STRDUP(strvec_slot(strvec,3));
|
||
|
|
}
|
||
|
|
else {
|
||
|
|
@@ -1014,10 +1024,8 @@
|
||
|
|
|
||
|
|
#ifdef HAVE_IPSET_ATTR_IFACE
|
||
|
|
if (vector_size(strvec) >= 5) {
|
||
|
|
- if (strlen(strvec_slot(strvec,4)) >= IPSET_MAXNAMELEN - 1) {
|
||
|
|
- report_config_error(CONFIG_GENERAL_ERROR, "VRRP Error : ipset IGMP name too long - ignored");
|
||
|
|
+ if (!check_valid_ipset_name(strvec, 4, "IGMP"))
|
||
|
|
return;
|
||
|
|
- }
|
||
|
|
global_data->vrrp_ipset_igmp = STRDUP(strvec_slot(strvec,4));
|
||
|
|
}
|
||
|
|
else {
|
||
|
|
@@ -1028,10 +1036,8 @@
|
||
|
|
global_data->vrrp_ipset_igmp = STRDUP(set_name);
|
||
|
|
}
|
||
|
|
if (vector_size(strvec) >= 6) {
|
||
|
|
- if (strlen(strvec_slot(strvec,5)) >= IPSET_MAXNAMELEN - 1) {
|
||
|
|
- report_config_error(CONFIG_GENERAL_ERROR, "VRRP Error : ipset MLD name too long - ignored");
|
||
|
|
+ if (!check_valid_ipset_name(strvec, 5, "MLD"))
|
||
|
|
return;
|
||
|
|
- }
|
||
|
|
global_data->vrrp_ipset_mld = STRDUP(strvec_slot(strvec,5));
|
||
|
|
}
|
||
|
|
else {
|
||
|
|
Only in keepalived-2.1.5.patched/keepalived/core: global_parser.c.orig
|