Skip to contentSkip to conversation

common: buffer access out-of-bounds

PATCH Superseded Abdelrahman Youssef 2 participants 5 messages Oct 18, 2024

v2 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

v2 cover common: buffer access out-of-bounds

---
Abdelrahman Youssef (2):
include: Include <linux/math.h> to resolve implicit declaration of do_div()
common: buffer access out-of-bounds

 common/filetype.c     | 8 ++++----
 include/linux/ktime.h | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

---
base-commit: 9d47ff66c3892c5a6ddd4704993365a797fbeb68
change-id: 20241017-errors_fixes-81248755b864

Best regards,

Signature · 1 line
Abdelrahman Youssef <[email protected]>
#1 lore raw

PATCH v2 1/2 include: Include <linux/math.h> to resolve implicit declaration of do_div()

I was testing barebox with randconfig, so I got a warning (treated as an error) : implicit declaration of do_div(). So <linux/math.h> needs to included.

---
 include/linux/ktime.h | 1 +
 1 file changed, 1 insertion(+)
include/linux/ktime.h +1 -0
index ea368b8802..2b9a91d540 100644
@@ -21,6 +21,7 @@
 #ifndef _LINUX_KTIME_H
 #define _LINUX_KTIME_H
 
+#include <linux/math.h>
 #include <linux/time.h>
 #include <clock.h>
 #include <linux/bug.h>
Signature · 1 line
2.43.0
#2 lore raw

Re: [PATCH v2 1/2] include: Include <linux/math.h> to resolve implicit declaration of do_div()

Hello Abdelrahman,

Quoted 6 lines · On 18.10.24 13:45, Abdelrahman Youssef via B4 Relay wrote:

From: Abdelrahman Youssef <[email protected]>

I was testing barebox with randconfig, so I got a warning (treated as an error) : implicit declaration of do_div(). So <linux/math.h> needs to included.

If there's no changes to v1, there no need to resend.

Cheers,
Ahmad

Quoted 17 lines
---
 include/linux/ktime.h | 1 +
 1 file changed, 1 insertion(+)
include/linux/ktime.h +1 -0
index ea368b8802..2b9a91d540 100644
@@ -21,6 +21,7 @@
 #ifndef _LINUX_KTIME_H
 #define _LINUX_KTIME_H
 
+#include <linux/math.h>
 #include <linux/time.h>
 #include <clock.h>
 #include <linux/bug.h>
Signature · 4 lines
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
#3 lore raw

PATCH v2 2/2 common: buffer access out-of-bounds

In reply to Abdelrahman Youssef

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.

---
 common/filetype.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
common/filetype.c +4 -4
index 3690d4ae07..3f74871d7f 100644
@@ -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:
Signature · 1 line
2.43.0
#4 lore raw

Hi,

Quoted 7 lines · On 18.10.24 13:45, Abdelrahman Youssef via B4 Relay wrote:

From: Abdelrahman Youssef <[email protected]>

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.

Given that there's a small thing to fix with this patch, please resend it separately with below point addressed.

Quoted 19 lines
---
 common/filetype.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
common/filetype.c +0 -3
index 3690d4ae07..3f74871d7f 100644
@@ -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)

common/filetype.c enum filetype file_detect_type(const void *_buf, size_t bufsize) · line 391

Quoted 8 lines
common/filetype.c +4 -1
@@ -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) {

This whitespace change is unrelated to your fix.

Quoted 4 lines
common/filetype.c +0 -0
 		if (buf8[74] == 0x01) {
 			switch(le32_to_cpu(buf[63])) {
 			case 0x00000000:
Signature · 4 lines
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |