Skip to content

Commit ce7bca7

Browse files
authored
[LLDB][Save Core Options] Custom ranges should follow the same safety checks as everyone else (llvm#125323)
I encountered a `qMemoryRegionInfo not supported` error when capturing a Minidump. This was surprising, and I started looking around I found @jasonmolenda's fix in llvm#115963 and then realized I was not validated anything from the custom ranges.
1 parent 635ab51 commit ce7bca7

File tree

2 files changed

+41
-5
lines changed

2 files changed

+41
-5
lines changed

lldb/source/Target/Process.cpp

+2-5
Original file line numberDiff line numberDiff line change
@@ -6677,11 +6677,8 @@ static void GetUserSpecifiedCoreFileSaveRanges(Process &process,
66776677

66786678
for (const auto &range : regions) {
66796679
auto entry = option_ranges.FindEntryThatContains(range.GetRange());
6680-
if (entry) {
6681-
ranges.Append(range.GetRange().GetRangeBase(),
6682-
range.GetRange().GetByteSize(),
6683-
CreateCoreFileMemoryRange(range));
6684-
}
6680+
if (entry)
6681+
AddRegion(range, true, ranges);
66856682
}
66866683
}
66876684

lldb/test/API/functionalities/process_save_core_minidump/TestProcessSaveCoreMinidump.py

+39
Original file line numberDiff line numberDiff line change
@@ -636,3 +636,42 @@ def minidump_saves_fs_base_region(self):
636636
self.assertTrue(self.dbg.DeleteTarget(target))
637637
if os.path.isfile(tls_file):
638638
os.unlink(tls_file)
639+
640+
@skipUnlessPlatform(["linux"])
641+
@skipUnlessArch("x86_64")
642+
def test_invalid_custom_regions_not_included(self):
643+
options = lldb.SBSaveCoreOptions()
644+
self.build()
645+
exe = self.getBuildArtifact("a.out")
646+
output_file = self.getBuildArtifact("no_empty_regions.dmp")
647+
try:
648+
target = self.dbg.CreateTarget(exe)
649+
process = target.LaunchSimple(
650+
None, None, self.get_process_working_directory()
651+
)
652+
self.assertState(process.GetState(), lldb.eStateStopped)
653+
options.SetPluginName("minidump")
654+
options.SetOutputFile(lldb.SBFileSpec(output_file))
655+
options.SetStyle(lldb.eSaveCoreCustomOnly)
656+
region_one = lldb.SBMemoryRegionInfo()
657+
process.GetMemoryRegions().GetMemoryRegionAtIndex(0, region_one)
658+
options.AddMemoryRegionToSave(region_one)
659+
empty_region = lldb.SBMemoryRegionInfo(
660+
"empty region", 0x0, 0x0, 3, True, False
661+
)
662+
options.AddMemoryRegionToSave(empty_region)
663+
region_with_no_permissions = lldb.SBMemoryRegionInfo(
664+
"no permissions", 0x2AAA, 0x2BBB, 0, True, False
665+
)
666+
options.AddMemoryRegionToSave(region_with_no_permissions)
667+
error = process.SaveCore(options)
668+
self.assertTrue(error.Success(), error.GetCString())
669+
core_target = self.dbg.CreateTarget(None)
670+
core_process = core_target.LoadCore(output_file)
671+
self.assertNotIn(
672+
region_with_no_permissions, core_process.GetMemoryRegions()
673+
)
674+
self.assertNotIn(empty_region, core_process.GetMemoryRegions())
675+
finally:
676+
if os.path.isfile(output_file):
677+
os.unlink(output_file)

0 commit comments

Comments
 (0)