From 1b2c4fc5b90b9d5a8c2b7e0ef984be0ddad231ec Mon Sep 17 00:00:00 2001
From: Stefan Berger <stefanb@linux.vnet.ibm.com>
Date: Wed, 29 May 2019 10:23:03 -0400
Subject: [PATCH] tpm2: Fix coverity scan errors in NvFileSize

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
---
 src/tpm2/NVMem.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/tpm2/NVMem.c b/src/tpm2/NVMem.c
index 723012cc..6d31e3a3 100644
--- a/src/tpm2/NVMem.c
+++ b/src/tpm2/NVMem.c
@@ -135,18 +135,25 @@ NvFileSize(
 	   )
 {
     long    fileSize;
-    long    filePos = ftell(s_NvFile);
+    long    filePos;
     //
+
     assert(NULL != s_NvFile);
-    
+
+    filePos = ftell(s_NvFile);  // libtpms changed begin
+    if (filePos < 0)
+        return -1;              // libtpms changed end
+
     fseek(s_NvFile, 0, SEEK_END);
     fileSize = ftell(s_NvFile);
     switch(leaveAt)
 	{
 	  case SEEK_SET:
 	    filePos = 0;
+	    /* fall through */
 	  case SEEK_CUR:
-	    fseek(s_NvFile, filePos, SEEK_SET);
+	    if (fseek(s_NvFile, filePos, SEEK_SET) < 0)  // libtpms changed
+	        return -1;                               // libtpms changed
 	    break;
 	  case SEEK_END:
 	    break;