commit 87ce53ffc4f1254313ba42cbf5637af4d947f5f7
author Stefan Berger <stefanb@linux.ibm.com> Tue Oct 04 20:22:34 2022 -0400
committer Stefan Berger <stefanb@us.ibm.com> Wed Oct 05 07:37:14 2022 -0400
tree 9496599ccff241a14577e61edbcaf995766cc7e5
parent 7d79ecd694db05f1592ce86a42fb908e9df50ae0

swtpm: Add another exit label to avoid gcc -fanalyzer false positive

Move existing exit label before the return statement and add another
label that includes the free(filebuffer). This avoids a false positive
by 'gcc -fanalyzer' that seems to think that free(filebuffer)
would double-free filebuffer after filebuffer = realloc(tmp, ..)
failure.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>

src/swtpm/key.c

diff --git a/src/swtpm/key.c b/src/swtpm/key.c
index 6e6940e..b713450 100644
--- a/src/swtpm/key.c
+++ b/src/swtpm/key.c
@@ -325,7 +325,7 @@
             logprintf(STDERR_FILENO,
                       "Unable to read passphrase: %s\n",
                       strerror(errno));
-            goto exit;
+            goto err_free_buffer;
         }
         /* EOF ? */
         if ((size_t)len < filelen - offset) {
@@ -345,7 +345,7 @@
             logprintf(STDERR_FILENO,
                       "Requested %zu bytes for key, only got %zu.\n",
                       *keylen, sizeof(hashbuf));
-            goto exit;
+            goto err_free_buffer;
         }
         SHA512(filebuffer, len, hashbuf);
         memcpy(key, hashbuf, *keylen);
@@ -356,21 +356,21 @@
                               EVP_sha512(), *keylen, key) != 1) {
             logprintf(STDERR_FILENO,
                       "PKCS5_PBKDF2_HMAC with SHA512 failed\n");
-            goto exit;
+            goto err_free_buffer;
         }
         break;
     case KDF_IDENTIFIER_UNKNOWN:
         logprintf(STDERR_FILENO,
                   "Unknown KDF\n");
-        goto exit;
+        goto err_free_buffer;
     }
 
     ret = 0;
 
-exit:
-
+err_free_buffer:
     free(filebuffer);
 
+exit:
     return ret;
 }