From 0970f411d1555ff9d676fa918a54952b729d3ad4 Mon Sep 17 00:00:00 2001 From: Alexander Usyskin Date: Sun, 31 Aug 2025 16:23:36 +0300 Subject: [PATCH 1/3] MeTee: EFI: do not send disconnect when not connected Avoid sending disconnect when connection was not processed, like in the FW status retrieval flow. Signed-off-by: Alexander Usyskin --- src/uefi/heci_efi.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/uefi/heci_efi.c b/src/uefi/heci_efi.c index 6c449f0..cb1b5aa 100644 --- a/src/uefi/heci_efi.c +++ b/src/uefi/heci_efi.c @@ -299,6 +299,13 @@ EfiTeeHeciUninitialize( goto End; } + if (client->connected == FALSE) + { + DBGPRINT(Handle->TeeHandle, "Handle is not connected\n"); + status = EFI_SUCCESS; + goto End; + } + SetMem(&disconnectMsg, sizeof(disconnectMsg), 0x0); SetMem(&disconnectMsgReply, sizeof(disconnectMsgReply), 0x0); From 254b3f9409ea3cabcf613c4995531e1dcfbf475b Mon Sep 17 00:00:00 2001 From: Alexander Usyskin Date: Sun, 7 Sep 2025 11:38:10 +0300 Subject: [PATCH 2/3] MeTee: Windows: drop un-needed assert The error in EndOverlapped can happen in normal workflow. Remove debug assert from that path. Signed-off-by: Alexander Usyskin --- src/Windows/metee_win.c | 1 - src/Windows/metee_winhelpers.c | 3 --- 2 files changed, 4 deletions(-) diff --git a/src/Windows/metee_win.c b/src/Windows/metee_win.c index 525007d..4b0b069 100644 --- a/src/Windows/metee_win.c +++ b/src/Windows/metee_win.c @@ -2,7 +2,6 @@ /* * Copyright (C) 2014-2025 Intel Corporation */ -#include #include #include #include diff --git a/src/Windows/metee_winhelpers.c b/src/Windows/metee_winhelpers.c index ba21e68..439fef7 100644 --- a/src/Windows/metee_winhelpers.c +++ b/src/Windows/metee_winhelpers.c @@ -2,7 +2,6 @@ /* * Copyright (C) 2014-2025 Intel Corporation */ -#include #include #include #include "helpers.h" @@ -13,7 +12,6 @@ #include #include - /********************************************************************* ** Windows Helper Functions ** **********************************************************************/ @@ -129,7 +127,6 @@ TEESTATUS EndOverlapped(IN PTEEHANDLE handle, IN EVENTHANDLE evt, IN DWORD milli } if (err != WAIT_OBJECT_0) { - assert(WAIT_FAILED == err); err = GetLastError(); status = Win32ErrorToTee(err); From 4c6c61d0cd44d2a13684b8266b3c20d7324f2f43 Mon Sep 17 00:00:00 2001 From: Alexander Usyskin Date: Tue, 9 Sep 2025 10:23:01 +0300 Subject: [PATCH 3/3] MeTee: bump version to 6.0.2 Update CHANGELOG.md Signed-off-by: Alexander Usyskin --- CHANGELOG.md | 8 ++++++-- VERSION | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c13e43..314adf4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ +## [6.0.2] + - Windows: drop un-needed assert + - EFI: do not send disconnect when not connected + ## [6.0.1] -- EFI: prefix internal function -- Windows: add newlines to error messages + - EFI: prefix internal function + - Windows: add newlines to error messages ## [6.0.0] diff --git a/VERSION b/VERSION index 5fe6072..9b9a244 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.0.1 +6.0.2