From: Abdelrahman Youssef Date: Fri, 18 Oct 2024 18:26:34 +0300 Subject: [PATCH v3] common: buffer access out-of-bounds MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20241018-overflow-v3-1-30dc98fe930a@gmail.com> X-B4-Tracking: v=1; b=H4sIACl+EmcC/6tWKk4tykwtVrJSqFYqSi3LLM7MzwNyjHUUlJIzE vPSU3UzU4B8JSMDIxNDA0ML3fyy1KK0nPxy3ZRkE6OU1DTzVJM0MyWg8oKi1LTMCrBR0bG1tQD iSrwSWgAAAA== To: Sascha Hauer , BAREBOX Cc: Abdelrahman Youssef X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1729265200; l=1500; i=abdelrahmanyossef12@gmail.com; s=20241017; h=from:subject:message-id; bh=i8c9ivcrgzC7TxEGB7gC3sLaxScw2SEdmsCmpe64u0g=; b=tBpAmcaHlN9jjo3kRbrItMqxBKFKA5ogP/8WjZJlaJbEcA/3oMy2xS9stegVoFyrLc04RufY5 IGx62SlXhrsAqggJN/LbaD7XT1So5KkWohiU+jyvZgKxkLgjEG9HCAm X-Developer-Key: i=abdelrahmanyossef12@gmail.com; a=ed25519; pk=ayjFVDSRo1qKm+PGih8rsNvcMQvJ4ROQWuZWrYU8ujc= X-Endpoint-Received: by B4 Relay for abdelrahmanyossef12@gmail.com/20241017 with auth_id=251 List-Id: B4 Relay Submissions in file_detect_type() to detect file of type socfpga_xload you need at least 68 bytes bytes, so we need to check if we have enough bufsize. So I moved it after checking if `bufsize >= 256`. Signed-off-by: Abdelrahman Youssef --- This patch is a replacement of the last one because there were some issues with it --- common/filetype.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/filetype.c b/common/filetype.c index 3690d4ae07..3f74871d7f 100644 --- a/common/filetype.c +++ b/common/filetype.c @@ -374,9 +374,6 @@ enum filetype file_detect_type(const void *_buf, size_t bufsize) if (le32_to_cpu(buf[5]) == 0x504d5453) return filetype_mxs_bootstream; - if (buf[16] == 0x31305341) - return filetype_socfpga_xload; - if (is_barebox_arm_head(_buf)) return filetype_arm_barebox; if (buf[9] == 0x016f2818 || buf[9] == 0x18286f01) @@ -388,7 +385,10 @@ enum filetype file_detect_type(const void *_buf, size_t bufsize) if (bufsize < 256) return filetype_unknown; - if (strncmp(buf8, "STM\x32", 4) == 0) { + if (buf[16] == 0x31305341) + return filetype_socfpga_xload; + + if (strncmp(buf8, "STM\x32", 4) == 0) { if (buf8[74] == 0x01) { switch(le32_to_cpu(buf[63])) { case 0x00000000: --- base-commit: 9d47ff66c3892c5a6ddd4704993365a797fbeb68 change-id: 20241018-overflow-dc42def7e4f6 Best regards, -- Abdelrahman Youssef