Merge ~michal-maloszewski99/ubuntu/+source/pacemaker:pacemaker-jammy-lp2012740-pacemaker-controld-crash into ubuntu/+source/pacemaker:ubuntu/jammy-devel

[Michał Małoszewski]

PPA: https://launchpad.net/~michal-maloszewski99/+archive/ubuntu/pacemaker-ppa-jammy-lp2012740

[Michał Małoszewski (michal-maloszewski99)]

Results: (from http://autopkgtest.ubuntu.com/results/autopkgtest-jammy-michal-maloszewski99-pacemaker-ppa-jammy-lp2012740/?format=plain)
  pacemaker @ amd64:
    http://autopkgtest.ubuntu.com/results/autopkgtest-jammy-michal-maloszewski99-pacemaker-ppa-jammy-lp2012740/jammy/amd64/p/pacemaker/20230403_143002_06adf@/log.gz
    03.04.23 14:30:02 ✅ Triggers: pacemaker/2.1.2-1ubuntu4~ppa1
  pacemaker @ arm64:
    http://autopkgtest.ubuntu.com/results/autopkgtest-jammy-michal-maloszewski99-pacemaker-ppa-jammy-lp2012740/jammy/arm64/p/pacemaker/20230403_142842_df7de@/log.gz
    03.04.23 14:28:42 ✅ Triggers: pacemaker/2.1.2-1ubuntu4~ppa1
  pacemaker @ armhf:
    http://autopkgtest.ubuntu.com/results/autopkgtest-jammy-michal-maloszewski99-pacemaker-ppa-jammy-lp2012740/jammy/armhf/p/pacemaker/20230403_142341_a9c72@/log.gz
    03.04.23 14:23:41 ⚪ Triggers: pacemaker/2.1.2-1ubuntu4~ppa1
      No valid results
  pacemaker @ ppc64el:
    http://autopkgtest.ubuntu.com/results/autopkgtest-jammy-michal-maloszewski99-pacemaker-ppa-jammy-lp2012740/jammy/ppc64el/p/pacemaker/20230403_142534_9e548@/log.gz
    03.04.23 14:25:34 ✅ Triggers: pacemaker/2.1.2-1ubuntu4~ppa1
  pacemaker @ s390x:
    http://autopkgtest.ubuntu.com/results/autopkgtest-jammy-michal-maloszewski99-pacemaker-ppa-jammy-lp2012740/jammy/s390x/p/pacemaker/20230403_142240_06adf@/log.gz
    03.04.23 14:22:40 ✅ Triggers: pacemaker/2.1.2-1ubuntu4~ppa1
Running: (none)
Waiting: (none)

[Michał Małoszewski (michal-maloszewski99)]

https://docs.google.com/document/d/1Rkimq-xauoIWSrqiPb7Y1F5dT4KKcpS3FWUsgV6SYzM/edit?usp=sharing - SRU template

[Christian Ehrhardt  (paelzer)]

There are build warnings in a similar named area:
/<<PKGBUILDDIR>>/lib/lrmd/lrmd_client.c:239: warning: argument 'Executor' of command @param is not found in the argument list of lrmd_free_event(lrmd_event_data_t *event)
/<<PKGBUILDDIR>>/lib/lrmd/lrmd_client.c:242: warning: The following parameter of lrmd_free_event(lrmd_event_data_t *event) is not documented:

But on check they have nothing to do with it, fine in that regard.

---

The dep-3 header says backport, should say upstream as there are no changes.

---

The SRU template section about "where error occur" is again a rather generic blurb.
Point to where issues would occur, in this case we only change the lmrd, so tell people that issues - if any - should be in the behavior of local resource management daemon.
And further, maybe mention that it is about even dispatching and memory allocation.

---

Version number for SRU - really?

review: Needs Fixing

[Michał Małoszewski (michal-maloszewski99)]

Fixed, please re-review.

[Christian Ehrhardt  (paelzer)]

Done, small things fixed now (in SRU text) good to go

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: paelzer, michal-maloszewski99
Uploaders: paelzer
MP auto-approved

review: Approve

[Christian Ehrhardt  (paelzer)]

Uploading pacemaker_2.1.2-1ubuntu3.1.dsc
Uploading pacemaker_2.1.2-1ubuntu3.1.debian.tar.xz
Uploading pacemaker_2.1.2-1ubuntu3.1_source.buildinfo
Uploading pacemaker_2.1.2-1ubuntu3.1_source.changes

diff --git a/debian/changelog b/debian/changelog
index cf9ca1e..1066d51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pacemaker (2.1.2-1ubuntu3.1) jammy; urgency=medium
+
+  * d/p/jammy-avoid-double-free-during-notify-operation.patch:
+    Fix a regression introduced by 31c7fa8, causing a double-free in
+    notify operations (LP: #2012740)
+
+ -- Michal Maloszewski <[e-mail]>  Fri, 31 Mar 2023 20:55:24 +0200
+
 pacemaker (2.1.2-1ubuntu3) jammy; urgency=medium
 
   * d/control: make pacemaker-cli-utils depend on resource-agents-base.
diff --git a/debian/patches/jammy-avoid-double-free-during-notify-operation.patch b/debian/patches/jammy-avoid-double-free-during-notify-operation.patch
new file mode 100644
index 0000000..c05c2fe
--- /dev/null
+++ b/debian/patches/jammy-avoid-double-free-during-notify-operation.patch
@@ -0,0 +1,37 @@
+From ed8b2c86ab77aaa3d7fd688c049ad5e1b922a9c6 Mon Sep 17 00:00:00 2001
+From: Reid Wahl <[e-mail]>
+Date: Thu, 13 Jan 2022 02:56:55 -0800
+Subject: [PATCH] Fix: liblrmd: Avoid double-free during notify operation
+Description: Avoid double-free during notify operation
+Origin: upstream, https://github.com/ClusterLabs/pacemaker/commit/ed8b2c86ab77aaa3d7fd688c049ad5e1b922a9c6
+Bug: https://bugzilla.redhat.com/show_bug.cgi?id=2039675
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/pacemaker/+bug/2012740
+Last-Update: 2023-03-31
+---
+ lib/lrmd/lrmd_client.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+--- a/lib/lrmd/lrmd_client.c
++++ b/lib/lrmd/lrmd_client.c
+@@ -306,9 +306,10 @@
+         event.user_data = crm_element_value(msg, F_LRMD_RSC_USERDATA_STR);
+         event.type = lrmd_event_exec_complete;
+ 
+-        // No need to duplicate the memory, so don't use setter functions
+-        event.output = crm_element_value(msg, F_LRMD_RSC_OUTPUT);
+-        event.exit_reason = crm_element_value(msg, F_LRMD_RSC_EXIT_REASON);
++        /* output and exit_reason may be freed by a callback */
++        event.output = crm_element_value_copy(msg, F_LRMD_RSC_OUTPUT);
++        lrmd__set_result(&event, event.rc, event.op_status,
++                         crm_element_value(msg, F_LRMD_RSC_EXIT_REASON));
+ 
+         event.params = xml2list(msg);
+     } else if (pcmk__str_eq(type, LRMD_OP_NEW_CLIENT, pcmk__str_none)) {
+@@ -325,6 +326,7 @@
+     if (event.params) {
+         g_hash_table_destroy(event.params);
+     }
++    lrmd__reset_result(&event);
+ }
+ 
+ // \return Always 0, to indicate that IPC mainloop source should be kept
diff --git a/debian/patches/series b/debian/patches/series
index 5e13446..d15b73d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ alerts-make-the-scripts-executable.patch
 Shipping-the-CTS-is-not-useful.patch
 libpacemaker-calls-into-libstonithd-directly.patch
 Always-run-Inkscape-under-the-C.UTF-8-locale.patch
+jammy-avoid-double-free-during-notify-operation.patch