Debug messages are using a format strings with %s for
a Unicode string, but the strings being printed are
ASCII strings and this results in corrupted debug
messages. Changes the the format string to use %a
instead of %s.
Cc: Chao Zhang <chao.b.zh...@intel.com>
Cc: Jiewen Yao <jiewen....@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Michael Kinney <michael.d.kin...@intel.com>
---
SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c | 12 ++++++------
SecurityPkg/Tcg/TcgDxe/TcgDxe.c | 12 ++++++------
SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c | 12 ++++++------
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
index 7076772..ae5e084 100644
--- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
+++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
@@ -1,7 +1,7 @@
/** @file
This module implements Tcg2 Protocol.
-Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
which accompanies this distribution. The full text of the license may be
found at
@@ -2182,7 +2182,7 @@ OnReadyToBoot (
EFI_CALLING_EFI_APPLICATION
);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "%s not Measured. Error!\n",
EFI_CALLING_EFI_APPLICATION));
+ DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n",
EFI_CALLING_EFI_APPLICATION));
}
//
@@ -2215,7 +2215,7 @@ OnReadyToBoot (
EFI_RETURNING_FROM_EFI_APPLICATOIN
);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "%s not Measured. Error!\n",
EFI_RETURNING_FROM_EFI_APPLICATOIN));
+ DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n",
EFI_RETURNING_FROM_EFI_APPLICATOIN));
}
}
@@ -2252,7 +2252,7 @@ OnExitBootServices (
EFI_EXIT_BOOT_SERVICES_INVOCATION
);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "%s not Measured. Error!\n",
EFI_EXIT_BOOT_SERVICES_INVOCATION));
+ DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n",
EFI_EXIT_BOOT_SERVICES_INVOCATION));
}
//
@@ -2262,7 +2262,7 @@ OnExitBootServices (
EFI_EXIT_BOOT_SERVICES_SUCCEEDED
);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "%s not Measured. Error!\n",
EFI_EXIT_BOOT_SERVICES_SUCCEEDED));
+ DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n",
EFI_EXIT_BOOT_SERVICES_SUCCEEDED));
}
}
@@ -2291,7 +2291,7 @@ OnExitBootServicesFailed (
EFI_EXIT_BOOT_SERVICES_FAILED
);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "%s not Measured. Error!\n",
EFI_EXIT_BOOT_SERVICES_FAILED));
+ DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n",
EFI_EXIT_BOOT_SERVICES_FAILED));
}
}
diff --git a/SecurityPkg/Tcg/TcgDxe/TcgDxe.c b/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
index 8091941..4e2741c 100644
--- a/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
+++ b/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
@@ -8,7 +8,7 @@ buffer overflow, integer overflow.
TcgDxePassThroughToTpm() will receive untrusted input and do basic validation.
-Copyright (c) 2005 - 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2005 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
which accompanies this distribution. The full text of the license may be
found at
@@ -1080,7 +1080,7 @@ OnReadyToBoot (
EFI_CALLING_EFI_APPLICATION
);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "%s not Measured. Error!\n",
EFI_CALLING_EFI_APPLICATION));
+ DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n",
EFI_CALLING_EFI_APPLICATION));
}
//
@@ -1112,7 +1112,7 @@ OnReadyToBoot (
EFI_RETURNING_FROM_EFI_APPLICATOIN
);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "%s not Measured. Error!\n",
EFI_RETURNING_FROM_EFI_APPLICATOIN));
+ DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n",
EFI_RETURNING_FROM_EFI_APPLICATOIN));
}
}
@@ -1223,7 +1223,7 @@ OnExitBootServices (
EFI_EXIT_BOOT_SERVICES_INVOCATION
);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "%s not Measured. Error!\n",
EFI_EXIT_BOOT_SERVICES_INVOCATION));
+ DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n",
EFI_EXIT_BOOT_SERVICES_INVOCATION));
}
//
@@ -1233,7 +1233,7 @@ OnExitBootServices (
EFI_EXIT_BOOT_SERVICES_SUCCEEDED
);
if (EFI_ERROR (Status)){
- DEBUG ((EFI_D_ERROR, "%s not Measured. Error!\n",
EFI_EXIT_BOOT_SERVICES_SUCCEEDED));
+ DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n",
EFI_EXIT_BOOT_SERVICES_SUCCEEDED));
}
}
@@ -1262,7 +1262,7 @@ OnExitBootServicesFailed (
EFI_EXIT_BOOT_SERVICES_FAILED
);
if (EFI_ERROR (Status)){
- DEBUG ((EFI_D_ERROR, "%s not Measured. Error!\n",
EFI_EXIT_BOOT_SERVICES_FAILED));
+ DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n",
EFI_EXIT_BOOT_SERVICES_FAILED));
}
}
diff --git a/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c
b/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c
index 41e7207..8f344fe 100644
--- a/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c
+++ b/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c
@@ -1,7 +1,7 @@
/** @file
This module implements TrEE Protocol.
-Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2013 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
which accompanies this distribution. The full text of the license may be
found at
@@ -1525,7 +1525,7 @@ OnReadyToBoot (
EFI_CALLING_EFI_APPLICATION
);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "%s not Measured. Error!\n",
EFI_CALLING_EFI_APPLICATION));
+ DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n",
EFI_CALLING_EFI_APPLICATION));
}
//
@@ -1558,7 +1558,7 @@ OnReadyToBoot (
EFI_RETURNING_FROM_EFI_APPLICATOIN
);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "%s not Measured. Error!\n",
EFI_RETURNING_FROM_EFI_APPLICATOIN));
+ DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n",
EFI_RETURNING_FROM_EFI_APPLICATOIN));
}
}
@@ -1671,7 +1671,7 @@ OnExitBootServices (
EFI_EXIT_BOOT_SERVICES_INVOCATION
);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "%s not Measured. Error!\n",
EFI_EXIT_BOOT_SERVICES_INVOCATION));
+ DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n",
EFI_EXIT_BOOT_SERVICES_INVOCATION));
}
//
@@ -1681,7 +1681,7 @@ OnExitBootServices (
EFI_EXIT_BOOT_SERVICES_SUCCEEDED
);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "%s not Measured. Error!\n",
EFI_EXIT_BOOT_SERVICES_SUCCEEDED));
+ DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n",
EFI_EXIT_BOOT_SERVICES_SUCCEEDED));
}
}
@@ -1710,7 +1710,7 @@ OnExitBootServicesFailed (
EFI_EXIT_BOOT_SERVICES_FAILED
);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "%s not Measured. Error!\n",
EFI_EXIT_BOOT_SERVICES_FAILED));
+ DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n",
EFI_EXIT_BOOT_SERVICES_FAILED));
}
}
--
2.6.3.windows.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
