Merge ~slyon/ubuntu/+source/tpm2-tss:disable-s390x-features into ubuntu/+source/tpm2-tss:ubuntu/devel

[Lukas Märdian]

19c52de... by Lukas Märdian on 2023-08-22

Fix big-endian issue in tcti-spi-helper

debian/patches/fix-tcti-spi-helper-big-endian.patch

c9ad1b2... by Lukas Märdian on 2023-08-22

Fix failing tests on big-endian, due to broken binary test input files

debian/patches/disable-tests-on-big-endian.patch

fc4c2cb... by Lukas Märdian on 2023-08-22

Update changelog

[Lukas Märdian (slyon)]

I uploaded this into the archive myself. It also got accepted into Debian meanwhile.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 44f460d..42a9b2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+tpm2-tss (4.0.1-2ubuntu2) mantic; urgency=medium
+
+  * Fix FTBFS due to big-endian conversion issues (LP: #2031020)
+    + Apply tcti libtpms fixes for s390x s390x
+      d/p/0001-tss2-tcti-tcti-libtpms-fix-test-failure-on-big-endia.patch
+    + Fix big-endian issue in tcti-spi-helper
+      d/p/fix-tcti-spi-helper-big-endian.patch
+    + Fix failing tests on big-endian, due to broken binary test input files
+      d/p/disable-tests-on-big-endian.patch
+
+ -- Lukas Märdian <[e-mail]>  Tue, 22 Aug 2023 13:58:05 +0200
+
 tpm2-tss (4.0.1-2ubuntu1) mantic; urgency=medium
 
   * Merge from Debian unstable. Remaining changes:
diff --git a/debian/patches/0001-tss2-tcti-tcti-libtpms-fix-test-failure-on-big-endia.patch b/debian/patches/0001-tss2-tcti-tcti-libtpms-fix-test-failure-on-big-endia.patch
new file mode 100644
index 0000000..3868e44
--- /dev/null
+++ b/debian/patches/0001-tss2-tcti-tcti-libtpms-fix-test-failure-on-big-endia.patch
@@ -0,0 +1,52 @@
+From 9ae85535d6383a50731ad9e70c16b55622e126ae Mon Sep 17 00:00:00 2001
+From: "Ying-Chun Liu (PaulLiu)" <[e-mail]>
+Date: Sun, 6 Aug 2023 05:24:02 +0800
+Subject: [PATCH] tss2-tcti: tcti-libtpms: fix test failure on big-endian
+ platform
+
+Due to tcti_libtpms->response_len and tcti_libtpms->response_buffer_len
+are size_t. We cannot convert the (size_t *) to (uint32_t *) on big-endian
+platforms. Thus we create temp uint32_t variables. Make the call and
+then assign it back to size_t variables.
+
+This commit partially fix the test failure on big-endian platforms.
+
+Signed-off-by: Ying-Chun Liu (PaulLiu) <[e-mail]>
+---
+ src/tss2-tcti/tcti-libtpms.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/src/tss2-tcti/tcti-libtpms.c b/src/tss2-tcti/tcti-libtpms.c
+index 922a4402..10ed913d 100644
+--- a/src/tss2-tcti/tcti-libtpms.c
++++ b/src/tss2-tcti/tcti-libtpms.c
+@@ -370,6 +370,8 @@ tcti_libtpms_transmit(
+     tpm_header_t header;
+     TSS2_RC rc;
+     TPM_RESULT ret;
++    uint32_t resp_size;
++    uint32_t respbufsize;
+ 
+     rc = tcti_common_transmit_checks(tcti_common, cmd_buf, TCTI_LIBTPMS_MAGIC);
+     if (rc != TSS2_RC_SUCCESS) {
+@@ -386,11 +388,16 @@ tcti_libtpms_transmit(
+     }
+ 
+     LOGBLOB_DEBUG(cmd_buf, size, "Sending command with TPM_CC 0x%" PRIx32, header.size);
++    resp_size = (uint32_t) tcti_libtpms->response_len;
++    respbufsize = (uint32_t) tcti_libtpms->response_buffer_len;
+     LIBTPMS_API_CALL(fail, tcti_libtpms, TPMLIB_Process, &tcti_libtpms->response_buffer,
+-                                                         (uint32_t *) &tcti_libtpms->response_len,
+-                                                         (uint32_t *) &tcti_libtpms->response_buffer_len,
++                                                         (uint32_t *) &resp_size,
++                                                         (uint32_t *) &respbufsize,
+                                                          (uint8_t *) cmd_buf,
+                                                          size);
++    tcti_libtpms->response_len = resp_size;
++    tcti_libtpms->response_buffer_len = respbufsize;
++
+     rc = tcti_libtpms_store_state(tcti_libtpms);
+     if (rc != TSS2_RC_SUCCESS) {
+         LOG_ERROR("Failed to store state file");
+-- 
+2.40.1
diff --git a/debian/patches/disable-tests-on-big-endian.patch b/debian/patches/disable-tests-on-big-endian.patch
new file mode 100644
index 0000000..68a3670
--- /dev/null
+++ b/debian/patches/disable-tests-on-big-endian.patch
@@ -0,0 +1,60 @@
+Description: The test files (binaries) for IMA and system events contain little
+ endian integers which are assigned to the big endian integers with memcpy.
+ The conversion has to be fixed.
+Author: Lukas Märdian <[e-mail]>
+Bug: https://github.com/tpm2-software/tpm2-tss/issues/2531
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2031020
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1040521
+Forwarded: not-needed
+Last-Update: 2023-08-22
+---
+--- tpm2-tss-4.0.1.orig/test/unit/fapi-eventlog.c
++++ tpm2-tss-4.0.1/test/unit/fapi-eventlog.c
+@@ -8,6 +8,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <endian.h>
+ #include <stdarg.h>
+ #include <inttypes.h>
+ #include <string.h>
+@@ -168,6 +169,7 @@ int
+ main(int argc, char *argv[])
+ {
+     const struct CMUnitTest tests[] = {
++# if __BYTE_ORDER == __LITTLE_ENDIAN
+         cmocka_unit_test(check_bios_nuc),
+         cmocka_unit_test(check_bios_pc_client),
+         cmocka_unit_test(check_event_uefiservices),
+@@ -175,6 +177,7 @@ main(int argc, char *argv[])
+         cmocka_unit_test(check_event_uefivar),
+         cmocka_unit_test(check_event),
+         cmocka_unit_test(check_specid_vendordata),
++# endif
+     };
+     return cmocka_run_group_tests(tests, NULL, NULL);
+ }
+--- tpm2-tss-4.0.1.orig/test/unit/fapi-ima-eventlog.c
++++ tpm2-tss-4.0.1/test/unit/fapi-ima-eventlog.c
+@@ -8,6 +8,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <endian.h>
+ #include <stdarg.h>
+ #include <inttypes.h>
+ #include <string.h>
+@@ -259,11 +260,13 @@ int
+ main(int argc, char *argv[])
+ {
+     const struct CMUnitTest tests[] = {
++# if __BYTE_ORDER == __LITTLE_ENDIAN
+         cmocka_unit_test(check_invalidate_event),
+         cmocka_unit_test(check_get_name),
+         cmocka_unit_test(check_sml_ima_sha1),
+         cmocka_unit_test(check_sml_ima_ng_sha1),
+         cmocka_unit_test(check_sml_ima_sig_sha256),
++# endif
+     };
+     return cmocka_run_group_tests(tests, NULL, NULL);
+ }
diff --git a/debian/patches/fix-tcti-spi-helper-big-endian.patch b/debian/patches/fix-tcti-spi-helper-big-endian.patch
new file mode 100644
index 0000000..2778c78
--- /dev/null
+++ b/debian/patches/fix-tcti-spi-helper-big-endian.patch
@@ -0,0 +1,29 @@
+Description: uint32_t is converted to a void* buffer.
+ We need to convert it back to the correct endianess.
+Author: Lukas Märdian <[e-mail]>
+Forwarded: https://github.com/tpm2-software/tpm2-tss/pull/2686
+Bug: https://github.com/tpm2-software/tpm2-tss/issues/2531
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2031020
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1040521
+Last-Update: 2023-08-22
+---
+--- tpm2-tss-4.0.1.orig/src/tss2-tcti/tcti-spi-helper.c
++++ tpm2-tss-4.0.1/src/tss2-tcti/tcti-spi-helper.c
+@@ -2,6 +2,8 @@
+ /*
+  * Copyright 2020 Fraunhofer SIT. All rights reserved.
+  */
++#define _BSD_SOURCE
++#include <endian.h>
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <inttypes.h>
+@@ -312,7 +314,7 @@ static uint32_t spi_tpm_helper_read_sts_
+ {
+     uint32_t status = 0;
+     spi_tpm_helper_read_reg(ctx, TCTI_SPI_HELPER_TPM_STS_REG, &status, sizeof(status));
+-    return status;
++    return le32toh(status);
+ }
+ 
+ static void spi_tpm_helper_write_sts_reg(TSS2_TCTI_SPI_HELPER_CONTEXT* ctx, uint32_t status)
diff --git a/debian/patches/series b/debian/patches/series
index 49ba955..b173354 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,6 @@
 0001_disable_fapi_io_test.patch
 0002-fix-version.patch
 0003-test-unit-tcti-libtpms-fix-test-failed-at-32-bit-pla.patch
+0001-tss2-tcti-tcti-libtpms-fix-test-failure-on-big-endia.patch
+fix-tcti-spi-helper-big-endian.patch
+disable-tests-on-big-endian.patch