Skip to content

Ghidra is a software reverse engineering (SRE) framework

GP-7233: Validating minidump stream count

d-millar33d0e045bdc5
diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/Directory.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/Directory.java
index 898ed733f9..74feef4fd7 100644
--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/Directory.java
+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/Directory.java
@@ -39,6 +39,8 @@ public class Directory implements StructConverter {
public final static int MEMORY_INFO_LIST_STREAM = 0x10;
public final static int TOKEN_LIST_STREAM = 0x13;
+ protected static final int STRUCTURE_SIZE = 12;
+
private final static String[] names = {
"UnusedStream", "ReservedStream0", "ReservedStream1", "ThreadListStream",
"ModuleListStream", "MemoryListStream", "ExceptionStream", "SystemInfoStream ",
diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/MdmpFileHeader.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/MdmpFileHeader.java
index 23f6f1a503..f28e607101 100644
--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/MdmpFileHeader.java
+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/MdmpFileHeader.java
@@ -29,7 +29,7 @@ public class MdmpFileHeader implements StructConverter {
private int signature;
private int version;
private int numberOfStreams;
- private long streamDirectoryRVA;
+ private int streamDirectoryRVA;
private int checkSum;
private int timeDateStamp;
private long flags;
@@ -54,6 +54,19 @@ public class MdmpFileHeader implements StructConverter {
setCheckSum(reader.readNextInt());
setTimeDateStamp(reader.readNextInt());
setFlags(reader.readNextLong());
+ validateNumberOfStreams();
+ }
+
+ private void validateNumberOfStreams() throws IOException {
+ long numberOfStreamsUnsigned = Integer.toUnsignedLong(numberOfStreams);
+ long streamDirectoryRvaUnsigned = Integer.toUnsignedLong(streamDirectoryRVA);
+
+ long requiredBytes = numberOfStreamsUnsigned * Directory.STRUCTURE_SIZE;
+ long requiredOffset = streamDirectoryRvaUnsigned + requiredBytes;
+
+ if (requiredOffset < streamDirectoryRvaUnsigned || requiredOffset > reader.length()) {
+ throw new IOException("Invalid MDMP header: Number of streams exceeds file bounds.");
+ }
}
/**
@@ -105,7 +118,7 @@ public class MdmpFileHeader implements StructConverter {
return numberOfStreams;
}
- public void setStreamDirectoryRVA(long streamDirectoryRVA) {
+ public void setStreamDirectoryRVA(int streamDirectoryRVA) {
this.streamDirectoryRVA = streamDirectoryRVA;
}