aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordavidcunado-arm <david.cunado@arm.com>2018-01-30 20:50:16 +0000
committerGitHub <noreply@github.com>2018-01-30 20:50:16 +0000
commite45820dc54ed5df7f22fbeeef9739ac67618ebd6 (patch)
treee779cea2627549e84e3de5c28d82d76a4e63c336
parente282b9d97defe49c8ecc8638b5e5b29dae08eb67 (diff)
parent8e4cdd221034aa260def15874e8f99262eb77930 (diff)
downloadplatform_external_arm-trusted-firmware-e45820dc54ed5df7f22fbeeef9739ac67618ebd6.tar.gz
platform_external_arm-trusted-firmware-e45820dc54ed5df7f22fbeeef9739ac67618ebd6.tar.bz2
platform_external_arm-trusted-firmware-e45820dc54ed5df7f22fbeeef9739ac67618ebd6.zip
Merge pull request #1242 from afaerber/fiptool-hikey-pad
fiptool: Fix use after free
-rw-r--r--tools/fiptool/fiptool.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/fiptool/fiptool.c b/tools/fiptool/fiptool.c
index 33c451e4e..e70ff364b 100644
--- a/tools/fiptool/fiptool.c
+++ b/tools/fiptool/fiptool.c
@@ -543,7 +543,6 @@ static int pack_images(const char *filename, uint64_t toc_flags, unsigned long a
log_dbgx("Metadata size: %zu bytes", buf_size);
xfwrite(buf, buf_size, fp, filename);
- free(buf);
if (verbose)
log_dbgx("Payload size: %zu bytes", payload_size);
@@ -566,6 +565,7 @@ static int pack_images(const char *filename, uint64_t toc_flags, unsigned long a
while (pad_size--)
fputc(0x0, fp);
+ free(buf);
fclose(fp);
return 0;
}