Merge ~rafaeldtinoco/ubuntu/+source/corosync:lp1869622-focal into ubuntu/+source/corosync:ubuntu/focal-devel

[Rafael David Tinoco]

BUG: https://bugs.launchpad.net/ubuntu/+source/corosync/+bug/1869622
PPA: https://launchpad.net/~ubuntu-server-ha/+archive/ubuntu/staging

[Rafael David Tinoco (rafaeldtinoco)]

For the 2 fixes:

LP: #1437359
LP: #1677684

I have submitted to upstream the following merge request:

https://salsa.debian.org/ha-team/corosync/-/merge_requests/2

All other fixes are part of stabilizing the already released v3.0.3 version.

[Christian Ehrhardt  (paelzer)]

* d/control: corosync binary depends on libqb-dev (LP: #1677684)

I'm ok with the change, we want to follow in 20.10 how Debian implements it to minimize delta again. E.g. if they split out corosync-blackbox to an extra package that is a fine solution as well to keep the amount of things installed down a bit.

The sub-dependencies of libqb-dev are not too bug (just libc and libqb0). I was wondering if it should be a recommends instead of a depends, but it actually is a dependency to properly execute things.
So for now +1 on this aspect and as I said on next version follow what the Debian MP resolved as.

---

* debian/corosync-notifyd.init: fix for 2 PIDFILEs declared (LP: #1437359)

Not much to say for this, having two seems wrong - the fix LGTM.
+1 on that as well.

[Christian Ehrhardt  (paelzer)]

Post v3.0.3 release fixes backported to Ubuntu (LP: #1869622)

I appreciate stabilizing complex software stacks before the LTS release. I was checking headers/tags as well as non-FF violation of these changes.

- Fixes for unchecked results are good
- extra assertions on remote input is good (ans more secure as well)
- 2x WFA fixes seem correct
- double free's/lack-of-free's
- initialize/leak fixes

The WFA changes were less trivial than the others, but they are indeed fixes and not features.

[Christian Ehrhardt  (paelzer)]

I found no new issues introduced by any of the changes in the PPAs build log.
I know you have some HA testing in place and assume it already ran through that?

No FF violations and changes LGTM in general.
So please go on and upload +1

review: Approve

[Rafael David Tinoco (rafaeldtinoco)]

Yep, my testing environment is already using the staging PPA:

(k)rafaeldtinoco@clufocal01:~$ dpkg -l | grep -i corosync
ii corosync 3.0.3-2ubuntu1+staging~1 amd64 cluster engine daemon and utilities
ii libcorosync-common4:amd64 3.0.3-2ubuntu1+staging~1 amd64 cluster engine common library

And I execute basic agents (fencing and resource) in all changes.

Thanks a lot for the review!

[Rafael David Tinoco (rafaeldtinoco)]

(c)rafaeldtinoco@clufocaldev:~/.../sources/ubuntu/corosync$ git push pkg upload/3.0.3-2ubuntu2
Enumerating objects: 44, done.
Counting objects: 100% (44/44), done.
Delta compression using up to 8 threads
Compressing objects: 100% (37/37), done.
Writing objects: 100% (37/37), 17.70 KiB | 2.21 MiB/s, done.
Total 37 (delta 12), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/corosync
 * [new tag] upload/3.0.3-2ubuntu2 -> upload/3.0.3-2ubuntu2

(c)rafaeldtinoco@clufocaldev:~/.../sources/ubuntu/corosync$ dput ubuntu ../corosync_3.0.3-2ubuntu2_source.changes
Checking signature on .changes
gpg: ../corosync_3.0.3-2ubuntu2_source.changes: Valid signature from A93E0E0AD83C0D0F
Checking signature on .dsc
gpg: ../corosync_3.0.3-2ubuntu2.dsc: Valid signature from A93E0E0AD83C0D0F
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading corosync_3.0.3-2ubuntu2.dsc: done.
  Uploading corosync_3.0.3-2ubuntu2.debian.tar.xz: done.
  Uploading corosync_3.0.3-2ubuntu2_source.buildinfo: done.
  Uploading corosync_3.0.3-2ubuntu2_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 38bd809..4db0d92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,33 @@
+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 <[e-mail]>  Sun, 29 Mar 2020 21:50:35 +0000
+
 corosync (3.0.3-2ubuntu1) focal; urgency=medium
 
   * Merge with Debian unstable (LP: #1864087). Remaining changes:
diff --git a/debian/control b/debian/control
index 22d4dd1..f939c65 100644
--- a/debian/control
+++ b/debian/control
@@ -55,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}
  .
diff --git a/debian/corosync-notifyd.init b/debian/corosync-notifyd.init
index c908618..837e48a 100644
--- a/debian/corosync-notifyd.init
+++ b/debian/corosync-notifyd.init
@@ -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
diff --git a/debian/patches/series b/debian/patches/series
index 3045c12..e776e44 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,22 @@ Enable-PrivateTmp-in-the-systemd-service-files.patch
 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
diff --git a/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-09f6d34a-logconfig-Remove-double-free-of-value.patch b/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-09f6d34a-logconfig-Remove-double-free-of-value.patch
new file mode 100644
index 0000000..bbb349f
--- /dev/null
+++ b/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-09f6d34a-logconfig-Remove-double-free-of-value.patch
@@ -0,0 +1,25 @@
+From 09f6d34aaad5742533e5b36fda656973ca1482e8 Mon Sep 17 00:00:00 2001
+From: Jan Friesse <[e-mail]>
+Date: Mon, 25 Nov 2019 18:26:35 +0100
+Subject: [PATCH] logconfig: Remove double free of value
+
+Signed-off-by: Jan Friesse <[e-mail]>
+
+Origin: upstream, https://github.com/corosync/corosync/commit/09f6d34aaad
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869622
+Reviewed-by: Rafael David Tinoco <[e-mail]>
+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;
+ 		}
+ 	}
diff --git a/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-0c118d8f-totemknet-Check-result-of-fcntl-O_NONBLOCK-call.patch b/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-0c118d8f-totemknet-Check-result-of-fcntl-O_NONBLOCK-call.patch
new file mode 100644
index 0000000..d42ce04
--- /dev/null
+++ b/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-0c118d8f-totemknet-Check-result-of-fcntl-O_NONBLOCK-call.patch
@@ -0,0 +1,32 @@
+From 0c118d8ff425ed6cf9af14b13a15ef62a91b86f6 Mon Sep 17 00:00:00 2001
+From: Jan Friesse <[e-mail]>
+Date: Tue, 26 Nov 2019 13:05:42 +0100
+Subject: [PATCH] totemknet: Check result of fcntl O_NONBLOCK call
+
+Signed-off-by: Jan Friesse <[e-mail]>
+
+Origin: upstream, https://github.com/corosync/corosync/commit/0c118d8ff4
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869622
+Reviewed-by: Rafael David Tinoco <[e-mail]>
+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);
diff --git a/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-0c16442f-votequorum-Change-check-of-expected_votes.patch b/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-0c16442f-votequorum-Change-check-of-expected_votes.patch
new file mode 100644
index 0000000..12ba58c
--- /dev/null
+++ b/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-0c16442f-votequorum-Change-check-of-expected_votes.patch
@@ -0,0 +1,51 @@
+From 0c16442f2d93f32a229b87d2672e2dc8025ec704 Mon Sep 17 00:00:00 2001
+From: Jan Friesse <[e-mail]>
+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 <[e-mail]>
+Reviewed-by: Christine Caulfield <[e-mail]>
+
+Origin: upstream, https://github.com/corosync/corosync/commit/0c16442f2d
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869622
+Reviewed-by: Rafael David Tinoco <[e-mail]>
+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;
+ 	}
diff --git a/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-1fb095b0-notifyd-Check-cmap_track_add-result.patch b/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-1fb095b0-notifyd-Check-cmap_track_add-result.patch
new file mode 100644
index 0000000..4d4c486
--- /dev/null
+++ b/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-1fb095b0-notifyd-Check-cmap_track_add-result.patch
@@ -0,0 +1,50 @@
+From 1fb095b0afe509305bffa8c7ca50c002e3965552 Mon Sep 17 00:00:00 2001
+From: Jan Friesse <[e-mail]>
+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 <[e-mail]>
+
+Origin: upstream, https://github.com/corosync/corosync/commit/1fb095b0af
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869622
+Reviewed-by: Rafael David Tinoco <[e-mail]>
+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 {
diff --git a/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-29109683-totemknet-Assert-strcpy-length.patch b/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-29109683-totemknet-Assert-strcpy-length.patch
new file mode 100644
index 0000000..1143dc4
--- /dev/null
+++ b/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-29109683-totemknet-Assert-strcpy-length.patch
@@ -0,0 +1,44 @@
+From 29109683cf29966181fcc6bc9ef50d0bd48e5778 Mon Sep 17 00:00:00 2001
+From: Jan Friesse <[e-mail]>
+Date: Tue, 26 Nov 2019 13:13:53 +0100
+Subject: [PATCH] totemknet: Assert strcpy length
+
+Signed-off-by: Jan Friesse <[e-mail]>
+
+Origin: upstream, https://github.com/corosync/corosync/commit/29109683cf
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869622
+Reviewed-by: Rafael David Tinoco <[e-mail]>
+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;
+ 
diff --git a/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-35c312f8-votequorum-Assert-copied-strings-length.patch b/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-35c312f8-votequorum-Assert-copied-strings-length.patch
new file mode 100644
index 0000000..efe45c3
--- /dev/null
+++ b/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-35c312f8-votequorum-Assert-copied-strings-length.patch
@@ -0,0 +1,38 @@
+From 35c312f810738faa2965bc8771528198b966ef39 Mon Sep 17 00:00:00 2001
+From: Jan Friesse <[e-mail]>
+Date: Tue, 26 Nov 2019 13:52:27 +0100
+Subject: [PATCH] votequorum: Assert copied strings length
+
+Signed-off-by: Jan Friesse <[e-mail]>
+
+Origin: upstream, https://github.com/corosync/corosync/commit/35c312f810
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869622
+Reviewed-by: Rafael David Tinoco <[e-mail]>
+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;
diff --git a/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-380b744e-totemknet-Don-t-mix-corosync-and-knet-error-codes.patch b/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-380b744e-totemknet-Don-t-mix-corosync-and-knet-error-codes.patch
new file mode 100644
index 0000000..6b92300
--- /dev/null
+++ b/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-380b744e-totemknet-Don-t-mix-corosync-and-knet-error-codes.patch
@@ -0,0 +1,52 @@
+From 380b744ec82e65f58eeeea53a99e0561b360e710 Mon Sep 17 00:00:00 2001
+From: Jan Friesse <[e-mail]>
+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 <[e-mail]>
+
+Origin: upstream, https://github.com/corosync/corosync/commit/380b744ec8
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869622
+Reviewed-by: Rafael David Tinoco <[e-mail]>
+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 (
diff --git a/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-56ee8503-quorumtool-Assert-copied-string-length.patch b/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-56ee8503-quorumtool-Assert-copied-string-length.patch
new file mode 100644
index 0000000..40daf9a
--- /dev/null
+++ b/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-56ee8503-quorumtool-Assert-copied-string-length.patch
@@ -0,0 +1,25 @@
+From 56ee850301ae08213e19a163443a8d0f0b5068aa Mon Sep 17 00:00:00 2001
+From: Jan Friesse <[e-mail]>
+Date: Tue, 26 Nov 2019 15:05:46 +0100
+Subject: [PATCH] quorumtool: Assert copied string length
+
+Signed-off-by: Jan Friesse <[e-mail]>
+
+Origin: upstream, https://github.com/corosync/corosync/commit/56ee850301
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869622
+Reviewed-by: Rafael David Tinoco <[e-mail]>
+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);
+ 	}
diff --git a/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-5f543465-quorumtool-exit-on-invalid-expected-votes.patch b/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-5f543465-quorumtool-exit-on-invalid-expected-votes.patch
new file mode 100644
index 0000000..b29602e
--- /dev/null
+++ b/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-5f543465-quorumtool-exit-on-invalid-expected-votes.patch
@@ -0,0 +1,33 @@
+From 5f543465bb3506b7f4929a426f1c22a9c854cecd Mon Sep 17 00:00:00 2001
+From: Jan Friesse <[e-mail]>
+Date: Wed, 4 Mar 2020 08:53:41 +0100
+Subject: [PATCH] quorumtool: exit on invalid expected votes
+
+Signed-off-by: Jan Friesse <[e-mail]>
+Reviewed-by: Christine Caulfield <[e-mail]>
+
+Origin: upstream, https://github.com/corosync/corosync/commit/5f543465bb
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869622
+Reviewed-by: Rafael David Tinoco <[e-mail]>
+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;
+ 				}
diff --git a/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-624b6a47-stats-Assert-value_len-when-value-is-needed.patch b/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-624b6a47-stats-Assert-value_len-when-value-is-needed.patch
new file mode 100644
index 0000000..ff09af0
--- /dev/null
+++ b/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-624b6a47-stats-Assert-value_len-when-value-is-needed.patch
@@ -0,0 +1,26 @@
+From 624b6a4707c688dae00f52833e0a2cd4f53fa38d Mon Sep 17 00:00:00 2001
+From: Jan Friesse <[e-mail]>
+Date: Tue, 26 Nov 2019 10:10:42 +0100
+Subject: [PATCH] stats: Assert value_len when value is needed
+
+Signed-off-by: Jan Friesse <[e-mail]>
+
+Origin: upstream, https://github.com/corosync/corosync/commit/624b6a4707
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869622
+Reviewed-by: Rafael David Tinoco <[e-mail]>
+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);
+ 	}
+ }
diff --git a/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-74eed54a-sync-Assert-sync_callbacks.name-length.patch b/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-74eed54a-sync-Assert-sync_callbacks.name-length.patch
new file mode 100644
index 0000000..fbd3d2c
--- /dev/null
+++ b/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-74eed54a-sync-Assert-sync_callbacks.name-length.patch
@@ -0,0 +1,27 @@
+From 74eed54a7fcd52924bdcb7fdf1226cceb51cfd22 Mon Sep 17 00:00:00 2001
+From: Jan Friesse <[e-mail]>
+Date: Tue, 26 Nov 2019 13:01:16 +0100
+Subject: [PATCH] sync: Assert sync_callbacks.name length
+
+Signed-off-by: Jan Friesse <[e-mail]>
+
+Origin: upstream, https://github.com/corosync/corosync/commit/74eed54a7f
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869622
+Reviewed-by: Rafael David Tinoco <[e-mail]>
+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;
diff --git a/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-89b0d62f-stats-Check-return-code-of-stats_map_get.patch b/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-89b0d62f-stats-Check-return-code-of-stats_map_get.patch
new file mode 100644
index 0000000..88c7060
--- /dev/null
+++ b/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-89b0d62f-stats-Check-return-code-of-stats_map_get.patch
@@ -0,0 +1,26 @@
+From 89b0d62f8bd9d5ba90db5a37866c029b821da838 Mon Sep 17 00:00:00 2001
+From: Jan Friesse <[e-mail]>
+Date: Tue, 26 Nov 2019 16:47:31 +0100
+Subject: [PATCH] stats: Check return code of stats_map_get
+
+Signed-off-by: Jan Friesse <[e-mail]>
+
+Origin: upstream, https://github.com/corosync/corosync/commit/89b0d62f8b
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869622
+Reviewed-by: Rafael David Tinoco <[e-mail]>
+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
diff --git a/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-8ce65bf9-votequorum-Reflect-runtime-change-of-2Node-to-WFA.patch b/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-8ce65bf9-votequorum-Reflect-runtime-change-of-2Node-to-WFA.patch
new file mode 100644
index 0000000..e47e65c
--- /dev/null
+++ b/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-8ce65bf9-votequorum-Reflect-runtime-change-of-2Node-to-WFA.patch
@@ -0,0 +1,80 @@
+From 8ce65bf951bc1e5b2d64b60ea027fbdc551d4fc8 Mon Sep 17 00:00:00 2001
+From: Jan Friesse <[e-mail]>
+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 <[e-mail]>
+Reviewed-by: Christine Caulfield <[e-mail]>
+
+Origin: upstream, https://github.com/corosync/corosync/commit/8ce65bf951
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869622
+Reviewed-by: Rafael David Tinoco <[e-mail]>
+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:
diff --git a/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-8ff7760c-cmapctl-Free-bin_value-on-error.patch b/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-8ff7760c-cmapctl-Free-bin_value-on-error.patch
new file mode 100644
index 0000000..1ffd93d
--- /dev/null
+++ b/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-8ff7760c-cmapctl-Free-bin_value-on-error.patch
@@ -0,0 +1,30 @@
+From 8ff7760ce5ba5e23cbdd0124a254a41aee6033ab Mon Sep 17 00:00:00 2001
+From: Jan Friesse <[e-mail]>
+Date: Tue, 26 Nov 2019 14:09:14 +0100
+Subject: [PATCH] cmapctl: Free bin_value on error
+
+Signed-off-by: Jan Friesse <[e-mail]>
+
+Origin: upstream, https://github.com/corosync/corosync/commit/8ff7760ce5
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869622
+Reviewed-by: Rafael David Tinoco <[e-mail]>
+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 ;
+ 	}
+ 
diff --git a/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-a24cbad5-totemconfig-Initialize-warnings-variable.patch b/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-a24cbad5-totemconfig-Initialize-warnings-variable.patch
new file mode 100644
index 0000000..334e407
--- /dev/null
+++ b/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-a24cbad5-totemconfig-Initialize-warnings-variable.patch
@@ -0,0 +1,26 @@
+From a24cbad59007ff2507cfa4cb562696f7c634f31f Mon Sep 17 00:00:00 2001
+From: Jan Friesse <[e-mail]>
+Date: Tue, 26 Nov 2019 13:02:04 +0100
+Subject: [PATCH] totemconfig: Initialize warnings variable
+
+Signed-off-by: Jan Friesse <[e-mail]>
+
+Origin: upstream, https://github.com/corosync/corosync/commit/a24cbad590
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869622
+Reviewed-by: Rafael David Tinoco <[e-mail]>
+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) {
diff --git a/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-c631951e-icmap-icmap_init_r-leaks-if-trie_create-fails.patch b/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-c631951e-icmap-icmap_init_r-leaks-if-trie_create-fails.patch
new file mode 100644
index 0000000..4a6a15f
--- /dev/null
+++ b/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-c631951e-icmap-icmap_init_r-leaks-if-trie_create-fails.patch
@@ -0,0 +1,32 @@
+From c631951ef5ab870b0877bd2c0909c8157c7eeb20 Mon Sep 17 00:00:00 2001
+From: Christine Caulfield <[e-mail]>
+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 <[e-mail]>
+Reviewed-by: Jan Friesse <[e-mail]>
+
+Origin: upstream, https://github.com/corosync/corosync/commit/c631951ef5
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869622
+Reviewed-by: Rafael David Tinoco <[e-mail]>
+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);
+ 
diff --git a/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-ca320bea-votequorum-set-wfa-status-only-on-startup.patch b/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-ca320bea-votequorum-set-wfa-status-only-on-startup.patch
new file mode 100644
index 0000000..cd88bcf
--- /dev/null
+++ b/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-ca320bea-votequorum-set-wfa-status-only-on-startup.patch
@@ -0,0 +1,67 @@
+From ca320beac25f82c0c555799e647a47975a333c28 Mon Sep 17 00:00:00 2001
+From: Jan Friesse <[e-mail]>
+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 <[e-mail]>
+Reviewed-by: Christine Caulfield <[e-mail]>
+
+Origin: upstream, https://github.com/corosync/corosync/commit/ca320beac2
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869622
+Reviewed-by: Rafael David Tinoco <[e-mail]>
+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.
diff --git a/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-efe48120-totemconfig-Free-leaks-found-by-coverity.patch b/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-efe48120-totemconfig-Free-leaks-found-by-coverity.patch
new file mode 100644
index 0000000..2dcf090
--- /dev/null
+++ b/debian/patches/ubuntu-v3.0.3-fixes/lp1869622-efe48120-totemconfig-Free-leaks-found-by-coverity.patch
@@ -0,0 +1,107 @@
+From efe48120e2d0db300a22da09c65465091ebfae68 Mon Sep 17 00:00:00 2001
+From: Jan Friesse <[e-mail]>
+Date: Mon, 25 Nov 2019 18:16:36 +0100
+Subject: [PATCH] totemconfig: Free leaks found by coverity
+
+Signed-off-by: Jan Friesse <[e-mail]>
+
+Origin: upstream, https://github.com/corosync/corosync/commit/efe48120e2
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869622
+Reviewed-by: Rafael David Tinoco <[e-mail]>
+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 (