Skip to content

Cp/r136659551 dont crash on malformed corefile #9344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 26, 2024
Merged

Cp/r136659551 dont crash on malformed corefile #9344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e50e19
[lldb] fix one-off error in vformat specifier
jasonmolenda Sep 26, 2024
8f8a9b4
[lldb] [Mach-O corefiles] Sanity check malformed dyld
jasonmolenda Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ void DynamicLoaderDarwin::UpdateSpecialBinariesFromNewImageInfos(
}
}

void DynamicLoaderDarwin::UpdateDYLDImageInfoFromNewImageInfo(
bool DynamicLoaderDarwin::UpdateDYLDImageInfoFromNewImageInfo(
ImageInfo &image_info) {
if (image_info.header.filetype == llvm::MachO::MH_DYLINKER) {
const bool can_create = true;
Expand All @@ -605,8 +605,10 @@ void DynamicLoaderDarwin::UpdateDYLDImageInfoFromNewImageInfo(
target.GetImages().AppendIfNeeded(dyld_sp);
UpdateImageLoadAddress(dyld_sp.get(), image_info);
SetDYLDModule(dyld_sp);
return true;
}
}
return false;
}

std::optional<lldb_private::Address> DynamicLoaderDarwin::GetStartAddress() {
Expand Down
2 changes: 1 addition & 1 deletion lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ class DynamicLoaderDarwin : public lldb_private::DynamicLoader {
UpdateSpecialBinariesFromNewImageInfos(ImageInfo::collection &image_infos);

// if image_info is a dyld binary, call this method
void UpdateDYLDImageInfoFromNewImageInfo(ImageInfo &image_info);
bool UpdateDYLDImageInfoFromNewImageInfo(ImageInfo &image_info);

// If image_infos contains / may contain executable image, call this method
// to keep our internal record keeping of the special dyld binary up-to-date.
Expand Down
5 changes: 4 additions & 1 deletion lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,10 +259,13 @@ bool DynamicLoaderMacOSXDYLD::ReadDYLDInfoFromMemoryAndSetNotificationCallback(
ModuleSP dyld_module_sp;
if (ParseLoadCommands(data, m_dyld, &m_dyld.file_spec)) {
if (m_dyld.file_spec) {
UpdateDYLDImageInfoFromNewImageInfo(m_dyld);
if (!UpdateDYLDImageInfoFromNewImageInfo(m_dyld))
return false;
}
}
dyld_module_sp = GetDYLDModule();
if (!dyld_module_sp)
return false;

Target &target = m_process->GetTarget();

Expand Down
2 changes: 1 addition & 1 deletion lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1412,7 +1412,7 @@ void ObjectFileMachO::SanitizeSegmentCommand(
seg_cmd.cmd == LC_SEGMENT_64 ? "LC_SEGMENT_64" : "LC_SEGMENT";
GetModule()->ReportWarning(
"load command {0} {1} has a fileoff + filesize ({2:x16}) that "
"extends beyond the end of the file ({4:x16}), the segment will be "
"extends beyond the end of the file ({3:x16}), the segment will be "
"truncated to match",
cmd_idx, lc_segment_name, seg_cmd.fileoff + seg_cmd.filesize, m_length);

Expand Down