SLFO-pool/keepalived
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main keepalived revision 7472fd12686fea55d7c3faa8452fac76

Browse Source
This commit is contained in:
Adrian Schröter 2024-08-23 16:35:49 +02:00
parent 2448a585d9
commit ff333dbc6e
3 changed files with 109 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
bsc-1228123.patch Normal file
View File

@ -0,0 +1,100 @@
--- keepalived-2.2.8/keepalived/core/global_parser.c.orig 2024-08-13 17:40:38.518069630 +0200
+++ keepalived-2.2.8/keepalived/core/global_parser.c 2024-08-13 17:49:03.202203154 +0200
@@ -1091,12 +1091,26 @@ vrrp_ipsets_handler(const vector_t *strv
{
size_t len;
char set_name[IPSET_MAXNAMELEN];
+ unsigned sn0, sn1;
+ const char **set_names[] = {
+ &global_data->vrrp_ipset_address,
+ &global_data->vrrp_ipset_address6,
+ &global_data->vrrp_ipset_address_iface6,
+ &global_data->vrrp_ipset_igmp,
+ &global_data->vrrp_ipset_mld,
+#ifdef _HAVE_VRRP_VMAC_
+ &global_data->vrrp_ipset_vmac_nd
+#endif
FREE_CONST_PTR(global_data->vrrp_ipset_address);
FREE_CONST_PTR(global_data->vrrp_ipset_address6);
FREE_CONST_PTR(global_data->vrrp_ipset_address_iface6);
FREE_CONST_PTR(global_data->vrrp_ipset_igmp);
FREE_CONST_PTR(global_data->vrrp_ipset_mld);
+#ifdef _HAVE_VRRP_VMAC_
+ FREE_CONST_PTR(global_data->vrrp_ipset_vmac_nd);
+#endif
+ global_data->using_ipsets = PARAMETER_UNSET;
if (vector_size(strvec) < 2) {
global_data->using_ipsets = false;
@@ -1105,14 +1119,14 @@ vrrp_ipsets_handler(const vector_t *strv
if (strlen(strvec_slot(strvec,1)) >= IPSET_MAXNAMELEN - 1) {
report_config_error(CONFIG_GENERAL_ERROR, "VRRP Error : ipset address name too long - ignored");
- return;
+ goto ipset_error;
}
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");
- return;
+ goto ipset_error;
}
global_data->vrrp_ipset_address6 = STRDUP(strvec_slot(strvec,2));
}
@@ -1126,7 +1140,7 @@ vrrp_ipsets_handler(const vector_t *strv
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");
- return;
+ goto ipset_error;
}
global_data->vrrp_ipset_address_iface6 = STRDUP(strvec_slot(strvec,3));
}
@@ -1144,7 +1158,7 @@ vrrp_ipsets_handler(const vector_t *strv
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");
- return;
+ goto ipset_error;
}
global_data->vrrp_ipset_igmp = STRDUP(strvec_slot(strvec,4));
}
@@ -1158,7 +1172,7 @@ vrrp_ipsets_handler(const vector_t *strv
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");
- return;
+ goto ipset_error;
}
global_data->vrrp_ipset_mld = STRDUP(strvec_slot(strvec,5));
}
@@ -1169,6 +1183,26 @@ vrrp_ipsets_handler(const vector_t *strv
strcat(set_name, "_mld");
global_data->vrrp_ipset_mld = STRDUP(set_name);
}
+ /* Ensure all the set names are different */
+ for (sn0 = 0; sn0 < sizeof(set_names) / sizeof(set_names[0]) - 1; sn0++) {
+ for (sn1 = sn0 + 1; sn1 < sizeof(set_names) / sizeof(set_names[0]); sn1++) {
+ if (!strcmp(*set_names[sn0], *set_names[sn1])) {
+ report_config_error(CONFIG_GENERAL_ERROR, "vrrp_ipsets: set name %s used more than once", *set_names[sn0]);
+ goto ipset_error;
+ }
+ }
+ }
+ global_data->using_ipsets = true;
+ return;
+ipset_error:
+ FREE_CONST_PTR(global_data->vrrp_ipset_address);
+ FREE_CONST_PTR(global_data->vrrp_ipset_address6);
+ FREE_CONST_PTR(global_data->vrrp_ipset_address_iface6);
+ FREE_CONST_PTR(global_data->vrrp_ipset_igmp);
+ FREE_CONST_PTR(global_data->vrrp_ipset_mld);
+#ifdef _HAVE_VRRP_VMAC_
+ FREE_CONST_PTR(global_data->vrrp_ipset_vmac_nd);
+#endif
}
#endif
#elif defined _WITH_NFTABLES_

7
keepalived.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Aug 13 15:17:02 UTC 2024 - Peter Varkoly <varkoly@suse.com>
- VUL-0: CVE-2024-41184: keepalived: integer overflow in vrrp_ipsets_handler
(bsc#1228123) Apply upstream patches:
bsc-1228123.patch
-------------------------------------------------------------------
Wed May 31 21:32:46 UTC 2023 - Marcus Rueckert <mrueckert@suse.de>

2
keepalived.spec
View File

@ -48,6 +48,7 @@ Source: https://www.keepalived.org/software/%{name}-%{version}.tar.gz
Source2: keepalive-rpmlintrc
Patch0: keepalive-init.patch
Patch1: harden_keepalived.service.patch
Patch2: bsc-1228123.patch
BuildRequires: file-devel
BuildRequires: net-snmp-devel
BuildRequires: pkgconfig
@ -98,6 +99,7 @@ resilient infrastructures.
%patch0 -p1
chmod 644 doc/samples/*
%patch1 -p1
%patch2 -p1
%build
export STRIP=true