Skip to contentSkip to conversation

jffsX-utils: fix integer overflow in jffs2dump.c

PATCH In review Anton Moryakov 2 participants 2 messages Dec 19, 2024 – Dec 20, 2024 Memory technology devices (MTD)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 jffsX-utils: fix integer overflow in jffs2dump.c

Report of the static analyzer:
The value of an arithmetic expression 'datsize + oobsize' is a subject to overflow because its operands are not cast to a larger data type before performing arithmetic.

Corrections explained:
- Added a check to validate datsize and oobsize to ensure they are non-negative and within a safe range.
- Cast datsize and oobsize to long before performing arithmetic to prevent potential integer overflow.

This change ensures safe computation of offsets and prevents undefined behavior caused by overflow.

---
 jffsX-utils/jffs2dump.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
jffsX-utils/jffs2dump.c +8 -1
index 30455ea..5b0e144 100644
@@ -772,6 +772,13 @@ int main(int argc, char **argv)
 		exit(EXIT_FAILURE);
 	}
 
+	if (datsize < 0  oobsize < 0  datsize > imglen || (long)datsize + oobsize < 0) {
+		fprintf(stderr, "Error: invalid datsize/oobsize.\n");
+		free(data);
+		close (fd);
+		exit(EXIT_FAILURE);
+	}
+
 	if (datsize && oobsize) {
 		int  idx = 0;
 		long len = imglen;
@@ -783,7 +790,7 @@ int main(int argc, char **argv)
 			read_nocheck (fd, oob, oobsize);
 			idx += datsize;
 			imglen -= oobsize;
-			len -= datsize + oobsize;
+			len -= (long)datsize + oobsize;
 		}
 
 	} else {
Signature · 6 lines
2.30.2


______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
#1 lore raw
Quoted 19 lines · Anton Moryakov

Report of the static analyzer:
The value of an arithmetic expression 'datsize + oobsize' is a subject to overflow because its operands are not cast to a larger data type before performing arithmetic.

Corrections explained:
- Added a check to validate datsize and oobsize to ensure they are non-negative and within a safe range.
- Cast datsize and oobsize to long before performing arithmetic to prevent potential integer overflow.

This change ensures safe computation of offsets and prevents undefined behavior caused by overflow.

---
  jffsX-utils/jffs2dump.c | 9 ++++++++-
  1 file changed, 8 insertions(+), 1 deletion(-)
jffsX-utils/jffs2dump.c +0 -0
index 30455ea..5b0e144 100644

jffsX-utils/jffs2dump.c int main(int argc, char **argv) · line 775

Quoted 4 lines
jffsX-utils/jffs2dump.c +1 -0
@@ -772,6 +772,13 @@ int main(int argc, char **argv)
  		exit(EXIT_FAILURE);
  	}
 
+	if (datsize < 0  oobsize < 0  datsize > imglen || (long)datsize + oobsize < 0) {

It makes compiling failed, please do the basic tests before sending patches out.

Quoted 11 lines
jffsX-utils/jffs2dump.c +6 -0
+		fprintf(stderr, "Error: invalid datsize/oobsize.\n");
+		free(data);
+		close (fd);
+		exit(EXIT_FAILURE);
+	}
+
  	if (datsize && oobsize) {
  		int  idx = 0;
  		long len = imglen;

jffsX-utils/jffs2dump.c int main(int argc, char **argv) · line 796

Quoted 8 lines
jffsX-utils/jffs2dump.c +1 -1
@@ -783,7 +790,7 @@ int main(int argc, char **argv)
  			read_nocheck (fd, oob, oobsize);
  			idx += datsize;
  			imglen -= oobsize;
-			len -= datsize + oobsize;
+			len -= (long)datsize + oobsize;
  		}
 
  	} else {

______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/