diff mbox

[U-Boot] tools: mkimage: Check if file is regular file

Message ID d559cf0c0e2174b82bd7a6dfc3abdefa35fecffb.1477048862.git.michal.simek@xilinx.com
State Accepted
Commit 56c7e8015509312240b1ee15f2ff74510939a45d
Delegated to: Michal Simek
Headers show

Commit Message

Michal Simek Oct. 21, 2016, 11:21 a.m. UTC 
Current Makefile.spl passes -R parameter which is not empty
and pointing to ./ folder.
"./tools/mkimage -T zynqmpimage -R ./"" -d spl/u-boot-spl.bin
spl/boot.bin"
That's why mkimage is trying to parse ./ file and generate
register init which is wrong.
Check that passed filename is regular file. If not do not work with it.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 tools/zynqmpimage.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
diff mbox

Patch

diff --git a/tools/zynqmpimage.c b/tools/zynqmpimage.c
index d08144c2bdfd..202faea07295 100644
--- a/tools/zynqmpimage.c
+++ b/tools/zynqmpimage.c
@@ -237,12 +237,18 @@  static int zynqmpimage_check_image_types(uint8_t type)
 static void zynqmpimage_parse_initparams(struct zynqmp_header *zynqhdr,
 	const char *filename)
 {
-	/* Expect a table of register-value pairs, e.g. "0x12345678 0x4321" */
-	FILE *fp = fopen(filename, "r");
+	FILE *fp;
 	struct zynqmp_reginit reginit;
 	unsigned int reg_count = 0;
 	int r;
+	struct stat path_stat;
+
+	stat(filename, &path_stat);
+	if (!S_ISREG(path_stat.st_mode))
+		return;
 
+	/* Expect a table of register-value pairs, e.g. "0x12345678 0x4321" */
+	fp = fopen(filename, "r");
 	if (!fp) {
 		fprintf(stderr, "Cannot open initparams file: %s\n", filename);
 		exit(1);