From c45ff4b0789fb162378db8f6f5ca126d31dd51df Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Tue, 20 Dec 2016 09:58:31 +0100 Subject: [PATCH] tools: mkimage: Call fclose in error path This patch is fixing missing fclose() calls in error patch introduced by: "tools: mkimage: Use fstat instead of stat to avoid malicious hacks" (sha1: 40ce747e4a2aadba8f82f008a4a7a46df9da31bf) Reported-by: Coverity (CID: 155064, 155065) Signed-off-by: Michal Simek Reviewed-by: Simon Glass --- tools/zynqimage.c | 8 ++++++-- tools/zynqmpimage.c | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/tools/zynqimage.c b/tools/zynqimage.c index b47132b02a..021d2d3fc9 100644 --- a/tools/zynqimage.c +++ b/tools/zynqimage.c @@ -239,11 +239,15 @@ static void zynqimage_parse_initparams(struct zynq_header *zynqhdr, } err = fstat(fileno(fp), &path_stat); - if (err) + if (err) { + fclose(fp); return; + } - if (!S_ISREG(path_stat.st_mode)) + if (!S_ISREG(path_stat.st_mode)) { + fclose(fp); return; + } do { r = fscanf(fp, "%x %x", ®init.address, ®init.data); diff --git a/tools/zynqmpimage.c b/tools/zynqmpimage.c index 60d8ed23b4..0c9a3daddd 100644 --- a/tools/zynqmpimage.c +++ b/tools/zynqmpimage.c @@ -251,11 +251,15 @@ static void zynqmpimage_parse_initparams(struct zynqmp_header *zynqhdr, } err = fstat(fileno(fp), &path_stat); - if (err) + if (err) { + fclose(fp); return; + } - if (!S_ISREG(path_stat.st_mode)) + if (!S_ISREG(path_stat.st_mode)) { + fclose(fp); return; + } do { r = fscanf(fp, "%x %x", ®init.address, ®init.data); -- 2.39.5