[PATCH] lib: fwts_cpu: check for MSR read failures

Colin King colin.king at canonical.com
Tue Feb 16 23:49:31 UTC 2016


From: Colin Ian King <colin.king at canonical.com>

We should check to see if MSR reads fail and if so return a bool
error status.

Signed-off-by: Colin Ian King <colin.king at canonical.com>
---
 src/lib/src/fwts_cpu.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/lib/src/fwts_cpu.c b/src/lib/src/fwts_cpu.c
index 2874f03..7a4b5b2 100644
--- a/src/lib/src/fwts_cpu.c
+++ b/src/lib/src/fwts_cpu.c
@@ -219,9 +219,12 @@ fwts_bool fwts_cpu_has_c1e(void)
                  * by erratum #400
                  */
 		if (strstr(cpu->flags, "osvw") != NULL) {
-			fwts_cpu_readmsr(0, MSR_AMD64_OSVW_ID_LENGTH, &val);
+			if (fwts_cpu_readmsr(0, MSR_AMD64_OSVW_ID_LENGTH, &val) != FWTS_OK)
+				return FWTS_BOOL_ERROR;
+
                         if (val >= 2) {
-                                fwts_cpu_readmsr(0, MSR_AMD64_OSVW_STATUS, &val);
+                                if (fwts_cpu_readmsr(0, MSR_AMD64_OSVW_STATUS, &val) != FWTS_OK)
+					return FWTS_BOOL_ERROR;
                                 if (!(val & 2)) {
 					fwts_cpu_free_info(cpu);
 					return FWTS_FALSE;
-- 
2.7.0




More information about the fwts-devel mailing list