Upstream 6.2.0

CHANGELOG.md

@@ -1,3 +1,12 @@
+## [6.2.0]
+
+### Changed
+ - Linux: build for Android using Android NDK
+ - Linux: import libmei 1.8.1
+
+### Added
+ - add TeeCancelIO API
+
 ## [6.1.0]
 
 ### Fixed

VERSION

@@ -1 +1 @@
-6.1.0
+6.2.0

include/helpers.h

@@ -44,10 +44,9 @@ extern "C" {
 		// For debugging
 		//#define LOG_NDEBUG 0
 		#define LOG_TAG "metee"
-		#include <cutils/log.h>
-		#define DebugPrintMe(fmt, ...) ALOGV_IF(true, fmt, ##__VA_ARGS__)
-		#define ErrorPrintMe(fmt, ...) ALOGE_IF(true, fmt, ##__VA_ARGS__)
-
+		#include <android/log_macros.h>
+		#define DebugPrintMe(fmt, ...) ALOGV(fmt, ##__VA_ARGS__)
+		#define ErrorPrintMe(fmt, ...) ALOGE(fmt, ##__VA_ARGS__)
 		#ifdef LOG_NDEBUG
 			#define TEE_DEFAULT_LOG_LEVEL TEE_LOG_LEVEL_VERBOSE
 		#else

include/metee.h

@@ -308,6 +308,11 @@ TEESTATUS TEEAPI TeeGetTRC(IN PTEEHANDLE handle, OUT uint32_t* trc_val);
  */
 void TEEAPI TeeDisconnect(IN PTEEHANDLE handle);
 
+/*! Try to stop all in-process reads and writes
+ *  \param handle The handle of the session
+ */
+void TEEAPI TeeCancelIO(IN PTEEHANDLE handle);
+
 /*! Returns handle of TEE device
  *  Obtains HECI device handle on Windows and mei device file descriptor on Linux
  *  \param handle The handle of the session.

include/meteepp.h

@@ -192,6 +192,12 @@ namespace intel {
 				TeeDisconnect(&_handle);
 			}
 
+			/*! Try to stop all in-process reads and writes */
+			void cancel_io()
+			{
+				TeeCancelIO(&_handle);
+			}
+
 			/*! Connects to the TEE driver and starts a session */
 			void connect()
 			{

linux.cmake

@@ -69,3 +69,6 @@ if(NOT CONSOLE_OUTPUT)
 endif()
 
 target_compile_definitions(${PROJECT_NAME} PRIVATE -D_GNU_SOURCE)
+if(ANDROID)
+  target_link_libraries(${PROJECT_NAME} PRIVATE log)
+endif()

src/Windows/metee_win.c

@@ -531,20 +531,11 @@ TEESTATUS TEEAPI TeeGetTRC(IN PTEEHANDLE handle, OUT uint32_t* trc_val)
 	return status;
 }
 
-VOID TEEAPI TeeDisconnect(IN PTEEHANDLE handle)
+static void __TeeCancelIO(PTEEHANDLE handle)
 {
 	struct METEE_WIN_IMPL *impl_handle = to_int(handle);
 	DWORD ret;
 
-	if (NULL == handle) {
-		return;
-	}
-
-	FUNC_ENTRY(handle);
-	if (NULL == impl_handle) {
-		goto Cleanup;
-	}
-
 	if (CancelIoEx(impl_handle->handle, NULL)) {
 		HANDLE handles[MAX_EVT];
 		for (size_t i = 0; i < MAX_EVT; i++) {
@@ -556,6 +547,33 @@ VOID TEEAPI TeeDisconnect(IN PTEEHANDLE handle)
 				ret, GetLastError());
 		}
 	}
+}
+
+void TEEAPI TeeCancelIO(IN PTEEHANDLE handle)
+{
+	struct METEE_WIN_IMPL *impl_handle = to_int(handle);
+
+	FUNC_ENTRY(handle);
+	if (NULL != impl_handle) {
+		__TeeCancelIO(handle);
+	}
+	FUNC_EXIT(handle, TEE_SUCCESS);
+}
+
+VOID TEEAPI TeeDisconnect(IN PTEEHANDLE handle)
+{
+	struct METEE_WIN_IMPL *impl_handle = to_int(handle);
+
+	if (NULL == handle) {
+		return;
+	}
+
+	FUNC_ENTRY(handle);
+	if (NULL == impl_handle) {
+		goto Cleanup;
+	}
+
+	__TeeCancelIO(handle);
 	for (size_t i = 0; i < MAX_EVT; i++) {
 		if (impl_handle->evt[i]) {
 			if (impl_handle->evt[i]->hEvent)
@@ -570,7 +588,7 @@ VOID TEEAPI TeeDisconnect(IN PTEEHANDLE handle)
 	handle->handle = NULL;
 
 Cleanup:
-	FUNC_EXIT(handle, 0);
+	FUNC_EXIT(handle, TEE_SUCCESS);
 }
 
 TEE_DEVICE_HANDLE TEEAPI TeeGetDeviceHandle(IN PTEEHANDLE handle)

src/linux/mei.c

@@ -25,8 +25,12 @@
  *****************************************************************************/
 #ifdef ANDROID
 #define LOG_TAG "libmei"
-#include <cutils/log.h>
-#define mei_msg(_me, fmt, ARGS...) ALOGV_IF((_me->log_level >= MEI_LOG_LEVEL_VERBOSE), fmt, ##ARGS)
+#include <android/log_macros.h>
+#define mei_msg(_me, fmt, ARGS...) \
+((_me->log_level >= MEI_LOG_LEVEL_VERBOSE) \
+? (void)ALOGV(fmt, ##ARGS) \
+: (void)0)
+
 #define mei_err(_me, fmt, ARGS...) ALOGE(fmt, ##ARGS)
 #ifdef DEBUG
 static inline void __dump_buffer(const char *buf)

src/linux/metee_linux.c

@@ -488,20 +488,38 @@ TEESTATUS TEEAPI TeeGetTRC(IN PTEEHANDLE handle, OUT uint32_t* trc_val)
 	return status;
 }
 
+static void __TeeCancelIO(PTEEHANDLE handle)
+{
+	struct metee_linux_intl* intl = to_intl(handle);
+	const char buf[] = "X";
+
+	if (write(intl->cancel_pipe[1], buf, sizeof(buf)) < 0) {
+		ERRPRINT(handle, "Pipe write failed\n");
+	}
+}
+
+void TEEAPI TeeCancelIO(IN PTEEHANDLE handle)
+{
+	struct metee_linux_intl* intl = to_intl(handle);
+
+	FUNC_ENTRY(handle);
+	if (intl) {
+		__TeeCancelIO(handle);
+	}
+	FUNC_EXIT(handle, TEE_SUCCESS);
+}
+
 void TEEAPI TeeDisconnect(PTEEHANDLE handle)
 {
 	struct metee_linux_intl *intl = to_intl(handle);
-	const char buf[] = "X";
 
 	if (!handle) {
 		return;
 	}
 
 	FUNC_ENTRY(handle);
 	if (intl) {
-		if (write(intl->cancel_pipe[1], buf, sizeof(buf)) < 0) {
-			ERRPRINT(handle, "Pipe write failed\n");
-		}
+		__TeeCancelIO(handle);
 		mei_deinit(&intl->me);
 		close(intl->cancel_pipe[0]);
 		close(intl->cancel_pipe[1]);

src/uefi/metee_efi.c

@@ -851,4 +851,8 @@ TEESTATUS TEEAPI TeeGetKind(IN PTEEHANDLE handle, IN OUT char *kind, IN OUT size
 End:
 	FUNC_EXIT(handle, status);
 	return status;
+}
+
+void TEEAPI TeeCancelIO(IN PTEEHANDLE handle)
+{
 }