diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2022-02-28 11:07:16 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2022-02-28 12:52:37 +0100 |
| commit | 8ab6dbdaa72f1533e3f80608932bc0b52f83a451 (patch) | |
| tree | 96b82402632f717530be9ec5a8997a79e9752f43 /scripts | |
| parent | 729ad0c2e8c0b1c4af34174338bbd593bd70050d (diff) | |
| download | barebox-8ab6dbdaa72f1533e3f80608932bc0b52f83a451.tar.gz barebox-8ab6dbdaa72f1533e3f80608932bc0b52f83a451.tar.xz | |
scripts: bareboximd: Fix -c option
Using mmap in read_file doesn't work when the same file is written
afterwards with write_file. This problem was fixed in 738601e125
("scripts/common: fix write_file when opened with mmap"). Using mmap in
read_file was removed in 07b87a0908 ("scripts/common: Do not mmap in
read_file_2()") but then re-introduced for bareboximd in 013e8ea757
("scripts: bareboximd: Use mmap when possible"). I'll put my brown paper
bag on for this :(
This patch fixes the issue by explicitly avoiding mmap when the file
is written later as done with the -c option to bareboximd
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Reported-by: Andrej Picej <andrej.picej@norik.com>
Tested-by: Andrej Picej <andrej.picej@norik.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/bareboximd.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/scripts/bareboximd.c b/scripts/bareboximd.c index 2d4750d7fb..d01bd27007 100644 --- a/scripts/bareboximd.c +++ b/scripts/bareboximd.c @@ -55,9 +55,10 @@ static unsigned long simple_strtoul(const char *cp, char **endp, unsigned int ba return strtoul(cp, endp, base); } -static int imd_read_file(const char *filename, size_t *size, void **outbuf) +static int imd_read_file(const char *filename, size_t *size, void **outbuf, + bool allow_mmap) { - void *buf; + void *buf = MAP_FAILED; int fd, ret; size_t fsize; @@ -74,7 +75,9 @@ static int imd_read_file(const char *filename, size_t *size, void **outbuf) goto close; } - buf = mmap(NULL, fsize, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); + if (allow_mmap) + buf = mmap(NULL, fsize, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); + if (buf == MAP_FAILED) { close(fd); return read_file_2(filename, size, outbuf, 0x100000); |