Merge ~paelzer/ubuntu/+source/qemu:lp-1903864-tpm-usage-issues-FOCAL into ubuntu/+source/qemu:ubuntu/focal-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4410

[Robie Basak (racb)]

commit 684547c2897fc5b9a8449a9abc74a8a6851ef49b tree ff5906bd8f26fa136c9f993eeed57ddd1a2299fa

review: Approve (sru)

[Christian Ehrhardt  (paelzer)]

Bugs 1903864 + 1913395 got combined and rebased onto the latest security upload.
Content is still the same.

Tagged and Uploaded

[Christian Ehrhardt  (paelzer)]

Uploaded, setting state to "merged"

diff --git a/debian/changelog b/debian/changelog
index 9ab80c5..c875642 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qemu (1:4.2-3ubuntu6.12) focal; urgency=medium
+
+  * d/p/u/lp-1903864-tpm_emulator-Report-an-error-if-chardev-is-missing.patch:
+    fix tpm-emulator: parameter 'chardev' is missing (LP: #1903864)
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 28 Jan 2021 09:20:37 +0100
+
 qemu (1:4.2-3ubuntu6.11) focal; urgency=medium
 
   * d/p/ubuntu/lp-1907656-s390x-s390-virtio-ccw-Reset-PCI-devices-during-subsy:
diff --git a/debian/patches/series b/debian/patches/series
index d4a07ee..310d0e9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -239,3 +239,4 @@ ubuntu/CVE-2020-25723.patch
 ubuntu/CVE-2020-27616.patch
 ubuntu/CVE-2020-27617.patch
 ubuntu/lp-1907656-s390x-s390-virtio-ccw-Reset-PCI-devices-during-subsy.patch
+ubuntu/lp-1903864-tpm_emulator-Report-an-error-if-chardev-is-missing.patch
diff --git a/debian/patches/ubuntu/lp-1903864-tpm_emulator-Report-an-error-if-chardev-is-missing.patch b/debian/patches/ubuntu/lp-1903864-tpm_emulator-Report-an-error-if-chardev-is-missing.patch
new file mode 100644
index 0000000..f506eff
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1903864-tpm_emulator-Report-an-error-if-chardev-is-missing.patch
@@ -0,0 +1,106 @@
+From 88f830745721ba8c9e9d2831c01045a6f130c1a6 Mon Sep 17 00:00:00 2001
+From: Stefan Berger <[e-mail]>
+Date: Fri, 24 Jul 2020 08:57:26 -0400
+Subject: [PATCH] tpm_emulator: Report an error if chardev is missing
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This patch fixes the odd error reporting when trying to send a file
+descriptor to the TPM emulator if one has not passed a valid chardev.
+
+$ x86_64-softmmu/qemu-system-x86_64 -tpmdev emulator,id=tpm0
+qemu-system-x86_64: -tpmdev emulator,id=tpm0: tpm-emulator: Failed to send CMD_SET_DATAFD: Success
+qemu-system-x86_64: -tpmdev emulator,id=tpm0: tpm-emulator: Could not cleanly shutdown the TPM: Success
+
+This is the new error report:
+
+$ x86_64-softmmu/qemu-system-x86_64 -tpmdev emulator,id=tpm0
+qemu-system-x86_64: -tpmdev emulator,id=tpm0: tpm-emulator: parameter 'chardev' is missing
+
+This change does not hide the display of supported TPM types if a non-existent type is passed:
+
+$ x86_64-softmmu/qemu-system-x86_64 -tpmdev nonexistent,id=tpm0
+qemu-system-x86_64: -tpmdev nonexistent,id=tpm0: Parameter 'type' expects a TPM backend type
+Supported TPM types (choose only one):
+ passthrough   Passthrough TPM backend driver
+    emulator   TPM emulator backend driver
+
+Signed-off-by: Stefan Berger <[e-mail]>
+Reviewed-by: Marc-André Lureau <[e-mail]>
+Reviewed-by: Markus Armbruster <[e-mail]>
+
+Backport-Notes: path to tpm_emulator.c file was different
+Origin: backport, https://git.qemu.org/?p=qemu.git;a=commit;h=88f830745721ba8c9e9d2831c01045a6f130c1a6
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1903864
+Last-Update: 2021-01-28
+
+---
+ backends/tpm/tpm_emulator.c | 38 ++++++++++++++++++++++---------------
+ 1 file changed, 23 insertions(+), 15 deletions(-)
+
+diff --git a/backends/tpm/tpm_emulator.c b/backends/tpm/tpm_emulator.c
+index 9605339f93..a9b0f55e67 100644
+--- a/hw/tpm/tpm_emulator.c
++++ b/hw/tpm/tpm_emulator.c
+@@ -549,27 +549,30 @@ err_exit:
+ static int tpm_emulator_handle_device_opts(TPMEmulator *tpm_emu, QemuOpts *opts)
+ {
+     const char *value;
++    Error *err = NULL;
++    Chardev *dev;
+ 
+     value = qemu_opt_get(opts, "chardev");
+-    if (value) {
+-        Error *err = NULL;
+-        Chardev *dev = qemu_chr_find(value);
+-
+-        if (!dev) {
+-            error_report("tpm-emulator: tpm chardev '%s' not found.", value);
+-            goto err;
+-        }
++    if (!value) {
++        error_report("tpm-emulator: parameter 'chardev' is missing");
++        goto err;
++    }
+ 
+-        if (!qemu_chr_fe_init(&tpm_emu->ctrl_chr, dev, &err)) {
+-            error_prepend(&err, "tpm-emulator: No valid chardev found at '%s':",
+-                          value);
+-            error_report_err(err);
+-            goto err;
+-        }
++    dev = qemu_chr_find(value);
++    if (!dev) {
++        error_report("tpm-emulator: tpm chardev '%s' not found", value);
++        goto err;
++    }
+ 
+-        tpm_emu->options->chardev = g_strdup(value);
++    if (!qemu_chr_fe_init(&tpm_emu->ctrl_chr, dev, &err)) {
++        error_prepend(&err, "tpm-emulator: No valid chardev found at '%s':",
++                      value);
++        error_report_err(err);
++        goto err;
+     }
+ 
++    tpm_emu->options->chardev = g_strdup(value);
++
+     if (tpm_emulator_prepare_data_fd(tpm_emu) < 0) {
+         goto err;
+     }
+@@ -925,6 +928,11 @@ static void tpm_emulator_shutdown(TPMEmulator *tpm_emu)
+ {
+     ptm_res res;
+ 
++    if (!tpm_emu->options->chardev) {
++        /* was never properly initialized */
++        return;
++    }
++
+     if (tpm_emulator_ctrlcmd(tpm_emu, CMD_SHUTDOWN, &res, 0, sizeof(res)) < 0) {
+         error_report("tpm-emulator: Could not cleanly shutdown the TPM: %s",
+                      strerror(errno));
+-- 
+2.30.0
+