Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-21 11:31:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-4886_ghidra1_UnassignedStorageForDefaultDatatype'

Browse Source
This commit is contained in:
Ryan Kurtz 2024-11-15 13:24:39 -05:00
commit 83d38b8368
6 changed files with 82 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemangledDataType.java
View File

@ -95,8 +95,8 @@ public class DemangledDataType extends DemangledType {
private static final String UNSIGNED_LONG = "unsigned long";
public final static String[] PRIMITIVES =
{ VOID, BOOL, CHAR, WCHAR_T, WCHAR16, WCHAR32, CHAR8_T, SHORT, INT, INT0_T, LONG,
LONG_LONG, FLOAT, FLOAT2, DOUBLE, INT128, FLOAT128, LONG_DOUBLE, };
{ VOID, BOOL, CHAR, WCHAR_T, WCHAR16, WCHAR32, CHAR8_T, SHORT, INT, INT0_T, LONG, LONG_LONG,
FLOAT, FLOAT2, DOUBLE, INT128, FLOAT128, LONG_DOUBLE, };
private int arrayDimensions = 0;
private boolean isClass;
@ -200,10 +200,10 @@ public class DemangledDataType extends DemangledType {
else if (dt == null) {
// I don't know what this is
// If it isn't pointed to, or isn't a referent, then assume typedef.
// If it isn't pointed to, or isn't a referent, then assume undefined typedef.
if (!(isReference() || isPointer())) { // Unknown type
dt = new TypedefDataType(getDemanglerCategoryPath(getNamespace()), name,
new DWordDataType());
DataType.DEFAULT);
}
else {
// try creating empty structures for unknown types instead.

55
Ghidra/Features/GnuDemangler/src/test/java/ghidra/app/util/demangler/gnu/GnuDemanglerTest.java
View File

@ -26,6 +26,7 @@ import generic.test.AbstractGenericTest;
import ghidra.app.util.demangler.*;
import ghidra.program.database.ProgramDB;
import ghidra.program.model.address.Address;
import ghidra.program.model.data.DataType;
import ghidra.program.model.data.TerminatedStringDataType;
import ghidra.program.model.listing.CodeUnit;
import ghidra.program.model.listing.Data;
@ -128,6 +129,60 @@ public class GnuDemanglerTest extends AbstractGenericTest {
fullSignature);
}
@Test
public void testUseStandardReplacements2() throws Exception {
//
// Mangled: _ZN7Greeter5greetENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
//
// Demangled: undefined Greeter::greet(std::__cxx11::basic_string<char,std::char_traits<char>,std::allocator<char>>)
//
// Replaced: undefined Greeter::greet(std::string)
//
String mangled = "_ZN7Greeter5greetENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE";
GnuDemangler demangler = new GnuDemangler();
demangler.canDemangle(program);// this perform initialization
GnuDemanglerOptions options = new GnuDemanglerOptions();
options.setUseStandardReplacements(true);
DemangledFunction dobj = (DemangledFunction) demangler.demangle(mangled, options);
assertNotNull(dobj);
String signature = dobj.getSignature();
assertEquals("undefined Greeter::greet(std::string)", signature);
DemangledParameter demangledParameter = dobj.getParameters().get(0);
DemangledDataType type = demangledParameter.getType();
DataType dt = type.getDataType(program.getDataTypeManager());
assertTrue(dt.isNotYetDefined());
//@formatter:off
assertEquals("/Demangler/std/string\n" +
"pack(disabled)\n" +
"Structure string {\n" +
"}\n" +
"Length: 0 Alignment: 1\n", dt.toString());
//@formatter:on
//
// Now disable demangled string replacement
//
options.setUseStandardReplacements(false);
dobj = (DemangledFunction) demangler.demangle(mangled, options);
assertNotNull(dobj);
String fullSignature = dobj.getSignature();
assertEquals(
"undefined Greeter::greet(std::__cxx11::basic_string<char,std::char_traits<char>,std::allocator<char>>)",
fullSignature);
demangledParameter = dobj.getParameters().get(0);
type = demangledParameter.getType();
dt = type.getDataType(program.getDataTypeManager());
assertEquals("typedef basic_string undefined", dt.toString());
}
@Test
public void testDemangleOnlyKnownPatterns_True() throws Exception {

14
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/function/FunctionDB.java
View File

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -2470,16 +2470,6 @@ public class FunctionDB extends DatabaseObject implements Function {
return thunkedFunction.getSignatureSource();
}
// Force DEFAULT source if any param has unassigned storage
if (!getReturn().isValid()) {
return SourceType.DEFAULT;
}
for (Parameter param : getParameters()) {
if (!param.isValid()) {
return SourceType.DEFAULT;
}
}
return getStoredSignatureSource();
}
finally {

13
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/ParamListStandard.java
View File

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -23,8 +23,7 @@ import java.util.ArrayList;
import ghidra.program.model.address.Address;
import ghidra.program.model.address.AddressSpace;
import ghidra.program.model.data.DataType;
import ghidra.program.model.data.DataTypeManager;
import ghidra.program.model.data.*;
import ghidra.program.model.lang.protorules.*;
import ghidra.program.model.listing.Program;
import ghidra.program.model.listing.VariableStorage;
@ -133,6 +132,12 @@ public class ParamListStandard implements ParamList {
if (dt.isZeroLength()) {
return AssignAction.NO_ASSIGNMENT;
}
if (dt == DataType.DEFAULT) {
return AssignAction.NO_ASSIGNMENT;
}
if (dt instanceof TypeDef td && td.getBaseDataType() == DataType.DEFAULT) {
return AssignAction.NO_ASSIGNMENT;
}
for (ModelRule modelRule : modelRules) {
int responseCode = modelRule.assignAddress(dt, proto, pos, dtManager, status, res);
if (responseCode != AssignAction.FAIL) {

15
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/LocalSymbolMap.java
View File

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -210,11 +210,12 @@ public class LocalSymbolMap {
pcaddr = pcaddr.subtractWrap(1);
List<HighSymbol> paramList = new ArrayList<>();
boolean internalInvalid = false;
for (int i = 0; i < p.length; ++i) {
Parameter var = p[i];
if (!var.isValid()) {
// TODO: exclude parameters which don't have valid storage ??
continue;
internalInvalid = true;
break;
}
DataType dt = var.getDataType();
String name = var.getName();
@ -243,6 +244,12 @@ public class LocalSymbolMap {
paramSymbol.setNameLock(namelock);
paramSymbol.setTypeLock(lock);
}
if (internalInvalid) {
// Can only send down a partial prototype. Let decompiler try to recover the whole.
for (HighSymbol paramSymbol : paramList) {
paramSymbol.setTypeLock(false);
}
}
paramSymbols = new HighSymbol[paramList.size()];
paramList.toArray(paramSymbols);

5
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/PcodeDataTypeManager.java
View File

@ -1147,10 +1147,7 @@ public class PcodeDataTypeManager {
private void generateCoreTypes() {
voidDt = new VoidDataType(progDataTypes);
coreBuiltin = new HashMap<Long, TypeMap>();
TypeMap type = new TypeMap(DataType.DEFAULT, "undefined", "unknown", false, false,
DEFAULT_DECOMPILER_ID);
coreBuiltin.put(type.id, type);
type = new TypeMap(displayLanguage, VoidDataType.dataType, "void", false, false,
TypeMap type = new TypeMap(displayLanguage, VoidDataType.dataType, "void", false, false,
builtInDataTypes);
coreBuiltin.put(type.id, type);