diff options
| author | Anastasia Belova <abelova@astralinux.ru> | 2024-01-15 12:22:16 +0300 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2024-01-19 13:41:10 +0300 |
| commit | 357b5990284107dfa36d234e3dcbf77e0e1367e0 (patch) | |
| tree | 45f1c5cb6ba1676e9281633195f82d132e6799cc /include/hw | |
| parent | d6488e51867054f94e564fa6621933ab1437fe70 (diff) | |
load_elf: fix iterator's type for elf file processing
j is used while loading an ELF file to byteswap segments'
data. If data is larger than 2GB an overflow may happen.
So j should be elf_word.
This commit fixes a minor bug: it's unlikely anybody is trying to
load ELF files with 2GB+ segments for wrong-endianness targets,
but if they did, it wouldn't work correctly.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
Cc: qemu-stable@nongnu.org
Fixes: 7ef295ea5b ("loader: Add data swap option to load-elf")
Signed-off-by: Anastasia Belova <abelova@astralinux.ru>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
(cherry picked from commit 410c2a4d75f52f6a2fe978eda5a9b6f854afe5ea)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/elf_ops.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/hw/elf_ops.h b/include/hw/elf_ops.h index dffb0e73d2..52776e8010 100644 --- a/include/hw/elf_ops.h +++ b/include/hw/elf_ops.h @@ -499,7 +499,7 @@ static ssize_t glue(load_elf, SZ)(const char *name, int fd, } if (data_swab) { - int j; + elf_word j; for (j = 0; j < file_size; j += (1 << data_swab)) { uint8_t *dp = data + j; switch (data_swab) { |