Merge ~enr0n/ubuntu/+source/util-linux:lp2015355 into ubuntu/+source/util-linux:ubuntu/focal-updates

[Nick Rosbrook]

Backport upstream patches to fix false detection of atari partitions. I have built this in my PPA: https://launchpad.net/~enr0n/+archive/ubuntu/proposed-migration/+packages?field.name_filter=util-linux&field.status_filter=published&field.series_filter=.

autopkgtest passed locally on amd64.

[Steve Langasek (vorlon)]

review: Approve

Unmerged commits

171ef76... by Nick Rosbrook on 2023-05-30

changelog

0dab1f4... by Nick Rosbrook on 2023-05-30

debian/patches/tests-update-atari-blkid-tests.patch

Cherry-pick upstream patch (partially). The upstream commit makes
changes to binary data in the tests directory, and this cannot be
represented in a quilt diff. Modify the binaries directly and list them
in debian/source/include-binaries, except for atari-icd.img.xz, which is
a total removal. For this, add a workaround in the test scripts to
explicitly ignore this test data.

f929f74... by Nick Rosbrook on 2023-05-30

debian/patches/tests-update-atari-partx-tests.patch

Cherry-pick upstream patch.

d0fd7d7... by Nick Rosbrook on 2023-05-30

debian/patches/libblkid-make-Atari-more-robust.patch

Cherry-pick upstream patch.

998da78... by Nick Rosbrook on 2023-05-30

debian/patches/libblkid-fix-Atari-prober-logic.patch

Cherry-pick upstream patch.

diff --git a/debian/changelog b/debian/changelog
index 4da09c8..8cfe069 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+util-linux (2.34-0.1ubuntu9.4) focal; urgency=medium
+
+  * Fix false atari partition detection (LP: #2015355):
+    - Backport upstream patches to fix atari partition detection in libblkid:
+      + debian/patches/libblkid-fix-Atari-prober-logic.patch
+      + debian/patches/libblkid-make-Atari-more-robust.patch
+    - Backport upstream patches to fix atari tests:
+      + debian/patches/tests-update-atari-partx-tests.patch
+      + debian/patches/tests-update-atari-blkid-tests.patch
+      + debian/source/include-binaries: Track changes that are not
+        representable in quilt patch.
+
+ -- Nick Rosbrook <[e-mail]>  Tue, 30 May 2023 11:42:35 -0400
+
 util-linux (2.34-0.1ubuntu9.3) focal-security; urgency=medium
 
   * SECURITY UPDATE: Unauthorized unmount of FUSE filesystems belonging to
diff --git a/debian/patches/libblkid-fix-Atari-prober-logic.patch b/debian/patches/libblkid-fix-Atari-prober-logic.patch
new file mode 100644
index 0000000..1c60685
--- /dev/null
+++ b/debian/patches/libblkid-fix-Atari-prober-logic.patch
@@ -0,0 +1,47 @@
+From: Karel Zak <[e-mail]>
+Date: Fri, 9 Oct 2020 13:06:08 +0200
+Subject: libblkid: fix Atari prober logic
+
+Addresses: https://github.com/karelzak/util-linux/issues/1159
+Addresses: https://github.com/karelzak/util-linux/issues/1116
+Signed-off-by: Karel Zak <[e-mail]>
+
+Origin: upstream, https://github.com/util-linux/util-linux/commit/2cc76d50d7a14bef8e7b07fab11b26c9e49d36a2
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/util-linux/+bug/2015355
+---
+ libblkid/src/partitions/atari.c | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/libblkid/src/partitions/atari.c b/libblkid/src/partitions/atari.c
+index 48c322670..03ec6084c 100644
+--- a/libblkid/src/partitions/atari.c
++++ b/libblkid/src/partitions/atari.c
+@@ -199,11 +199,10 @@ static int probe_atari_pt(blkid_probe pr,
+ 
+ 	hdsize = blkid_probe_get_size(pr) / 512;
+ 
+-	/* Look for validly looking primary partition */
+-	for (i = 0; ; i++) {
+-		if (i >= ARRAY_SIZE(rs->part))
+-			goto nothing;
+-
++	/*
++	 * At least one valid partition required
++	 */
++	for (i = 0; i < 4; i++) {
+ 		if (IS_PARTDEF_VALID(rs->part[i], hdsize)) {
+ 			if (blkid_probe_set_magic(pr,
+ 					offsetof(struct atari_rootsector, part[i]),
+@@ -214,6 +213,9 @@ static int probe_atari_pt(blkid_probe pr,
+ 		}
+ 	}
+ 
++	if (i == 4)
++		goto nothing;
++
+ 	if (blkid_partitions_need_typeonly(pr))
+ 		/* caller does not ask for details about partitions */
+ 		return BLKID_PROBE_OK;
+-- 
+2.39.2
+
diff --git a/debian/patches/libblkid-make-Atari-more-robust.patch b/debian/patches/libblkid-make-Atari-more-robust.patch
new file mode 100644
index 0000000..9e1b94c
--- /dev/null
+++ b/debian/patches/libblkid-make-Atari-more-robust.patch
@@ -0,0 +1,120 @@
+From: Karel Zak <[e-mail]>
+Date: Tue, 13 Oct 2020 16:19:20 +0200
+Subject: libblkid: make Atari more robust
+
+* ignore large disks
+* check in-table stored device size
+* check bad sectors list
+* check partition dimensions against in-table device size
+
+Addresses: https://github.com/karelzak/util-linux/issues/1159
+Signed-off-by: Karel Zak <[e-mail]>
+
+Origin: upstream, https://github.com/util-linux/util-linux/commit/282ceadc3a72fc07dd0388b8880fd751490bb87f
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/util-linux/+bug/2015355
+---
+ libblkid/src/partitions/atari.c | 57 +++++++++++++++++++++++++--------
+ 1 file changed, 43 insertions(+), 14 deletions(-)
+
+diff --git a/libblkid/src/partitions/atari.c b/libblkid/src/partitions/atari.c
+index 03ec6084c..c3f77117a 100644
+--- a/libblkid/src/partitions/atari.c
++++ b/libblkid/src/partitions/atari.c
+@@ -74,16 +74,27 @@ static int linux_isalnum(unsigned char c) {
+ 
+ #define IS_ACTIVE(partdef) ((partdef).flags & 1)
+ 
+-#define IS_PARTDEF_VALID(partdef, hdsize) \
+-	( \
+-		(partdef).flags & 1 && \
+-		isalnum((partdef).id[0]) && \
+-		isalnum((partdef).id[1]) && \
+-		isalnum((partdef).id[2]) && \
+-		be32_to_cpu((partdef).start) <= (hdsize) && \
+-		be32_to_cpu((partdef).start) + \
+-			be32_to_cpu((partdef).size) <= (hdsize) \
+-	)
++static int is_valid_dimension(uint32_t start, uint32_t size, uint32_t maxoff)
++{
++	uint64_t end = start + size;
++
++	return  end >= start
++		&& 0 < start && start <= maxoff
++		&& 0 < size && size <= maxoff
++		&& 0 < end && end <= maxoff;
++}
++
++static int is_valid_partition(struct atari_part_def *part, uint32_t maxoff)
++{
++	uint32_t start = be32_to_cpu(part->start),
++		 size = be32_to_cpu(part->size);
++
++	return (part->flags & 1)
++		&& isalnum(part->id[0])
++		&& isalnum(part->id[1])
++		&& isalnum(part->id[2])
++		&& is_valid_dimension(start, size, maxoff);
++}
+ 
+ static int is_id_common(char *id)
+ {
+@@ -184,12 +195,20 @@ static int probe_atari_pt(blkid_probe pr,
+ 	unsigned i;
+ 	int has_xgm = 0;
+ 	int rc = 0;
+-	off_t hdsize;
++	uint32_t rssize;	/* size in sectors from root sector */
++	uint64_t size;		/* size in sectors from system */
+ 
+ 	/* Atari partition is not defined for other sector sizes */
+ 	if (blkid_probe_get_sectorsize(pr) != 512)
+ 		goto nothing;
+ 
++	size = blkid_probe_get_size(pr) / 512;
++
++	/* Atari is not well defined to support large disks */
++	if (size > INT32_MAX)
++		goto nothing;
++
++	/* read root sector */
+ 	rs = (struct atari_rootsector *) blkid_probe_get_sector(pr, 0);
+ 	if (!rs) {
+ 		if (errno)
+@@ -197,13 +216,24 @@ static int probe_atari_pt(blkid_probe pr,
+ 		goto nothing;
+ 	}
+ 
+-	hdsize = blkid_probe_get_size(pr) / 512;
++	rssize = be32_to_cpu(rs->hd_size);
++
++	/* check number of sectors stored in the root sector */
++	if (rssize < 2 || rssize > size)
++		goto nothing;
++
++	/* check list of bad blocks */
++	if ((rs->bsl_start || rs->bsl_len)
++	    && !is_valid_dimension(be32_to_cpu(rs->bsl_start),
++				   be32_to_cpu(rs->bsl_len),
++				   rssize))
++		goto nothing;
+ 
+ 	/*
+ 	 * At least one valid partition required
+ 	 */
+ 	for (i = 0; i < 4; i++) {
+-		if (IS_PARTDEF_VALID(rs->part[i], hdsize)) {
++		if (is_valid_partition(&rs->part[i], rssize)) {
+ 			if (blkid_probe_set_magic(pr,
+ 					offsetof(struct atari_rootsector, part[i]),
+ 					sizeof(rs->part[i].flags) + sizeof(rs->part[i].id),
+@@ -235,7 +265,6 @@ static int probe_atari_pt(blkid_probe pr,
+ 			blkid_partlist_increment_partno(ls);
+ 			continue;
+ 		}
+-
+ 		if (!memcmp(p->id, "XGM", 3)) {
+ 			has_xgm = 1;
+ 			rc = parse_extended(pr, ls, tab, p);
+-- 
+2.39.2
+
diff --git a/debian/patches/series b/debian/patches/series
index df2692e..32316aa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,7 @@ CVE-2021-3995-1.patch
 CVE-2021-3995-2.patch
 CVE-2021-3996-1.patch
 CVE-2021-3996-2.patch
+libblkid-fix-Atari-prober-logic.patch
+libblkid-make-Atari-more-robust.patch
+tests-update-atari-partx-tests.patch
+tests-update-atari-blkid-tests.patch
diff --git a/debian/patches/tests-update-atari-blkid-tests.patch b/debian/patches/tests-update-atari-blkid-tests.patch
new file mode 100644
index 0000000..8e375c9
--- /dev/null
+++ b/debian/patches/tests-update-atari-blkid-tests.patch
@@ -0,0 +1,83 @@
+From 0d061b6e68bc74ce7d61524097b5d0f3becee437 Mon Sep 17 00:00:00 2001
+From: Karel Zak <[e-mail]>
+Date: Tue, 13 Oct 2020 16:29:19 +0200
+Subject: [PATCH] tests: update atari blkid tests
+
+Origin: upstream, https://github.com/util-linux/util-linux/commit/0d061b6e68bc74ce7d61524097b5d0f3becee437
+Bug-Ubuntu: https://launchpad.net/bugs/2015355
+
+Note for Ubuntu: The original binary diff in the upstream commit cannot be
+represented in this patch. For the complete removal of atari-icd.img.xz,
+instead patch the test script to skip the test using that data. For the changes
+in atari-primary.img.xz and atari-xgm.img.xz, the changes are made in the
+tarball using debian/source/include-binaries.
+
+The old images of the atari label are truncated and in-table stored
+sizes do not match with real images sizes -- libblkid checks it now.
+
+I have no idea how to generate ICD format, let's ignore it in tests
+for now.
+
+Signed-off-by: Karel Zak <[e-mail]>
+---
+ tests/expected/blkid/lowprobe-pt-atari-icd     |   8 --------
+ tests/expected/blkid/lowprobe-pt-atari-primary |   3 +++
+ tests/expected/blkid/lowprobe-pt-atari-xgm     |  10 +++-------
+
+--- a/tests/expected/blkid/lowprobe-pt-atari-icd
++++ /dev/null
+@@ -1,8 +0,0 @@
+-size: 8388608, sector size: 512, PT: atari, offset: 0, id=(null)
+----
+-#1:         65       4032  0x0 type='FAT'
+-#2:       4097        904  0x0 type='FOO'
+-#4:      12289       4096  0x0 type='BAR'
+-#5:       5002       1999  0x0 type='GEM'
+-#6:       7003       3238  0x0 type='RAW'
+-#7:      10241       2048  0x0 type='RAW'
+--- /dev/null
++++ b/tests/expected/blkid/lowprobe-pt-atari-primary
+@@ -0,0 +1,3 @@
++size: 5242880, sector size: 512, PT: atari, offset: 0, id=(null)
++---
++#1:          2      10238  0x0 type='RAW'
+--- a/tests/expected/blkid/lowprobe-pt-atari-xgm
++++ b/tests/expected/blkid/lowprobe-pt-atari-xgm
+@@ -1,8 +1,4 @@
+-size: 8388608, sector size: 512, PT: atari, offset: 0, id=(null)
++size: 5242880, sector size: 512, PT: atari, offset: 0, id=(null)
+ ---
+-#1:         65       4032  0x0 type='FAT'
+-#2:       4097        904  0x0 type='FOO'
+-#3:       5002       1999  0x0 type='GEM'
+-#4:       7003       3238  0x0 type='RAW'
+-#5:      10241       2048  0x0 type='RAW'
+-#6:      12289       4096  0x0 type='BAR'
++#1:          2          9  0x0 type='RAW'
++#2:         14      10226  0x0 type='RAW'
+--- a/tests/ts/blkid/lowprobe-pt
++++ b/tests/ts/blkid/lowprobe-pt
+@@ -30,6 +30,10 @@
+ 
+ for img in $(ls $TS_SELF/images-pt/*.img.xz | sort); do
+ 	name=$(basename $img .img.xz)
++	if [[ "$name" == "atari-icd" ]]; then
++            continue
++	fi
++
+ 	outimg=$TS_OUTDIR/images-pt/${name}.img
+ 
+ 	ts_init_subtest $name
+--- a/tests/ts/partx/partx-image
++++ b/tests/ts/partx/partx-image
+@@ -29,6 +29,10 @@
+ mkdir -p $TS_OUTDIR/images-pt
+ for img in $TS_IMGDIR/*.img.xz; do
+ 	name=$(basename $img .img.xz)
++	if [[ "$name" == "atari-icd" ]]; then
++            continue
++	fi
++
+ 	outimg=$TS_OUTDIR/images-pt/${name}.img
+ 
+ 	ts_init_subtest $name
diff --git a/debian/patches/tests-update-atari-partx-tests.patch b/debian/patches/tests-update-atari-partx-tests.patch
new file mode 100644
index 0000000..9790f44
--- /dev/null
+++ b/debian/patches/tests-update-atari-partx-tests.patch
@@ -0,0 +1,53 @@
+From 017c0308c7d3b0d84bfc11e5863220bc32d640ba Mon Sep 17 00:00:00 2001
+From: Karel Zak <[e-mail]>
+Date: Tue, 13 Oct 2020 18:34:39 +0200
+Subject: [PATCH] tests: update atari partx tests
+
+Origin: upstream, https://github.com/util-linux/util-linux/commit/017c0308c7d3b0d84bfc11e5863220bc32d640ba
+Bug-Ubuntu: https://launchpad.net/bugs/2015355
+
+Signed-off-by: Karel Zak <[e-mail]>
+---
+ tests/expected/partx/partx-image-atari-icd     |  7 -------
+ tests/expected/partx/partx-image-atari-primary |  2 ++
+ tests/expected/partx/partx-image-atari-xgm     | 10 +++-------
+ 3 files changed, 5 insertions(+), 14 deletions(-)
+ delete mode 100644 tests/expected/partx/partx-image-atari-icd
+ create mode 100644 tests/expected/partx/partx-image-atari-primary
+
+diff --git a/tests/expected/partx/partx-image-atari-icd b/tests/expected/partx/partx-image-atari-icd
+deleted file mode 100644
+index 8677dff03f..0000000000
+--- a/tests/expected/partx/partx-image-atari-icd
++++ /dev/null
+@@ -1,7 +0,0 @@
+-NR START   END SECTORS   SIZE NAME UUID
+- 1    65  4096    4032     2M      
+- 2  4097  5000     904   452K      
+- 4 12289 16384    4096     2M      
+- 5  5002  7000    1999 999.5K      
+- 6  7003 10240    3238   1.6M      
+- 7 10241 12288    2048     1M      
+diff --git a/tests/expected/partx/partx-image-atari-primary b/tests/expected/partx/partx-image-atari-primary
+new file mode 100644
+index 0000000000..044d319be8
+--- /dev/null
++++ b/tests/expected/partx/partx-image-atari-primary
+@@ -0,0 +1,2 @@
++NR START   END SECTORS SIZE NAME UUID
++ 1     2 10239   10238   5M      
+diff --git a/tests/expected/partx/partx-image-atari-xgm b/tests/expected/partx/partx-image-atari-xgm
+index 248d6a56a0..557327c04e 100644
+--- a/tests/expected/partx/partx-image-atari-xgm
++++ b/tests/expected/partx/partx-image-atari-xgm
+@@ -1,7 +1,3 @@
+-NR START   END SECTORS   SIZE NAME UUID
+- 1    65  4096    4032     2M      
+- 2  4097  5000     904   452K      
+- 3  5002  7000    1999 999.5K      
+- 4  7003 10240    3238   1.6M      
+- 5 10241 12288    2048     1M      
+- 6 12289 16384    4096     2M      
++NR START   END SECTORS SIZE NAME UUID
++ 1     2    10       9 4.5K      
++ 2    14 10239   10226   5M      
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
new file mode 100644
index 0000000..e41f987
--- /dev/null
+++ b/debian/source/include-binaries
@@ -0,0 +1,2 @@
+tests/ts/blkid/images-pt/atari-primary.img.xz
+tests/ts/blkid/images-pt/atari-xgm.img.xz
diff --git a/tests/ts/blkid/images-pt/atari-primary.img.xz b/tests/ts/blkid/images-pt/atari-primary.img.xz
new file mode 100644
index 0000000..6f915fa
Binary files /dev/null and b/tests/ts/blkid/images-pt/atari-primary.img.xz differ
diff --git a/tests/ts/blkid/images-pt/atari-xgm.img.xz b/tests/ts/blkid/images-pt/atari-xgm.img.xz
index bc2b8f9..a98c02d 100644
Binary files a/tests/ts/blkid/images-pt/atari-xgm.img.xz and b/tests/ts/blkid/images-pt/atari-xgm.img.xz differ