diff options
| author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2020-09-30 09:20:04 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-10-12 16:35:19 +0200 |
| commit | 03b5a557d7c81be52317b97b19f966bd0c9faa99 (patch) | |
| tree | c41fa9bdbd216b46954750e86a8e786599374a94 /arch | |
| parent | bfccbcb14155fd7aa267a3647f7a7e6fb12962f7 (diff) | |
| download | barebox-03b5a557d7c81be52317b97b19f966bd0c9faa99.tar.gz barebox-03b5a557d7c81be52317b97b19f966bd0c9faa99.tar.xz | |
sandbox: fix behavior with images >= 4G on 32-bit
hf->base may remain uninitialized if an image is > 4G, but sandbox
barebox is compiled for 32-bit. Fix this.
Reported-by: clang-analyzer-10
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sandbox/os/common.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/sandbox/os/common.c b/arch/sandbox/os/common.c index 43ee95edb6..72bb35464f 100644 --- a/arch/sandbox/os/common.c +++ b/arch/sandbox/os/common.c @@ -289,6 +289,7 @@ static int add_image(const char *_str, char *devname_template, int *devname_numb hf->fd = fd; hf->filename = filename; hf->is_blockdev = blkdev; + hf->base = (unsigned long)MAP_FAILED; if (fd < 0) { perror("open"); @@ -311,15 +312,16 @@ static int add_image(const char *_str, char *devname_template, int *devname_numb if (!cdev) hf->is_blockdev = 1; } - if (hf->size <= SIZE_MAX) + if (hf->size <= SIZE_MAX) { hf->base = (unsigned long)mmap(NULL, hf->size, PROT_READ | (readonly ? 0 : PROT_WRITE), MAP_SHARED, fd, 0); - else - printf("warning: %s: contiguous map failed\n", filename); - if (hf->base == (unsigned long)MAP_FAILED) - printf("warning: mmapping %s failed: %s\n", filename, strerror(errno)); + if (hf->base == (unsigned long)MAP_FAILED) + printf("warning: mmapping %s failed: %s\n", filename, strerror(errno)); + } else { + printf("warning: %s: contiguous map failed\n", filename); + } if (blkdev && hf->size % 512 != 0) { printf("warning: registering %s as block device failed: invalid block size\n", |