Merge ~ahasenack/ubuntu/+source/nfs-utils:kinetic-blkmapd-invalid-free into ubuntu/+source/nfs-utils:ubuntu/kinetic-devel

[Andreas Hasenack]

Fix for a core dump in blkmapd. The linked SRU bug has testing instructions.

I haven't heard back from upstream yet, maybe the final commit will be different. I'll evaluate if/when that happens, and submit to debian.

Once LL is open, I'll propose the fix there too, and then proceed with the SRU.

PPA: https://launchpad.net/~ahasenack/+archive/ubuntu/blkmapd-invalid-free

[Bryce Harrington (bryce)]

See the jammy MP for review comments.

+1 to plan on waiting to LL opening, given that SRU processing is slow right now.

review: Approve

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

Approvers: ahasenack, bryce
Uploaders: ahasenack, bryce
MP auto-approved

review: Approve

[Andreas Hasenack (ahasenack)]

lunar isn't open yet, but it exists, and can be uploaded to (unapproved, though), which I did. I'll now proceed with this SRU.

[Andreas Hasenack (ahasenack)]

Uploaded:

Uploading nfs-utils_2.6.1-2ubuntu4.1.dsc
Uploading nfs-utils_2.6.1-2ubuntu4.1.debian.tar.xz
Uploading nfs-utils_2.6.1-2ubuntu4.1_source.buildinfo
Uploading nfs-utils_2.6.1-2ubuntu4.1_source.changes

diff --git a/debian/changelog b/debian/changelog
index 68e44d7..60bc1df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nfs-utils (1:2.6.1-2ubuntu4.1) kinetic; urgency=medium
+
+  * d/p/blkmapd-fix-invalid-free.patch: fix blkmapd crash due to invalid
+    free() (LP: #1979885)
+
+ -- Andreas Hasenack <[e-mail]>  Thu, 20 Oct 2022 11:45:11 -0300
+
 nfs-utils (1:2.6.1-2ubuntu4) kinetic; urgency=medium
 
   * No-change rebuild against libevent-core-2.1-7a
diff --git a/debian/patches/blkmapd-fix-invalid-free.patch b/debian/patches/blkmapd-fix-invalid-free.patch
new file mode 100644
index 0000000..bdcdc19
--- /dev/null
+++ b/debian/patches/blkmapd-fix-invalid-free.patch
@@ -0,0 +1,39 @@
+Description: remove invalid free() call
+ The data pointer is not allocated separatedly, it's the struct that needs to
+ be free()ed.
+ Originally reported by lixiaokeng via
+ https://www.spinics.net/lists/linux-nfs/msg87598.html with a slightly different
+ fix proposal.
+Author: Andreas Hasenack <[e-mail]>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1022185
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/nfs-utils/+bug/1979885
+Forwarded: https://lore.kernel.org/linux-nfs/CANYNYEG=utJ2pe+FtMWh8O+dz63R2wbzOC7ZVrvoqD=[e-mail]/T/#u
+Last-Update: 2022-10-20
+diff --git a/utils/blkmapd/device-discovery.c b/utils/blkmapd/device-discovery.c
+index 2736ac89..b3786a1f 100644
+--- a/utils/blkmapd/device-discovery.c
++++ b/utils/blkmapd/device-discovery.c
+@@ -188,7 +188,6 @@ static void bl_add_disk(char *filepath)
+ 
+ 	if (disk && diskpath) {
+ 		if (serial) {
+-			free(serial->data);
+ 			free(serial);
+ 		}
+ 		return;
+@@ -229,7 +228,6 @@ static void bl_add_disk(char *filepath)
+ 			disk->valid_path = path;
+ 		}
+ 		if (serial) {
+-			free(serial->data);
+ 			free(serial);
+ 		}
+ 	}
+@@ -242,7 +240,6 @@ static void bl_add_disk(char *filepath)
+ 		free(path);
+ 	}
+ 	if (serial) {
+-		free(serial->data);
+ 		free(serial);
+ 	}
+ 	return;
diff --git a/debian/patches/series b/debian/patches/series
index 34ce413..ea6946e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ svcgssd-document-missing-options.patch
 nfs-conf-manpage-missing-svcgssd-options.patch
 always-run-generator.patch
 fix-format-overflow-warning.patch
+blkmapd-fix-invalid-free.patch