summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAnastasia Belova <abelova@astralinux.ru>2024-01-15 12:22:16 +0300
committerPeter Maydell <peter.maydell@linaro.org>2024-01-18 12:20:33 +0000
commit410c2a4d75f52f6a2fe978eda5a9b6f854afe5ea (patch)
tree337fef1005361ba17fd475e84198cc7ff823b4dd
parentc2d7faf713e04fc6b2d5b33d77cab0672c5bb30e (diff)
downloadfocaccia-qemu-410c2a4d75f52f6a2fe978eda5a9b6f854afe5ea.tar.gz
focaccia-qemu-410c2a4d75f52f6a2fe978eda5a9b6f854afe5ea.zip
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>
Diffstat (limited to '')
-rw-r--r--include/hw/elf_ops.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/hw/elf_ops.h b/include/hw/elf_ops.h
index 0a5c258fe6..9c35d1b9da 100644
--- a/include/hw/elf_ops.h
+++ b/include/hw/elf_ops.h
@@ -500,7 +500,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) {