51 lines
1.9 KiB
Diff
51 lines
1.9 KiB
Diff
From a31b5ed8480b9f7e4d49a9e3ab1077fb1d4eb269 Mon Sep 17 00:00:00 2001
|
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
Date: Fri, 18 Jul 2025 18:03:50 +0200
|
|
Subject: [PATCH 103/115] i386/tdx: Remove task->watch only when it's valid
|
|
|
|
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
|
RH-MergeRequest: 391: TDX support, including attestation and device assignment
|
|
RH-Jira: RHEL-15710 RHEL-20798 RHEL-49728
|
|
RH-Acked-by: Yash Mankad <None>
|
|
RH-Acked-by: Peter Xu <peterx@redhat.com>
|
|
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
|
RH-Commit: [103/115] a9a4c03cf0f589eab2dc07572c2cb724cca5686c (bonzini/rhel-qemu-kvm)
|
|
|
|
In some case (e.g., failed to connect to QGS socket),
|
|
tdx_generate_quote_cleanup() is called with task->watch invalid. It
|
|
triggers assertion of
|
|
|
|
qemu-system-x86_64: GLib: g_source_remove: assertion 'tag > 0' failed
|
|
|
|
Fix it by checking task->watch.
|
|
|
|
Fixes: 40da501d8989 ("i386/tdx: handle TDG.VP.VMCALL<GetQuote>")
|
|
Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
|
|
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
|
|
Link: https://lore.kernel.org/r/20250625035505.2770580-1-xiaoyao.li@intel.com
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
(cherry picked from commit 50fd57418c3f08f13eb964dcb49f065246f2ecbf)
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
---
|
|
target/i386/kvm/tdx-quote-generator.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/target/i386/kvm/tdx-quote-generator.c b/target/i386/kvm/tdx-quote-generator.c
|
|
index f59715f617..dee8334b27 100644
|
|
--- a/target/i386/kvm/tdx-quote-generator.c
|
|
+++ b/target/i386/kvm/tdx-quote-generator.c
|
|
@@ -75,7 +75,9 @@ static void tdx_generate_quote_cleanup(TdxGenerateQuoteTask *task)
|
|
{
|
|
timer_del(&task->timer);
|
|
|
|
- g_source_remove(task->watch);
|
|
+ if (task->watch) {
|
|
+ g_source_remove(task->watch);
|
|
+ }
|
|
qio_channel_close(QIO_CHANNEL(task->sioc), NULL);
|
|
object_unref(OBJECT(task->sioc));
|
|
|
|
--
|
|
2.50.1
|
|
|