[PATCH] mkeficapsule: Free up resources used for adding public key to dtb

21 Jan 2021

Fix the issues flagged by Coverity on resources not being released in
the add_public_key function.
Signed-off-by: Sughosh Ganu sughosh.ganu@linaro.org
---
 tools/mkeficapsule.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/tools/mkeficapsule.c b/tools/mkeficapsule.c
index 270943fc90..caf0a1b231 100644
--- a/tools/mkeficapsule.c
+++ b/tools/mkeficapsule.c
@@ -150,6 +150,7 @@ static int add_public_key(const char *pkey_file, const char *dtb_file,
    if (srcfd == -1) {
    	fprintf(stderr, "%s: Can't open %s: %s\n",
    		__func__, pkey_file, strerror(errno));
+		ret = -1;
    	goto err;
    }
@@ -157,6 +158,7 @@ static int add_public_key(const char *pkey_file, const char *dtb_file,
    if (ret == -1) {
    	fprintf(stderr, "%s: Can't stat %s: %s\n",
    		__func__, pkey_file, strerror(errno));
+		ret = -1;
    	goto err;
    }
@@ -167,6 +169,7 @@ static int add_public_key(const char *pkey_file, const char *dtb_file,
    if ((sptr == MAP_FAILED) || (errno != 0)) {
    	fprintf(stderr, "%s: Failed to mmap %s:%s\n",
    		__func__, pkey_file, strerror(errno));
+		ret = -1;
    	goto err;
    }
@@ -175,6 +178,7 @@ static int add_public_key(const char *pkey_file, const char *dtb_file,
    if (destfd == -1) {
    	fprintf(stderr, "%s: Can't open %s: %s\n",
    		__func__, dtb_file, strerror(errno));
+		ret = -1;
    	goto err;
    }
@@ -189,6 +193,7 @@ static int add_public_key(const char *pkey_file, const char *dtb_file,
    if (ftruncate(destfd, dtb.st_size)) {
    	fprintf(stderr, "%s: Can't expand %s: %s\n",
    		__func__, dtb_file, strerror(errno));
+		ret = -1;
    	goto err;;
    }
@@ -199,11 +204,13 @@ static int add_public_key(const char *pkey_file, const char *dtb_file,
    if ((dptr == MAP_FAILED) || (errno != 0)) {
    	fprintf(stderr, "%s: Failed to mmap %s:%s\n",
    		__func__, dtb_file, strerror(errno));
+		ret = -1;
    	goto err;
    }
if (fdt_check_header(dptr)) {
    	fprintf(stderr, "%s: Invalid FDT header\n", __func__);
+		ret = -1;
    	goto err;
    }
@@ -211,6 +218,7 @@ static int add_public_key(const char *pkey_file, const char *dtb_file,
    if (ret) {
    	fprintf(stderr, "%s: Cannot expand FDT: %s\n",
    		__func__, fdt_strerror(ret));
+		ret = -1;
    	goto err;
    }
@@ -219,10 +227,11 @@ static int add_public_key(const char *pkey_file, const char *dtb_file,
    if (ret < 0) {
    	fprintf(stderr, "%s: Unable to add public key to the FDT\n",
    		__func__);
+		ret = -1;
    	goto err;
    }
-	return 0;
+	ret = 0;
err:
    if (sptr)
@@ -237,7 +246,7 @@ err:
    if (destfd >= 0)
    	close(destfd);
-	return -1;
+	return ret;
 }
static int create_fwbin(char *path, char *bin, efi_guid_t *guid,
-- 
2.17.1


    