[PATCH 1/3] scripts: fix_size: check magic

* [PATCH 1/3] scripts: fix_size: check magic
@ 2014-01-29 11:05 Sascha Hauer
  2014-01-29 11:05 ` [PATCH 2/3] images: fix image size in pblx Sascha Hauer
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Sascha Hauer @ 2014-01-29 11:05 UTC (permalink / raw)
  To: barebox

Instead of passing the offset to the fix_size tool check the image to
fixup for a valid header so that only recognized files are fixed up.
This makes the usage of this tool safer.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/pbl/Makefile |  2 +-
 scripts/fix_size.c    | 32 +++++++++++++++++++++++++-------
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/arch/arm/pbl/Makefile b/arch/arm/pbl/Makefile
index bfa73b9..5e90f3d 100644
--- a/arch/arm/pbl/Makefile
+++ b/arch/arm/pbl/Makefile
@@ -23,7 +23,7 @@ $(obj)/zbarebox.bin:	$(obj)/zbarebox FORCE
 	$(call if_changed,objcopy)
 	$(call cmd,check_file_size,$(CONFIG_BAREBOX_MAX_IMAGE_SIZE))
 	$(Q)$(kecho) '  Barebox: fix size'
-	$(Q)$(objtree)/scripts/fix_size -f $(objtree)/$@ -o 0x2c $(FIX_SIZE)
+	$(Q)$(objtree)/scripts/fix_size -f $(objtree)/$@ $(FIX_SIZE)
 	$(Q)$(kecho) '  Barebox: $@ is ready'
 
 $(obj)/zbarebox.S: $(obj)/zbarebox FORCE
diff --git a/scripts/fix_size.c b/scripts/fix_size.c
index 869ae7e..1daf5fc 100644
--- a/scripts/fix_size.c
+++ b/scripts/fix_size.c
@@ -2,6 +2,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <string.h>
 #include <unistd.h>
 #include <stdint.h>
 #include <fcntl.h>
@@ -15,20 +16,17 @@ int main(int argc, char**argv)
 	struct stat s;
 	int c;
 	int fd;
-	uint64_t offset = 0;
 	uint32_t size = 0;
 	char *file = NULL;
 	int ret = 1;
 	int is_bigendian = 0;
+	char magic[8];
 
-	while ((c = getopt (argc, argv, "hf:o:b")) != -1) {
+	while ((c = getopt (argc, argv, "hf:b")) != -1) {
 		switch (c) {
 		case 'f':
 			file = optarg;
 			break;
-		case 'o':
-			offset = strtoul(optarg, NULL, 16);
-			break;
 		case 'b':
 			is_bigendian = 1;
 			break;
@@ -45,13 +43,33 @@ int main(int argc, char**argv)
 		return 1;
 	}
 
-	fd = open(file, O_WRONLY);
+	fd = open(file, O_RDWR);
 	if (fd < 0) {
 		perror("open");
 		return 1;
 	}
 
-	ret = lseek(fd, offset, SEEK_SET);
+	ret = lseek(fd, 0x20, SEEK_SET);
+	if (ret < 0) {
+		perror("lseek");
+		ret = 1;
+		goto err;
+	}
+
+	ret = read(fd, magic, sizeof(magic));
+	if (ret < 0) {
+		perror("read");
+		ret = 1;
+		goto err;
+	}
+
+	if (strcmp(magic, "barebox")) {
+		fprintf(stderr, "invalid magic\n");
+		ret = 1;
+		goto err;
+	}
+
+	ret = lseek(fd, 0x2c, SEEK_SET);
 	if (ret < 0) {
 		perror("lseek");
 		ret = 1;
-- 
1.8.5.3


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 4+ messages in thread