Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: corosync

corosync (3.0.3-2ubuntu2) focal; urgency=medium [Jorge Niedbalski] * d/control: corosync binary depends on libqb-dev (LP: #1677684) [Rafael David Tinoco] * debian/corosync-notifyd.init: fix for 2 PIDFILEs declared (LP: #1437359) * Post v3.0.3 release fixes backported to Ubuntu (LP: #1869622) debian/patches/ubuntu-v3.0.3-fixes/: - lp1869622-09f6d34a-logconfig-Remove-double-free-of-value.patch - lp1869622-0c118d8f-totemknet-Check-result-of-fcntl-O_NONBLOCK-call.patch - lp1869622-0c16442f-votequorum-Change-check-of-expected_votes.patch - lp1869622-1fb095b0-notifyd-Check-cmap_track_add-result.patch - lp1869622-29109683-totemknet-Assert-strcpy-length.patch - lp1869622-35c312f8-votequorum-Assert-copied-strings-length.patch - lp1869622-380b744e-totemknet-Don-t-mix-corosync-and-knet-error-codes.patch - lp1869622-56ee8503-quorumtool-Assert-copied-string-length.patch - lp1869622-5f543465-quorumtool-exit-on-invalid-expected-votes.patch - lp1869622-624b6a47-stats-Assert-value_len-when-value-is-needed.patch - lp1869622-74eed54a-sync-Assert-sync_callbacks.name-length.patch - lp1869622-89b0d62f-stats-Check-return-code-of-stats_map_get.patch - lp1869622-8ce65bf9-votequorum-Reflect-runtime-change-of-2Node-to-WFA.patch - lp1869622-8ff7760c-cmapctl-Free-bin_value-on-error.patch - lp1869622-a24cbad5-totemconfig-Initialize-warnings-variable.patch - lp1869622-c631951e-icmap-icmap_init_r-leaks-if-trie_create-fails.patch - lp1869622-ca320bea-votequorum-set-wfa-status-only-on-startup.patch - lp1869622-efe48120-totemconfig-Free-leaks-found-by-coverity.patch -- Rafael David Tinoco <rafaeldtinoco@ubuntu.com> Sun, 29 Mar 2020 21:50:35 +0000 corosync (3.0.3-2ubuntu1) focal; urgency=medium * Merge with Debian unstable (LP: #1864087). Remaining changes: - Skip autopkgtest for unprivileged containers: (LP: 1828228) - d/t/control: allow stderr and mark tests as skippable - d/t/{cfgtool,quorumtool}: skips when inside unpriv containers -- Rafael David Tinoco <rafaeldtinoco@ubuntu.com> Fri, 21 Feb 2020 04:33:11 +0000

Modifications :
  1. Download patch debian/tests/control

    --- 3.0.3-2/debian/tests/control 2020-01-04 12:47:16.000000000 +0000 +++ 3.0.3-2ubuntu2/debian/tests/control 2020-03-04 21:39:26.000000000 +0000 @@ -1,3 +1,3 @@ Depends: @ -Restrictions: needs-root, isolation-container +Restrictions: needs-root, isolation-container, allow-stderr, skippable Tests: cfgtool quorumtool
  2. Download patch debian/corosync-notifyd.init

    --- 3.0.3-2/debian/corosync-notifyd.init 2020-01-04 12:47:16.000000000 +0000 +++ 3.0.3-2ubuntu2/debian/corosync-notifyd.init 2020-03-29 21:50:35.000000000 +0000 @@ -21,7 +21,6 @@ NAME=corosync-notifyd DAEMON=/usr/sbin/$NAME PIDFILE=/var/run/$NAME.pid SCRIPTNAME=/etc/init.d/$NAME -PIDFILE=/var/run/corosync.pid RARUNDIR=/var/run/resource-agents # Exit if the package is not installed
  3. Download patch debian/patches/ubuntu-v3.0.3-fixes/lp1869622-624b6a47-stats-Assert-value_len-when-value-is-needed.patch

    --- 3.0.3-2/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-624b6a47-stats-Assert-value_len-when-value-is-needed.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.0.3-2ubuntu2/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-624b6a47-stats-Assert-value_len-when-value-is-needed.patch 2020-03-29 21:50:35.000000000 +0000 @@ -0,0 +1,26 @@ +From 624b6a4707c688dae00f52833e0a2cd4f53fa38d Mon Sep 17 00:00:00 2001 +From: Jan Friesse <jfriesse@redhat.com> +Date: Tue, 26 Nov 2019 10:10:42 +0100 +Subject: [PATCH] stats: Assert value_len when value is needed + +Signed-off-by: Jan Friesse <jfriesse@redhat.com> + +Origin: upstream, https://github.com/corosync/corosync/commit/624b6a4707 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869622 +Reviewed-by: Rafael David Tinoco <rafaeldtinoco@ubuntu.com> +Last-Update: 2020-03-29 +--- + exec/stats.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/exec/stats.c ++++ b/exec/stats.c +@@ -233,6 +233,8 @@ + } + } + if (value) { ++ assert(value_len != NULL); ++ + memcpy(value, (char *)(stat_array) + conv->offset, *value_len); + } + }
  4. Download patch debian/patches/ubuntu-v3.0.3-fixes/lp1869622-efe48120-totemconfig-Free-leaks-found-by-coverity.patch

    --- 3.0.3-2/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-efe48120-totemconfig-Free-leaks-found-by-coverity.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.0.3-2ubuntu2/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-efe48120-totemconfig-Free-leaks-found-by-coverity.patch 2020-03-29 21:50:35.000000000 +0000 @@ -0,0 +1,107 @@ +From efe48120e2d0db300a22da09c65465091ebfae68 Mon Sep 17 00:00:00 2001 +From: Jan Friesse <jfriesse@redhat.com> +Date: Mon, 25 Nov 2019 18:16:36 +0100 +Subject: [PATCH] totemconfig: Free leaks found by coverity + +Signed-off-by: Jan Friesse <jfriesse@redhat.com> + +Origin: upstream, https://github.com/corosync/corosync/commit/efe48120e2 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869622 +Reviewed-by: Rafael David Tinoco <rafaeldtinoco@ubuntu.com> +Last-Update: 2020-03-29 +--- + exec/totemconfig.c | 26 +++++++++++++++++--------- + 1 file changed, 17 insertions(+), 9 deletions(-) + +--- a/exec/totemconfig.c ++++ b/exec/totemconfig.c +@@ -470,6 +470,8 @@ + "for a multi-link configuration, all nodes must have a 'name' attribute"); + goto parse_error; + } ++ ++ free(name_str); + } + + for (i=0; i < INTERFACE_MAX; i++) { +@@ -1445,6 +1447,7 @@ + char *str; + char *cluster_name = NULL; + enum totem_ip_version_enum tmp_ip_version = TOTEM_IP_VERSION_4; ++ int ret = 0; + + if (reload) { + for (i=0; i<INTERFACE_MAX; i++) { +@@ -1479,14 +1482,13 @@ + linknumber = atoi(linknumber_key); + + if (linknumber >= INTERFACE_MAX) { +- free(cluster_name); +- + snprintf (error_string_response, sizeof(error_string_response), + "parse error in config: interface ring number %u is bigger than allowed maximum %u\n", + linknumber, INTERFACE_MAX - 1); + + *error_string = error_string_response; +- return -1; ++ ret = -1; ++ goto out; + } + + /* These things are only valid for the initial read */ +@@ -1505,7 +1507,8 @@ + *error_string = error_string_response; + free(str); + +- return -1; ++ ret = -1; ++ goto out; + } + + free(str); +@@ -1524,7 +1527,8 @@ + *error_string = error_string_response; + free(str); + +- return -1; ++ ret = -1; ++ goto out; + } + + free(str); +@@ -1594,7 +1598,8 @@ + } + else { + *error_string = "Unrecognised knet_transport. expected 'udp' or 'sctp'"; +- return -1; ++ ret = -1; ++ goto out; + } + } + } +@@ -1652,9 +1657,9 @@ + *error_string = error_string_response; + + icmap_iter_finalize(member_iter); +- icmap_iter_finalize(iter); + free(str); +- return -1; ++ ret = -1; ++ goto out; + } + + free(str); +@@ -1665,9 +1670,12 @@ + totem_config->interfaces[linknumber].member_count = member_count; + + } ++ ++out: + icmap_iter_finalize(iter); ++ free(cluster_name); + +- return 0; ++ return (ret); + } + + extern int totem_config_read (
  5. Download patch debian/tests/quorumtool

    --- 3.0.3-2/debian/tests/quorumtool 2020-01-04 12:47:16.000000000 +0000 +++ 3.0.3-2ubuntu2/debian/tests/quorumtool 2020-03-04 21:39:26.000000000 +0000 @@ -2,6 +2,12 @@ set -e +ulimit -H -l unlimited 2>/dev/null || { + # https://bugs.launchpad.net/bugs/1828228 + echo "test disabled for unprivileged namespaces" + exit 77 +} + OUTPUT="${AUTOPKGTEST_ARTIFACTS:-.}/quorumtool.txt" corosync-quorumtool >"$OUTPUT"
  6. Download patch debian/patches/ubuntu-v3.0.3-fixes/lp1869622-56ee8503-quorumtool-Assert-copied-string-length.patch

    --- 3.0.3-2/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-56ee8503-quorumtool-Assert-copied-string-length.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.0.3-2ubuntu2/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-56ee8503-quorumtool-Assert-copied-string-length.patch 2020-03-29 21:50:35.000000000 +0000 @@ -0,0 +1,25 @@ +From 56ee850301ae08213e19a163443a8d0f0b5068aa Mon Sep 17 00:00:00 2001 +From: Jan Friesse <jfriesse@redhat.com> +Date: Tue, 26 Nov 2019 15:05:46 +0100 +Subject: [PATCH] quorumtool: Assert copied string length + +Signed-off-by: Jan Friesse <jfriesse@redhat.com> + +Origin: upstream, https://github.com/corosync/corosync/commit/56ee850301 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869622 +Reviewed-by: Rafael David Tinoco <rafaeldtinoco@ubuntu.com> +Last-Update: 2020-03-29 +--- + tools/corosync-quorumtool.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/tools/corosync-quorumtool.c ++++ b/tools/corosync-quorumtool.c +@@ -334,6 +334,7 @@ + if ((nodelist_name) && + (strlen(nodelist_name) > 0)) { + start_addr = 1; ++ assert(strlen(nodelist_name) < sizeof(buf)); + strcpy(buf, nodelist_name); + bufptr = strlen(buf); + }
  7. Download patch debian/control

    --- 3.0.3-2/debian/control 2020-01-04 12:47:16.000000000 +0000 +++ 3.0.3-2ubuntu2/debian/control 2020-03-29 21:50:35.000000000 +0000 @@ -1,7 +1,8 @@ Source: corosync Section: admin Priority: optional -Maintainer: Debian HA Maintainers <debian-ha-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian HA Maintainers <debian-ha-maintainers@lists.alioth.debian.org> Uploaders: Adrian Vondendriesch <adrian.vondendriesch@credativ.de>, Ferenc Wágner <wferi@debian.org>, @@ -54,7 +55,9 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.0-6), adduser, - xsltproc + xsltproc, +# corosync-blackbox: qb-blackbox dependency (LP: #1677684) + libqb-dev Description: cluster engine daemon and utilities ${S:X-Common-Description} .
  8. Download patch debian/patches/ubuntu-v3.0.3-fixes/lp1869622-c631951e-icmap-icmap_init_r-leaks-if-trie_create-fails.patch

    --- 3.0.3-2/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-c631951e-icmap-icmap_init_r-leaks-if-trie_create-fails.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.0.3-2ubuntu2/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-c631951e-icmap-icmap_init_r-leaks-if-trie_create-fails.patch 2020-03-29 21:50:35.000000000 +0000 @@ -0,0 +1,32 @@ +From c631951ef5ab870b0877bd2c0909c8157c7eeb20 Mon Sep 17 00:00:00 2001 +From: Christine Caulfield <ccaulfie@redhat.com> +Date: Thu, 26 Mar 2020 10:26:16 +0000 +Subject: [PATCH] icmap: icmap_init_r() leaks if trie_create() fails + +Thanks to Coverity for finding this + +Signed-off-by: Christine Caulfield <ccaulfie@redhat.com> +Reviewed-by: Jan Friesse <jfriesse@redhat.com> + +Origin: upstream, https://github.com/corosync/corosync/commit/c631951ef5 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869622 +Reviewed-by: Rafael David Tinoco <rafaeldtinoco@ubuntu.com> +Last-Update: 2020-03-29 +--- + exec/icmap.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/exec/icmap.c ++++ b/exec/icmap.c +@@ -195,8 +195,10 @@ + } + + (*result)->qb_map = qb_trie_create(); +- if ((*result)->qb_map == NULL) ++ if ((*result)->qb_map == NULL) { ++ free(*result); + return (CS_ERR_INIT); ++ } + + err = qb_map_notify_add((*result)->qb_map, NULL, icmap_map_free_cb, QB_MAP_NOTIFY_FREE, NULL); +
  9. Download patch debian/patches/ubuntu-v3.0.3-fixes/lp1869622-0c16442f-votequorum-Change-check-of-expected_votes.patch

    --- 3.0.3-2/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-0c16442f-votequorum-Change-check-of-expected_votes.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.0.3-2ubuntu2/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-0c16442f-votequorum-Change-check-of-expected_votes.patch 2020-03-29 21:50:35.000000000 +0000 @@ -0,0 +1,51 @@ +From 0c16442f2d93f32a229b87d2672e2dc8025ec704 Mon Sep 17 00:00:00 2001 +From: Jan Friesse <jfriesse@redhat.com> +Date: Wed, 4 Mar 2020 11:42:15 +0100 +Subject: [PATCH] votequorum: Change check of expected_votes + +Previously value of new expected_votes was checked so newly computed +quorum value was in the interval <total_votes / 2, total_votes>. The +upper range prevented the cluster to become unquorate, but bottom check +was almost useless because it allowed to change expected_votes so it is +smaller than total_votes. + +Solution is to check if expected_votes is bigger or equal to total_votes +and for quorate cluster only check if cluster doesn't become unquorate +(for unquorate cluster one can set upper range freely - as it is +perfectly possible when using config file) + +Signed-off-by: Jan Friesse <jfriesse@redhat.com> +Reviewed-by: Christine Caulfield <ccaulfie@redhat.com> + +Origin: upstream, https://github.com/corosync/corosync/commit/0c16442f2d +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869622 +Reviewed-by: Rafael David Tinoco <rafaeldtinoco@ubuntu.com> +Last-Update: 2020-03-29 +--- + exec/votequorum.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +--- a/exec/votequorum.c ++++ b/exec/votequorum.c +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2009-2015 Red Hat, Inc. ++ * Copyright (c) 2009-2020 Red Hat, Inc. + * + * All rights reserved. + * +@@ -2668,8 +2668,12 @@ + */ + newquorum = calculate_quorum(1, req_lib_votequorum_setexpected->expected_votes, &total_votes); + allow_downscale = allow_downscale_status; +- if (newquorum < total_votes / 2 || +- newquorum > total_votes) { ++ /* ++ * Setting expected_votes < total_votes doesn't make sense. ++ * For quorate cluster prevent cluster to become unquorate. ++ */ ++ if (req_lib_votequorum_setexpected->expected_votes < total_votes || ++ (cluster_is_quorate && (newquorum > total_votes))) { + error = CS_ERR_INVALID_PARAM; + goto error_exit; + }
  10. Download patch debian/patches/ubuntu-v3.0.3-fixes/lp1869622-a24cbad5-totemconfig-Initialize-warnings-variable.patch

    --- 3.0.3-2/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-a24cbad5-totemconfig-Initialize-warnings-variable.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.0.3-2ubuntu2/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-a24cbad5-totemconfig-Initialize-warnings-variable.patch 2020-03-29 21:50:35.000000000 +0000 @@ -0,0 +1,26 @@ +From a24cbad59007ff2507cfa4cb562696f7c634f31f Mon Sep 17 00:00:00 2001 +From: Jan Friesse <jfriesse@redhat.com> +Date: Tue, 26 Nov 2019 13:02:04 +0100 +Subject: [PATCH] totemconfig: Initialize warnings variable + +Signed-off-by: Jan Friesse <jfriesse@redhat.com> + +Origin: upstream, https://github.com/corosync/corosync/commit/a24cbad590 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869622 +Reviewed-by: Rafael David Tinoco <rafaeldtinoco@ubuntu.com> +Last-Update: 2020-03-29 +--- + exec/totemconfig.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/exec/totemconfig.c ++++ b/exec/totemconfig.c +@@ -2266,7 +2266,7 @@ + { + struct totem_config *totem_config = (struct totem_config *)user_data; + const char *error_string; +- uint64_t warnings; ++ uint64_t warnings = 0; + + /* Reload has completed */ + if (*(uint8_t *)new_val.data == 0) {
  11. Download patch debian/patches/ubuntu-v3.0.3-fixes/lp1869622-8ff7760c-cmapctl-Free-bin_value-on-error.patch

    --- 3.0.3-2/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-8ff7760c-cmapctl-Free-bin_value-on-error.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.0.3-2ubuntu2/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-8ff7760c-cmapctl-Free-bin_value-on-error.patch 2020-03-29 21:50:35.000000000 +0000 @@ -0,0 +1,30 @@ +From 8ff7760ce5ba5e23cbdd0124a254a41aee6033ab Mon Sep 17 00:00:00 2001 +From: Jan Friesse <jfriesse@redhat.com> +Date: Tue, 26 Nov 2019 14:09:14 +0100 +Subject: [PATCH] cmapctl: Free bin_value on error + +Signed-off-by: Jan Friesse <jfriesse@redhat.com> + +Origin: upstream, https://github.com/corosync/corosync/commit/8ff7760ce5 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869622 +Reviewed-by: Rafael David Tinoco <rafaeldtinoco@ubuntu.com> +Last-Update: 2020-03-29 +--- + tools/corosync-cmapctl.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/tools/corosync-cmapctl.c ++++ b/tools/corosync-cmapctl.c +@@ -316,6 +316,12 @@ + if (err != CS_OK) { + fprintf(stderr, "Can't get value of %s. Error %s\n", key_name, cs_strerror(err)); + ++ /* ++ * bin_value was newly allocated ++ */ ++ if (bin_value != NULL && value == NULL) { ++ free(bin_value); ++ } + return ; + } +
  12. Download patch debian/patches/ubuntu-v3.0.3-fixes/lp1869622-380b744e-totemknet-Don-t-mix-corosync-and-knet-error-codes.patch

    --- 3.0.3-2/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-380b744e-totemknet-Don-t-mix-corosync-and-knet-error-codes.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.0.3-2ubuntu2/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-380b744e-totemknet-Don-t-mix-corosync-and-knet-error-codes.patch 2020-03-29 21:50:35.000000000 +0000 @@ -0,0 +1,52 @@ +From 380b744ec82e65f58eeeea53a99e0561b360e710 Mon Sep 17 00:00:00 2001 +From: Jan Friesse <jfriesse@redhat.com> +Date: Tue, 26 Nov 2019 10:26:36 +0100 +Subject: [PATCH] totemknet: Don't mix corosync and knet error codes + +And use correct return code in stats.c. + +Signed-off-by: Jan Friesse <jfriesse@redhat.com> + +Origin: upstream, https://github.com/corosync/corosync/commit/380b744ec8 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869622 +Reviewed-by: Rafael David Tinoco <rafaeldtinoco@ubuntu.com> +Last-Update: 2020-03-29 +--- + exec/stats.c | 2 +- + exec/totemknet.c | 9 ++++++++- + 2 files changed, 9 insertions(+), 2 deletions(-) + +--- a/exec/stats.c ++++ b/exec/stats.c +@@ -324,7 +324,7 @@ + break; + case STAT_KNET_HANDLE: + res = totemknet_handle_get_stats(&knet_handle_stats); +- if (res) { ++ if (res != CS_OK) { + return res; + } + stats_map_set_value(statinfo, &knet_handle_stats, value, value_len, type); +--- a/exec/totemknet.c ++++ b/exec/totemknet.c +@@ -1528,12 +1528,19 @@ + int totemknet_handle_get_stats ( + struct knet_handle_stats *stats) + { ++ int res; ++ + /* We are probably not using knet */ + if (!global_instance) { + return CS_ERR_NOT_EXIST; + } + +- return knet_handle_get_stats(global_instance->knet_handle, stats, sizeof(struct knet_handle_stats)); ++ res = knet_handle_get_stats(global_instance->knet_handle, stats, sizeof(struct knet_handle_stats)); ++ if (res != 0) { ++ return (qb_to_cs_error(-errno)); ++ } ++ ++ return CS_OK; + } + + static void timer_function_merge_detect_timeout (
  13. Download patch debian/tests/cfgtool

    --- 3.0.3-2/debian/tests/cfgtool 2020-01-04 12:47:16.000000000 +0000 +++ 3.0.3-2ubuntu2/debian/tests/cfgtool 2020-03-04 21:39:26.000000000 +0000 @@ -2,6 +2,12 @@ set -e +ulimit -H -l unlimited 2>/dev/null || { + # https://bugs.launchpad.net/bugs/1828228 + echo "test disabled for unprivileged namespaces" + exit 77 +} + OUTPUT="${AUTOPKGTEST_ARTIFACTS:-.}/cfgtool.txt" corosync-cfgtool -s >"$OUTPUT"
  14. Download patch debian/patches/ubuntu-v3.0.3-fixes/lp1869622-8ce65bf9-votequorum-Reflect-runtime-change-of-2Node-to-WFA.patch

    --- 3.0.3-2/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-8ce65bf9-votequorum-Reflect-runtime-change-of-2Node-to-WFA.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.0.3-2ubuntu2/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-8ce65bf9-votequorum-Reflect-runtime-change-of-2Node-to-WFA.patch 2020-03-29 21:50:35.000000000 +0000 @@ -0,0 +1,80 @@ +From 8ce65bf951bc1e5b2d64b60ea027fbdc551d4fc8 Mon Sep 17 00:00:00 2001 +From: Jan Friesse <jfriesse@redhat.com> +Date: Thu, 16 Jan 2020 15:43:59 +0100 +Subject: [PATCH] votequorum: Reflect runtime change of 2Node to WFA + +When 2Node mode is set, WFA is also set unless WFA is configured +explicitly. This behavior was not reflected on runtime change, so +restarted corosync behavior was different (WFA not set). Also when +cluster is reduced from 3 nodes to 2 nodes during runtime, WFA was not +set, what may result in two quorate partitions. + +Solution is to set WFA depending on 2Node when WFA +is not explicitly configured. + +Signed-off-by: Jan Friesse <jfriesse@redhat.com> +Reviewed-by: Christine Caulfield <ccaulfie@redhat.com> + +Origin: upstream, https://github.com/corosync/corosync/commit/8ce65bf951 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869622 +Reviewed-by: Rafael David Tinoco <rafaeldtinoco@ubuntu.com> +Last-Update: 2020-03-29 +--- + exec/votequorum.c | 24 +++++++++++++++++++----- + 1 file changed, 19 insertions(+), 5 deletions(-) + +--- a/exec/votequorum.c ++++ b/exec/votequorum.c +@@ -80,6 +80,7 @@ + + static uint8_t wait_for_all = 0; + static uint8_t wait_for_all_status = 0; ++static uint8_t wait_for_all_autoset = 0; /* Wait for all is not set explicitly and follows two_node */ + + static enum {ATB_NONE, ATB_LOWEST, ATB_HIGHEST, ATB_LIST} auto_tie_breaker = ATB_NONE, initial_auto_tie_breaker = ATB_NONE; + static int lowest_node_id = -1; +@@ -1315,12 +1316,10 @@ + * Enable special features + */ + if (!runtime) { +- if (two_node) { +- wait_for_all = 1; +- } +- + icmap_get_uint8("quorum.allow_downscale", &allow_downscale); +- icmap_get_uint8("quorum.wait_for_all", &wait_for_all); ++ if (icmap_get_uint8("quorum.wait_for_all", &wait_for_all) != CS_OK) { ++ wait_for_all_autoset = 1; ++ } + icmap_get_uint8("quorum.last_man_standing", &last_man_standing); + icmap_get_uint32("quorum.last_man_standing_window", &last_man_standing_window); + icmap_get_uint8("quorum.expected_votes_tracking", &ev_tracking); +@@ -1361,6 +1360,15 @@ + + } + ++ /* ++ * Changing of wait_for_all during runtime is not supported, but changing of two_node is ++ * and two_node may set wfa if not configured explicitly. It is safe to unset it ++ * (or set it back) when two_node changes. ++ */ ++ if (wait_for_all_autoset) { ++ wait_for_all = two_node; ++ } ++ + /* two_node and auto_tie_breaker are not compatible as two_node uses + * a fence race to decide quorum whereas ATB decides based on node id + */ +@@ -1540,6 +1548,12 @@ + update_two_node(); + if (wait_for_all) { + update_wait_for_all_status(1); ++ } else if (wait_for_all_autoset && wait_for_all_status) { ++ /* ++ * Reset wait for all status for consistency when wfa is auto-unset by 2node. ++ * wait_for_all_status would be ignored by are_we_quorate anyway. ++ */ ++ update_wait_for_all_status(0); + } + + out:
  15. Download patch debian/patches/series

    --- 3.0.3-2/debian/patches/series 2020-01-04 12:49:57.000000000 +0000 +++ 3.0.3-2ubuntu2/debian/patches/series 2020-03-29 21:50:35.000000000 +0000 @@ -3,3 +3,22 @@ Enable-PrivateTmp-in-the-systemd-service Make-the-example-config-valid.patch man-fix-typo-avaialable.patch man-move-cmap_keys-man-page-from-section-8-to-7.patch +# v3.0.3 post-release ubuntu fixes (LP: #1869622) +ubuntu-v3.0.3-fixes/lp1869622-09f6d34a-logconfig-Remove-double-free-of-value.patch +ubuntu-v3.0.3-fixes/lp1869622-0c118d8f-totemknet-Check-result-of-fcntl-O_NONBLOCK-call.patch +ubuntu-v3.0.3-fixes/lp1869622-0c16442f-votequorum-Change-check-of-expected_votes.patch +ubuntu-v3.0.3-fixes/lp1869622-1fb095b0-notifyd-Check-cmap_track_add-result.patch +ubuntu-v3.0.3-fixes/lp1869622-29109683-totemknet-Assert-strcpy-length.patch +ubuntu-v3.0.3-fixes/lp1869622-35c312f8-votequorum-Assert-copied-strings-length.patch +ubuntu-v3.0.3-fixes/lp1869622-380b744e-totemknet-Don-t-mix-corosync-and-knet-error-codes.patch +ubuntu-v3.0.3-fixes/lp1869622-56ee8503-quorumtool-Assert-copied-string-length.patch +ubuntu-v3.0.3-fixes/lp1869622-5f543465-quorumtool-exit-on-invalid-expected-votes.patch +ubuntu-v3.0.3-fixes/lp1869622-624b6a47-stats-Assert-value_len-when-value-is-needed.patch +ubuntu-v3.0.3-fixes/lp1869622-74eed54a-sync-Assert-sync_callbacks.name-length.patch +ubuntu-v3.0.3-fixes/lp1869622-89b0d62f-stats-Check-return-code-of-stats_map_get.patch +ubuntu-v3.0.3-fixes/lp1869622-8ce65bf9-votequorum-Reflect-runtime-change-of-2Node-to-WFA.patch +ubuntu-v3.0.3-fixes/lp1869622-8ff7760c-cmapctl-Free-bin_value-on-error.patch +ubuntu-v3.0.3-fixes/lp1869622-a24cbad5-totemconfig-Initialize-warnings-variable.patch +ubuntu-v3.0.3-fixes/lp1869622-c631951e-icmap-icmap_init_r-leaks-if-trie_create-fails.patch +ubuntu-v3.0.3-fixes/lp1869622-ca320bea-votequorum-set-wfa-status-only-on-startup.patch +ubuntu-v3.0.3-fixes/lp1869622-efe48120-totemconfig-Free-leaks-found-by-coverity.patch
  16. Download patch debian/patches/ubuntu-v3.0.3-fixes/lp1869622-35c312f8-votequorum-Assert-copied-strings-length.patch

    --- 3.0.3-2/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-35c312f8-votequorum-Assert-copied-strings-length.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.0.3-2ubuntu2/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-35c312f8-votequorum-Assert-copied-strings-length.patch 2020-03-29 21:50:35.000000000 +0000 @@ -0,0 +1,38 @@ +From 35c312f810738faa2965bc8771528198b966ef39 Mon Sep 17 00:00:00 2001 +From: Jan Friesse <jfriesse@redhat.com> +Date: Tue, 26 Nov 2019 13:52:27 +0100 +Subject: [PATCH] votequorum: Assert copied strings length + +Signed-off-by: Jan Friesse <jfriesse@redhat.com> + +Origin: upstream, https://github.com/corosync/corosync/commit/35c312f810 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869622 +Reviewed-by: Rafael David Tinoco <rafaeldtinoco@ubuntu.com> +Last-Update: 2020-03-29 +--- + exec/votequorum.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/exec/votequorum.c ++++ b/exec/votequorum.c +@@ -1713,7 +1713,11 @@ + + req_exec_quorum_qdevice_reconfigure.header.id = SERVICE_ID_MAKE(VOTEQUORUM_SERVICE, MESSAGE_REQ_EXEC_VOTEQUORUM_QDEVICE_RECONFIGURE); + req_exec_quorum_qdevice_reconfigure.header.size = sizeof(req_exec_quorum_qdevice_reconfigure); ++ ++ assert(strlen(oldname) < sizeof(req_exec_quorum_qdevice_reconfigure.oldname)); + strcpy(req_exec_quorum_qdevice_reconfigure.oldname, oldname); ++ ++ assert(strlen(newname) < sizeof(req_exec_quorum_qdevice_reconfigure.newname)); + strcpy(req_exec_quorum_qdevice_reconfigure.newname, newname); + + iov[0].iov_base = (void *)&req_exec_quorum_qdevice_reconfigure; +@@ -1736,6 +1740,8 @@ + req_exec_quorum_qdevice_reg.header.id = SERVICE_ID_MAKE(VOTEQUORUM_SERVICE, MESSAGE_REQ_EXEC_VOTEQUORUM_QDEVICE_REG); + req_exec_quorum_qdevice_reg.header.size = sizeof(req_exec_quorum_qdevice_reg); + req_exec_quorum_qdevice_reg.operation = operation; ++ ++ assert(strlen(qdevice_name_req) < sizeof(req_exec_quorum_qdevice_reg.qdevice_name)); + strcpy(req_exec_quorum_qdevice_reg.qdevice_name, qdevice_name_req); + + iov[0].iov_base = (void *)&req_exec_quorum_qdevice_reg;
  17. Download patch debian/patches/ubuntu-v3.0.3-fixes/lp1869622-ca320bea-votequorum-set-wfa-status-only-on-startup.patch

    --- 3.0.3-2/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-ca320bea-votequorum-set-wfa-status-only-on-startup.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.0.3-2ubuntu2/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-ca320bea-votequorum-set-wfa-status-only-on-startup.patch 2020-03-29 21:50:35.000000000 +0000 @@ -0,0 +1,67 @@ +From ca320beac25f82c0c555799e647a47975a333c28 Mon Sep 17 00:00:00 2001 +From: Jan Friesse <jfriesse@redhat.com> +Date: Tue, 10 Mar 2020 17:49:27 +0100 +Subject: [PATCH] votequorum: set wfa status only on startup + +Previously reload of configuration with enabled wait_for_all result in +set of wait_for_all_status which set cluster_is_quorate to 0 but didn't +inform the quorum service so votequorum and quorum information may get +out of sync. + +Example is 1 node cluster, which is extended to 3 nodes. Quorum service +reports cluster as a quorate (incorrect) and votequorum as not-quorate +(correct). Similar behavior happens when extending cluster in general, +but some configurations are less incorrect (3->4). + +Discussed solution was to inform quorum service but that would mean +every reload would cause loss of quorum until all nodes would be seen +again. + +Such behaviour is consistent but seems to be a bit too strict. + +Proposed solution sets wait_for_all_status only on startup and +doesn't touch it during reload. + +This solution fulfills requirement of "cluster will be quorate for +the first time only after all nodes have been visible at least +once at the same time." because node clears wait_for_all_status only +after it sees all other nodes or joins cluster which is quorate. It also +solves problem with extending cluster, because when cluster becomes +unquorate (1->3) wait_for_all_status is set. + +Added assert is only for ensure that I haven't missed any case when +quorate cluster may become unquorate. + +Signed-off-by: Jan Friesse <jfriesse@redhat.com> +Reviewed-by: Christine Caulfield <ccaulfie@redhat.com> + +Origin: upstream, https://github.com/corosync/corosync/commit/ca320beac2 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869622 +Reviewed-by: Rafael David Tinoco <rafaeldtinoco@ubuntu.com> +Last-Update: 2020-03-29 +--- + exec/votequorum.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/exec/votequorum.c ++++ b/exec/votequorum.c +@@ -1009,7 +1009,7 @@ + "Waiting for all cluster members. " + "Current votes: %d expected_votes: %d", + total_votes, us->expected_votes); +- cluster_is_quorate = 0; ++ assert(!cluster_is_quorate); + return; + } + update_wait_for_all_status(0); +@@ -1547,7 +1547,9 @@ + update_ev_barrier(us->expected_votes); + update_two_node(); + if (wait_for_all) { +- update_wait_for_all_status(1); ++ if (!runtime) { ++ update_wait_for_all_status(1); ++ } + } else if (wait_for_all_autoset && wait_for_all_status) { + /* + * Reset wait for all status for consistency when wfa is auto-unset by 2node.
  18. Download patch debian/patches/ubuntu-v3.0.3-fixes/lp1869622-5f543465-quorumtool-exit-on-invalid-expected-votes.patch

    --- 3.0.3-2/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-5f543465-quorumtool-exit-on-invalid-expected-votes.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.0.3-2ubuntu2/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-5f543465-quorumtool-exit-on-invalid-expected-votes.patch 2020-03-29 21:50:35.000000000 +0000 @@ -0,0 +1,33 @@ +From 5f543465bb3506b7f4929a426f1c22a9c854cecd Mon Sep 17 00:00:00 2001 +From: Jan Friesse <jfriesse@redhat.com> +Date: Wed, 4 Mar 2020 08:53:41 +0100 +Subject: [PATCH] quorumtool: exit on invalid expected votes + +Signed-off-by: Jan Friesse <jfriesse@redhat.com> +Reviewed-by: Christine Caulfield <ccaulfie@redhat.com> + +Origin: upstream, https://github.com/corosync/corosync/commit/5f543465bb +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869622 +Reviewed-by: Rafael David Tinoco <rafaeldtinoco@ubuntu.com> +Last-Update: 2020-03-29 +--- + tools/corosync-quorumtool.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/tools/corosync-quorumtool.c ++++ b/tools/corosync-quorumtool.c +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2009-2019 Red Hat, Inc. ++ * Copyright (c) 2009-2020 Red Hat, Inc. + * + * All rights reserved. + * +@@ -937,6 +937,7 @@ + votes = strtol(optarg, &endptr, 0); + if ((votes == 0 && endptr == optarg) || votes <= 0) { + fprintf(stderr, "New expected votes value was not valid, try a positive number\n"); ++ exit(EXIT_FAILURE); + } else { + command_opt = CMD_SETEXPECTED; + }
  19. Download patch debian/patches/ubuntu-v3.0.3-fixes/lp1869622-89b0d62f-stats-Check-return-code-of-stats_map_get.patch

    --- 3.0.3-2/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-89b0d62f-stats-Check-return-code-of-stats_map_get.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.0.3-2ubuntu2/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-89b0d62f-stats-Check-return-code-of-stats_map_get.patch 2020-03-29 21:50:35.000000000 +0000 @@ -0,0 +1,26 @@ +From 89b0d62f8bd9d5ba90db5a37866c029b821da838 Mon Sep 17 00:00:00 2001 +From: Jan Friesse <jfriesse@redhat.com> +Date: Tue, 26 Nov 2019 16:47:31 +0100 +Subject: [PATCH] stats: Check return code of stats_map_get + +Signed-off-by: Jan Friesse <jfriesse@redhat.com> + +Origin: upstream, https://github.com/corosync/corosync/commit/89b0d62f8b +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869622 +Reviewed-by: Rafael David Tinoco <rafaeldtinoco@ubuntu.com> +Last-Update: 2020-03-29 +--- + exec/stats.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/exec/stats.c ++++ b/exec/stats.c +@@ -505,6 +505,8 @@ + &new_value, + &new_val.len, + &new_val.type) != CS_OK) { ++ log_printf(LOGSYS_LEVEL_WARNING, "get value of notified key %s failed", key); ++ return ; + } + + /* We don't know what the old value was
  20. Download patch debian/patches/ubuntu-v3.0.3-fixes/lp1869622-1fb095b0-notifyd-Check-cmap_track_add-result.patch

    --- 3.0.3-2/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-1fb095b0-notifyd-Check-cmap_track_add-result.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.0.3-2ubuntu2/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-1fb095b0-notifyd-Check-cmap_track_add-result.patch 2020-03-29 21:50:35.000000000 +0000 @@ -0,0 +1,50 @@ +From 1fb095b0afe509305bffa8c7ca50c002e3965552 Mon Sep 17 00:00:00 2001 +From: Jan Friesse <jfriesse@redhat.com> +Date: Tue, 26 Nov 2019 14:17:53 +0100 +Subject: [PATCH] notifyd: Check cmap_track_add result + +And assert length of key_name to strcpy. + +Signed-off-by: Jan Friesse <jfriesse@redhat.com> + +Origin: upstream, https://github.com/corosync/corosync/commit/1fb095b0af +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869622 +Reviewed-by: Rafael David Tinoco <rafaeldtinoco@ubuntu.com> +Last-Update: 2020-03-29 +--- + tools/corosync-notifyd.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +--- a/tools/corosync-notifyd.c ++++ b/tools/corosync-notifyd.c +@@ -382,18 +382,29 @@ + void *user_data) + { + struct track_item *track_item; ++ cs_error_t err; + + /* Add/remove a tracker for a new/removed knet link */ + if (strstr(key_name, ".connected")) { + if (event == CMAP_TRACK_ADD) { ++ assert(strlen(key_name) < sizeof(track_item->key_name)); + + track_item = malloc(sizeof(struct track_item)); + if (!track_item) { ++ qb_log(LOG_WARNING, "Can't alloc track_item for new/removed knet link"); + return; + } +- cmap_track_add(stats_handle, key_name, CMAP_TRACK_MODIFY, _cs_cmap_link_faulty_key_changed, NULL, &track_handle); ++ err = cmap_track_add(stats_handle, key_name, CMAP_TRACK_MODIFY, ++ _cs_cmap_link_faulty_key_changed, NULL, &track_handle); ++ if (err != CS_OK) { ++ qb_log(LOG_WARNING, "Can't add tracker for new/removed knet link"); ++ ++ free(track_item); ++ return ; ++ } + + strcpy(track_item->key_name, key_name); ++ + track_item->track_handle = track_handle; + qb_map_put(tracker_map, track_item->key_name, track_item); + } else {
  21. Download patch debian/patches/ubuntu-v3.0.3-fixes/lp1869622-74eed54a-sync-Assert-sync_callbacks.name-length.patch

    --- 3.0.3-2/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-74eed54a-sync-Assert-sync_callbacks.name-length.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.0.3-2ubuntu2/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-74eed54a-sync-Assert-sync_callbacks.name-length.patch 2020-03-29 21:50:35.000000000 +0000 @@ -0,0 +1,27 @@ +From 74eed54a7fcd52924bdcb7fdf1226cceb51cfd22 Mon Sep 17 00:00:00 2001 +From: Jan Friesse <jfriesse@redhat.com> +Date: Tue, 26 Nov 2019 13:01:16 +0100 +Subject: [PATCH] sync: Assert sync_callbacks.name length + +Signed-off-by: Jan Friesse <jfriesse@redhat.com> + +Origin: upstream, https://github.com/corosync/corosync/commit/74eed54a7f +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869622 +Reviewed-by: Rafael David Tinoco <rafaeldtinoco@ubuntu.com> +Last-Update: 2020-03-29 +--- + exec/sync.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/exec/sync.c ++++ b/exec/sync.c +@@ -466,6 +466,9 @@ + } + my_service_list[my_service_list_entries].state = PROCESS; + my_service_list[my_service_list_entries].service_id = i; ++ ++ assert(strlen(sync_callbacks.name) < sizeof(my_service_list[my_service_list_entries].name)); ++ + strcpy (my_service_list[my_service_list_entries].name, + sync_callbacks.name); + my_service_list[my_service_list_entries].sync_init = sync_callbacks.sync_init;
  22. Download patch debian/patches/ubuntu-v3.0.3-fixes/lp1869622-0c118d8f-totemknet-Check-result-of-fcntl-O_NONBLOCK-call.patch

    --- 3.0.3-2/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-0c118d8f-totemknet-Check-result-of-fcntl-O_NONBLOCK-call.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.0.3-2ubuntu2/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-0c118d8f-totemknet-Check-result-of-fcntl-O_NONBLOCK-call.patch 2020-03-29 21:50:35.000000000 +0000 @@ -0,0 +1,32 @@ +From 0c118d8ff425ed6cf9af14b13a15ef62a91b86f6 Mon Sep 17 00:00:00 2001 +From: Jan Friesse <jfriesse@redhat.com> +Date: Tue, 26 Nov 2019 13:05:42 +0100 +Subject: [PATCH] totemknet: Check result of fcntl O_NONBLOCK call + +Signed-off-by: Jan Friesse <jfriesse@redhat.com> + +Origin: upstream, https://github.com/corosync/corosync/commit/0c118d8ff4 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869622 +Reviewed-by: Rafael David Tinoco <rafaeldtinoco@ubuntu.com> +Last-Update: 2020-03-29 +--- + exec/totemknet.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +--- a/exec/totemknet.c ++++ b/exec/totemknet.c +@@ -967,8 +967,12 @@ + KNET_LOGSYS_PERROR(errno, LOGSYS_LEVEL_CRIT, "failed to create pipe for instance->logpipes"); + goto exit_error; + } +- fcntl(instance->logpipes[0], F_SETFL, O_NONBLOCK); +- fcntl(instance->logpipes[1], F_SETFL, O_NONBLOCK); ++ if (fcntl(instance->logpipes[0], F_SETFL, O_NONBLOCK) == -1 || ++ fcntl(instance->logpipes[1], F_SETFL, O_NONBLOCK) == -1) { ++ KNET_LOGSYS_PERROR(errno, LOGSYS_LEVEL_CRIT, "failed to set O_NONBLOCK flag for instance->logpipes"); ++ goto exit_error; ++ } ++ + + #if !defined(KNET_API_VER) || (KNET_API_VER == 1) + instance->knet_handle = knet_handle_new(instance->totem_config->node_id, instance->logpipes[1], KNET_LOG_DEBUG);
  23. Download patch debian/patches/ubuntu-v3.0.3-fixes/lp1869622-29109683-totemknet-Assert-strcpy-length.patch

    --- 3.0.3-2/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-29109683-totemknet-Assert-strcpy-length.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.0.3-2ubuntu2/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-29109683-totemknet-Assert-strcpy-length.patch 2020-03-29 21:50:35.000000000 +0000 @@ -0,0 +1,44 @@ +From 29109683cf29966181fcc6bc9ef50d0bd48e5778 Mon Sep 17 00:00:00 2001 +From: Jan Friesse <jfriesse@redhat.com> +Date: Tue, 26 Nov 2019 13:13:53 +0100 +Subject: [PATCH] totemknet: Assert strcpy length + +Signed-off-by: Jan Friesse <jfriesse@redhat.com> + +Origin: upstream, https://github.com/corosync/corosync/commit/29109683cf +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869622 +Reviewed-by: Rafael David Tinoco <rafaeldtinoco@ubuntu.com> +Last-Update: 2020-03-29 +--- + exec/totemknet.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +--- a/exec/totemknet.c ++++ b/exec/totemknet.c +@@ -1022,9 +1022,16 @@ + if (strcmp(instance->totem_config->crypto_cipher_type, "none") != 0) { + struct knet_handle_crypto_cfg crypto_cfg; + ++ assert(strlen(instance->totem_config->crypto_model) < sizeof(crypto_cfg.crypto_model)); + strcpy(crypto_cfg.crypto_model, instance->totem_config->crypto_model); ++ ++ assert(strlen(instance->totem_config->crypto_cipher_type) < sizeof(crypto_cfg.crypto_cipher_type)); + strcpy(crypto_cfg.crypto_cipher_type, instance->totem_config->crypto_cipher_type); ++ ++ assert(strlen(instance->totem_config->crypto_hash_type) < sizeof(crypto_cfg.crypto_hash_type)); + strcpy(crypto_cfg.crypto_hash_type, instance->totem_config->crypto_hash_type); ++ ++ assert(instance->totem_config->private_key_len <= sizeof(crypto_cfg.private_key)); + memcpy(crypto_cfg.private_key, instance->totem_config->private_key, instance->totem_config->private_key_len); + crypto_cfg.private_key_len = instance->totem_config->private_key_len; + +@@ -1450,7 +1457,9 @@ + int res = 0; + + if (totem_config->knet_compression_model) { ++ assert(strlen(totem_config->knet_compression_model) < sizeof(compress_cfg.compress_model)); + strcpy(compress_cfg.compress_model, totem_config->knet_compression_model); ++ + compress_cfg.compress_threshold = totem_config->knet_compression_threshold; + compress_cfg.compress_level = totem_config->knet_compression_level; +
  24. Download patch debian/patches/ubuntu-v3.0.3-fixes/lp1869622-09f6d34a-logconfig-Remove-double-free-of-value.patch

    --- 3.0.3-2/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-09f6d34a-logconfig-Remove-double-free-of-value.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.0.3-2ubuntu2/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-09f6d34a-logconfig-Remove-double-free-of-value.patch 2020-03-29 21:50:35.000000000 +0000 @@ -0,0 +1,25 @@ +From 09f6d34aaad5742533e5b36fda656973ca1482e8 Mon Sep 17 00:00:00 2001 +From: Jan Friesse <jfriesse@redhat.com> +Date: Mon, 25 Nov 2019 18:26:35 +0100 +Subject: [PATCH] logconfig: Remove double free of value + +Signed-off-by: Jan Friesse <jfriesse@redhat.com> + +Origin: upstream, https://github.com/corosync/corosync/commit/09f6d34aaad +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869622 +Reviewed-by: Rafael David Tinoco <rafaeldtinoco@ubuntu.com> +Last-Update: 2020-03-29 +--- + exec/logconfig.c | 1 - + 1 file changed, 1 deletion(-) + +--- a/exec/logconfig.c ++++ b/exec/logconfig.c +@@ -542,7 +542,6 @@ + else { + if (logsys_config_debug_set (subsys, LOGSYS_DEBUG_OFF) < 0) { + error_reason = "unable to set debug off"; +- free(value); + goto parse_error; + } + }

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: corosync-qdevice

corosync-qdevice (3.0.0-5ubuntu1) groovy; urgency=medium * Merge with Debian unstable (LP: #1883771). Remaining changes: - Skip autopkgtest for unprivileged containers: (LP: 1837090) - d/t/control: mark corosync-qnetd test as skippable - d/t/qdevice: skip if memlock can't be set to unlimited by root -- Rafael David Tinoco <rafaeldtinoco@ubuntu.com> Tue, 07 Jul 2020 01:31:10 +0000

Modifications :
  1. Download patch debian/tests/control

    --- 3.0.0-5/debian/tests/control 2020-04-07 20:14:40.000000000 +0000 +++ 3.0.0-5ubuntu1/debian/tests/control 2020-07-07 01:30:12.000000000 +0000 @@ -3,5 +3,5 @@ Restrictions: needs-root, isolation-cont Tests: qnetd Depends: corosync-qnetd, corosync-qdevice -Restrictions: needs-root, isolation-container +Restrictions: needs-root, isolation-container, skippable Tests: qdevice
  2. Download patch debian/control

    --- 3.0.0-5/debian/control 2020-04-07 20:22:43.000000000 +0000 +++ 3.0.0-5ubuntu1/debian/control 2020-07-07 01:31:10.000000000 +0000 @@ -1,7 +1,8 @@ Source: corosync-qdevice Section: admin Priority: optional -Maintainer: Debian HA Maintainers <debian-ha-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian HA Maintainers <debian-ha-maintainers@lists.alioth.debian.org> Uploaders: Ferenc Wágner <wferi@debian.org>, Valentin Vidic <vvidic@debian.org>,
  3. Download patch debian/tests/qdevice

    --- 3.0.0-5/debian/tests/qdevice 2020-04-07 20:14:40.000000000 +0000 +++ 3.0.0-5ubuntu1/debian/tests/qdevice 2020-07-07 01:30:12.000000000 +0000 @@ -2,6 +2,12 @@ set -e +ulimit -H -l unlimited 2>/dev/null || { + # https://bugs.launchpad.net/bugs/1828228 + echo "test disabled for unprivileged namespaces" + exit 77 +} + # setup TLS certificates corosync-qdevice-net-certutil -i -c /etc/corosync/qnetd/nssdb/qnetd-cacert.crt 2>&1 corosync-qdevice-net-certutil -r -n debian 2>&1

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: kronosnet

kronosnet (1.18-1ubuntu1) groovy; urgency=low * Merge from Debian unstable. Remaining changes: - d/t/control: Fix FTBFS in i386 due to autopkgtest failure - Replace test dependencies on gcc and make, with dependency on build-essentials, which is special-cased for autopkgtest to use native packages for crossbuilding. - Make autopkgtests cross-test-friendly using $DEB_HOST_ARCH. -- Gianfranco Costamagna <locutusofborg@debian.org> Mon, 20 Jul 2020 12:33:00 +0200

Modifications :
  1. Download patch debian/tests/control

    --- 1.18-1/debian/tests/control 2020-06-16 13:39:43.000000000 +0000 +++ 1.18-1ubuntu1/debian/tests/control 2020-07-19 15:14:56.000000000 +0000 @@ -1,6 +1,6 @@ Depends: libknet-dev, libnozzle-dev, autoconf, automake, libtool, - gcc, libc6-dev, make, pkg-config, + build-essential, libc6-dev, pkg-config, libnl-3-dev, libnl-route-3-dev, libqb-dev, libsctp-dev, libbz2-dev, liblz4-dev, liblzma-dev, liblzo2-dev, libzstd-dev, zlib1g-dev, libnss3-dev, libssl-dev
  2. Download patch debian/tests/libknet

    --- 1.18-1/debian/tests/libknet 2020-06-16 13:39:43.000000000 +0000 +++ 1.18-1ubuntu1/debian/tests/libknet 2020-07-19 15:14:56.000000000 +0000 @@ -1,7 +1,13 @@ #!/bin/sh -ex +if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then + CROSS_COMPILE="$DEB_HOST_GNU_TYPE-" +else + CROSS_COMPILE= +fi + # api-test-coverage would need a build, so call check-TESTS, not check: -make LIBS="$(pkg-config --libs libknet) \$(PTHREAD_LIBS) \$(dl_LIBS)" \ +make LIBS="$(${CROSS_COMPILE}pkg-config --libs libknet) \$(PTHREAD_LIBS) \$(dl_LIBS)" \ VERBOSE=1 -C libknet/tests all check-TESTS || ret=$? if [ "$AUTOPKGTEST_ARTIFACTS" ]; then
  3. Download patch debian/tests/libnozzle

    --- 1.18-1/debian/tests/libnozzle 2020-06-16 13:39:44.000000000 +0000 +++ 1.18-1ubuntu1/debian/tests/libnozzle 2020-07-19 15:14:56.000000000 +0000 @@ -3,8 +3,14 @@ mkdir -p /dev/net [ -c /dev/net/tun ] || mknod -m666 /dev/net/tun c 10 200 +if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then + CROSS_COMPILE="$DEB_HOST_GNU_TYPE-" +else + CROSS_COMPILE= +fi + # api-test-coverage would need a build, so call check-TESTS, not check: -make LIBS="$(pkg-config --libs libnozzle) \$(PTHREAD_LIBS) \$(libnl_LIBS)" \ +make LIBS="$(${CROSS_COMPILE}pkg-config --libs libnozzle) \$(PTHREAD_LIBS) \$(libnl_LIBS)" \ VERBOSE=1 -C libnozzle/tests all check-TESTS if [ "$AUTOPKGTEST_ARTIFACTS" ]; then
  4. Download patch debian/tests/configure

    --- 1.18-1/debian/tests/configure 2020-06-16 13:39:43.000000000 +0000 +++ 1.18-1ubuntu1/debian/tests/configure 2020-07-19 15:14:56.000000000 +0000 @@ -1,4 +1,10 @@ #!/bin/sh -ex +if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then + CROSS_COMPILE="--host=$DEB_HOST_GNU_TYPE" +else + CROSS_COMPILE= +fi + autoreconf -fi -./configure --disable-man +./configure --disable-man $CROSS_COMPILE

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: pacemaker

pacemaker (2.0.4-2ubuntu1) groovy; urgency=medium * Merge with Debian unstable (LP: #1886546). Remaining changes: - Dropped: debian/patches/pacemaker_is_partof_corosync.patch: Disagreement among Debian and Ubuntu about service dependencies. - d/control: Demote fence-agents to Suggests, avoiding main inclusion. - Skip autopkgtest for unprivileged containers: (LP #1828228) + d/t/control: mark pacemaker test as skippable + d/t/pacemaker: skip if memlock can't be set to unlimited by root - Make crmsh the default management tool for now (LP #1862947) - d/rules: Forcibly switch from ftime to clock_gettime, since building with ftime now results in deprecation errors * Dropped (from Ubuntu): - Post 2.0.3 release fixes backported to Ubuntu (LP #1870235) debian/patches/ubuntu-2.0.3-fixes/: - lp1870235-0a8e789f9-Fix-libpengine-Options-should-be-uint.patch - lp1870235-186042bcb-Ref-libcrmservice-SIGCHLD-handling.patch - lp1870235-28bfd00e9-Low-libcrmservice-handle-child-wait-errors.patch - lp1870235-426f06cc0-Fix-tools-Fix-curses_indented_printf.patch - lp1870235-4f5207a28-Fix-tools-Correct-crm_mon-man-page.patch - lp1870235-5afe84e45-Fix-libstonithd-validate-arg-non-const.patch - lp1870235-c98987824-Fix-iso8601-Fix-crm_time_parse_offset.patch - lp1870235-dec326391-Log-libcrmcommon-correct-log-line-length.patch - lp1870235-e35908c79-Log-libcrmservice-impr-msgs-wait-child.patch - lp1870235-eaaa20949-Fix-libstonithd-tools-Fix-arg-stonith-event.patch - lp1870235-f0fe45806-Fix-scheduler-cluster-maint-mode-true.patch [in Debian Pacemaker-2.0.4] -- Rafael David Tinoco <rafaeldtinoco@ubuntu.com> Mon, 06 Jul 2020 19:04:45 +0000

Modifications :
  1. Download patch debian/patches/Make-the-asciidoc-documentation-reproducible.patch

    --- 2.0.4-2/debian/patches/Make-the-asciidoc-documentation-reproducible.patch 2020-06-22 16:08:07.000000000 +0000 +++ 2.0.4-2ubuntu1/debian/patches/Make-the-asciidoc-documentation-reproducible.patch 2020-07-06 19:04:45.000000000 +0000 @@ -6,11 +6,9 @@ Subject: Make the asciidoc documentation doc/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/doc/Makefile.am b/doc/Makefile.am -index 76f8908..a50b8d3 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am -@@ -104,7 +104,7 @@ graphics: $(PNGS) +@@ -104,7 +104,7 @@ || $(INKSCAPE) --export-dpi=180 -C --export-filename=$@ $<; } $(PCMK_quiet) if IS_ASCIIDOC
  2. Download patch debian/patches/libpacemaker-calls-into-libstonithd-directly.patch

    --- 2.0.4-2/debian/patches/libpacemaker-calls-into-libstonithd-directly.patch 2020-06-22 16:08:07.000000000 +0000 +++ 2.0.4-2ubuntu1/debian/patches/libpacemaker-calls-into-libstonithd-directly.patch 2020-07-06 19:04:45.000000000 +0000 @@ -6,11 +6,9 @@ Subject: libpacemaker calls into libston lib/pacemaker/Makefile.am | 1 + 1 file changed, 1 insertion(+) -diff --git a/lib/pacemaker/Makefile.am b/lib/pacemaker/Makefile.am -index 4fae761..e04562b 100644 --- a/lib/pacemaker/Makefile.am +++ b/lib/pacemaker/Makefile.am -@@ -24,6 +24,7 @@ libpacemaker_la_LDFLAGS += $(LDFLAGS_HARDENED_LIB) +@@ -24,6 +24,7 @@ libpacemaker_la_LIBADD = $(top_builddir)/lib/pengine/libpe_status.la \ $(top_builddir)/lib/cib/libcib.la \ $(top_builddir)/lib/lrmd/liblrmd.la \
  3. Download patch debian/tests/control

    --- 2.0.4-2/debian/tests/control 2020-06-22 16:08:07.000000000 +0000 +++ 2.0.4-2ubuntu1/debian/tests/control 2020-07-06 17:22:14.000000000 +0000 @@ -1,3 +1,3 @@ Depends: pacemaker, pacemaker-cli-utils -Restrictions: needs-root, isolation-container +Restrictions: needs-root, isolation-container, allow-stderr, skippable Tests: pacemaker
  4. Download patch debian/rules

    --- 2.0.4-2/debian/rules 2020-06-22 16:08:07.000000000 +0000 +++ 2.0.4-2ubuntu1/debian/rules 2020-07-06 19:04:45.000000000 +0000 @@ -18,6 +18,10 @@ ifeq ($(shell dpkg-vendor --query vendor -Npacemaker-resource-agents endif +# ftime causes deprecation errors now, but the clock_gettime replacement is +# disabled by default in 2.0.3. Enable it. +CPPFLAGS = -UPCMK_TIME_EMERGENCY_CGT + %: dh $@ --with python3 $(UBUNTU_EXCLUDES)
  5. Download patch debian/control

    --- 2.0.4-2/debian/control 2020-06-22 16:08:06.000000000 +0000 +++ 2.0.4-2ubuntu1/debian/control 2020-07-06 19:04:45.000000000 +0000 @@ -1,7 +1,8 @@ Source: pacemaker Section: admin Priority: optional -Maintainer: Debian HA Maintainers <debian-ha-maintainers@alioth-lists.debian.net> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian HA Maintainers <debian-ha-maintainers@alioth-lists.debian.net> Uploaders: Ferenc Wágner <wferi@debian.org>, Adrian Vondendriesch <adrian.vondendriesch@credativ.de>, @@ -102,6 +103,7 @@ Pre-Depends: ${misc:Pre-Depends}, Depends: corosync (>= 1.99), + crmsh, dbus, # the init script sources /lib/lsb/init-functions: lsb-base (>= 3.0-6), @@ -111,12 +113,12 @@ Depends: ${python3:Depends}, ${shlibs:Depends}, Recommends: - fence-agents, pacemaker-cli-utils, Suggests: # the fence_legacy helper uses /usr/sbin/stonith from cluster-glue: cluster-glue, - crmsh | pcs, + pcs, + fence-agents, Breaks: pacemaker-remote, # pulled in crm_attribute and crm_node, because they depend on the
  6. Download patch debian/patches/Enable-the-init-scripts-on-multi-user-runlevels.patch

    --- 2.0.4-2/debian/patches/Enable-the-init-scripts-on-multi-user-runlevels.patch 2020-06-22 16:08:07.000000000 +0000 +++ 2.0.4-2ubuntu1/debian/patches/Enable-the-init-scripts-on-multi-user-runlevels.patch 2020-07-06 19:04:45.000000000 +0000 @@ -10,8 +10,6 @@ installed daemons by default. daemons/pacemakerd/pacemaker.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) -diff --git a/daemons/execd/pacemaker_remote.in b/daemons/execd/pacemaker_remote.in -index f3ba8e8..1e3931f 100644 --- a/daemons/execd/pacemaker_remote.in +++ b/daemons/execd/pacemaker_remote.in @@ -14,8 +14,8 @@ @@ -25,8 +23,6 @@ index f3ba8e8..1e3931f 100644 # Short-Description: Manage the executor for Pacemaker Remote nodes # Description: Manage the executor for Pacemaker Remote nodes ### END INIT INFO -diff --git a/daemons/pacemakerd/pacemaker.in b/daemons/pacemakerd/pacemaker.in -index cd440dc..aeefad6 100644 --- a/daemons/pacemakerd/pacemaker.in +++ b/daemons/pacemakerd/pacemaker.in @@ -15,8 +15,8 @@
  7. Download patch debian/tests/pacemaker

    --- 2.0.4-2/debian/tests/pacemaker 2020-06-22 16:08:07.000000000 +0000 +++ 2.0.4-2ubuntu1/debian/tests/pacemaker 2020-07-06 17:22:14.000000000 +0000 @@ -4,6 +4,12 @@ set -e OUTPUT="${AUTOPKGTEST_ARTIFACTS:-.}/crm_mon.txt" +ulimit -H -l unlimited 2>/dev/null || { + # https://bugs.launchpad.net/bugs/1828228 + echo "test disabled for unprivileged namespaces" + exit 77 +} + # Wait more than dc-deadtime (20s by default) sleep 25
  8. Download patch debian/patches/Enable-redirecting-etc-init.d-script-calls-to-system.patch

    --- 2.0.4-2/debian/patches/Enable-redirecting-etc-init.d-script-calls-to-system.patch 2020-06-22 16:08:07.000000000 +0000 +++ 2.0.4-2ubuntu1/debian/patches/Enable-redirecting-etc-init.d-script-calls-to-system.patch 2020-07-06 19:04:45.000000000 +0000 @@ -7,8 +7,6 @@ Subject: Enable redirecting /etc/init.d/ daemons/pacemakerd/pacemaker.in | 4 ++++ 2 files changed, 8 insertions(+) -diff --git a/daemons/execd/pacemaker_remote.in b/daemons/execd/pacemaker_remote.in -index 2096c5f..f3ba8e8 100644 --- a/daemons/execd/pacemaker_remote.in +++ b/daemons/execd/pacemaker_remote.in @@ -20,6 +20,10 @@ @@ -22,8 +20,6 @@ index 2096c5f..f3ba8e8 100644 desc="Pacemaker Remote Executor" prog="pacemaker-remoted" -diff --git a/daemons/pacemakerd/pacemaker.in b/daemons/pacemakerd/pacemaker.in -index 6ed78a8..cd440dc 100644 --- a/daemons/pacemakerd/pacemaker.in +++ b/daemons/pacemakerd/pacemaker.in @@ -21,6 +21,10 @@
  9. Download patch debian/patches/alerts-make-the-scripts-executable.patch

    --- 2.0.4-2/debian/patches/alerts-make-the-scripts-executable.patch 2020-06-22 16:08:07.000000000 +0000 +++ 2.0.4-2ubuntu1/debian/patches/alerts-make-the-scripts-executable.patch 2020-07-06 19:04:45.000000000 +0000 @@ -10,8 +10,6 @@ Signed-off-by: Ferenc Wágner <wferi@nii extra/alerts/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/extra/alerts/Makefile.am b/extra/alerts/Makefile.am -index e798ae9..52f2e67 100644 --- a/extra/alerts/Makefile.am +++ b/extra/alerts/Makefile.am @@ -10,6 +10,6 @@
  10. Download patch debian/patches/Shipping-the-CTS-is-not-useful.patch

    --- 2.0.4-2/debian/patches/Shipping-the-CTS-is-not-useful.patch 2020-06-22 16:08:07.000000000 +0000 +++ 2.0.4-2ubuntu1/debian/patches/Shipping-the-CTS-is-not-useful.patch 2020-07-06 19:04:45.000000000 +0000 @@ -8,11 +8,9 @@ Subject: Shipping the CTS is not useful daemons/fenced/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -diff --git a/Makefile.am b/Makefile.am -index 475712f..99ed81d 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -57,7 +57,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = --with-brand="" \ +@@ -57,7 +57,7 @@ CORE_INSTALL = replace include lib daemons tools xml # Only these will get built with a plain "make" or "make clean" @@ -21,11 +19,9 @@ index 475712f..99ed81d 100644 SUBDIRS = $(CORE) doc extra maint tests -diff --git a/daemons/execd/Makefile.am b/daemons/execd/Makefile.am -index 6fd10a4..348f7e8 100644 --- a/daemons/execd/Makefile.am +++ b/daemons/execd/Makefile.am -@@ -11,7 +11,7 @@ include $(top_srcdir)/mk/common.mk +@@ -11,7 +11,7 @@ halibdir = $(CRM_DAEMON_DIR) @@ -34,11 +30,9 @@ index 6fd10a4..348f7e8 100644 initdir = $(INITDIR) init_SCRIPTS = pacemaker_remote -diff --git a/daemons/fenced/Makefile.am b/daemons/fenced/Makefile.am -index 43413e1..0755d00 100644 --- a/daemons/fenced/Makefile.am +++ b/daemons/fenced/Makefile.am -@@ -13,7 +13,7 @@ include $(top_srcdir)/mk/common.mk +@@ -13,7 +13,7 @@ halibdir = $(CRM_DAEMON_DIR)
  11. Download patch debian/patches/Fix-typo-evalute-evaluate.patch

    --- 2.0.4-2/debian/patches/Fix-typo-evalute-evaluate.patch 2020-06-22 16:08:07.000000000 +0000 +++ 2.0.4-2ubuntu1/debian/patches/Fix-typo-evalute-evaluate.patch 2020-07-06 19:04:45.000000000 +0000 @@ -6,11 +6,9 @@ Subject: Fix typo: evalute => evaluate daemons/controld/controld_control.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/daemons/controld/controld_control.c b/daemons/controld/controld_control.c -index 1ddcada..7922cd9 100644 --- a/daemons/controld/controld_control.c +++ b/daemons/controld/controld_control.c -@@ -542,7 +542,7 @@ static pcmk__cluster_option_t crmd_opts[] = { +@@ -542,7 +542,7 @@ "Zero disables polling, while positive values are an interval in seconds" "(unless other units are specified, for example \"5min\")", "15min", pcmk__valid_interval_spec,
  1. corosync
  2. corosync-qdevice
  3. kronosnet
  4. pacemaker