diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-01-28 11:05:26 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-01-31 18:51:49 +0100 |
commit | e3ed260db7c26aa3893c840191a0365f7f3f2837 (patch) | |
tree | 6a1fef90253a57c907b70a8479a7ec5b0e2c6561 /scripts/fix_size.c | |
parent | 2af8bdd36908658a33838008200856b30734543b (diff) | |
download | barebox-e3ed260db7c26aa3893c840191a0365f7f3f2837.tar.gz barebox-e3ed260db7c26aa3893c840191a0365f7f3f2837.tar.xz |
scripts: fix_size: check magic
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>
Diffstat (limited to 'scripts/fix_size.c')
-rw-r--r-- | scripts/fix_size.c | 39 |
1 files changed, 32 insertions, 7 deletions
diff --git a/scripts/fix_size.c b/scripts/fix_size.c index 869ae7e32b..c7dcd5ff6b 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,23 +16,24 @@ 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]; + int ignore_unknown = 0; - while ((c = getopt (argc, argv, "hf:o:b")) != -1) { + while ((c = getopt (argc, argv, "if:b")) != -1) { switch (c) { case 'f': file = optarg; break; - case 'o': - offset = strtoul(optarg, NULL, 16); - break; case 'b': is_bigendian = 1; break; + case 'i': + ignore_unknown = 1; + break; } } @@ -45,13 +47,36 @@ 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"); + if (ignore_unknown) + ret = 0; + else + ret = 1; + goto err; + } + + ret = lseek(fd, 0x2c, SEEK_SET); if (ret < 0) { perror("lseek"); ret = 1; |