From: Abdelrahman Youssef Date: Fri, 18 Oct 2024 20:13:31 +0300 Subject: [PATCH v5] 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-v5-1-6a438ff92ca2@gmail.com> X-B4-Tracking: v=1; b=H4sIADqXEmcC/3WMyw7CIBBFf6WZtRgo2Icr/8O4QBjaSdrSgEFN0 3+XduVCl+fmnrNAxEAY4VwsEDBRJD9lOB0KML2eOmRkM0PJSyW4aJhPGNzgn8waVVp0NSpXQb7 PAR299tT1lrmn+PDhvZeT3NYfkSSZYJJb0zYOW8n1pRs1DUfjR9giSf0TVRbvXKOtayGsqb7Fd V0/F20N9NkAAAA= To: Sascha Hauer , BAREBOX Cc: Abdelrahman Youssef X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1729271617; l=1673; i=abdelrahmanyossef12@gmail.com; s=20241017; h=from:subject:message-id; bh=ECwB9jAzpYJYU3ijMMyMb/rTEhskLDq37D0Kv7kaNzo=; b=xw5QaH1/ThujjiNaG1TfAxd6jSF0F0hTBVGlHqbF50u93D06rTulrJw39otjN+2++1GXCNQ2X ybI77z/2vBJCjaP+UcHcKZrKwhwFncCS89APkRFJN+5LKwKhg/geMVf 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 --- To: Sascha Hauer To: open list:BAREBOX Signed-off-by: Abdelrahman Youssef --- Changes in v5: Removed leading spaces that misaliged the code in v3 --- common/filetype.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/filetype.c b/common/filetype.c index 3690d4ae07..67ae4916d1 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,6 +385,9 @@ enum filetype file_detect_type(const void *_buf, size_t bufsize) if (bufsize < 256) return filetype_unknown; + 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])) { --- base-commit: 9d47ff66c3892c5a6ddd4704993365a797fbeb68 change-id: 20241018-overflow-dc42def7e4f6 Best regards, -- Abdelrahman Youssef