Author: Jacob Lalonde Date: 2025-02-03T19:22:01-08:00 New Revision: ce7bca76917e6b72615f0f7f90a6e35e681b0d16
URL: https://github.com/llvm/llvm-project/commit/ce7bca76917e6b72615f0f7f90a6e35e681b0d16 DIFF: https://github.com/llvm/llvm-project/commit/ce7bca76917e6b72615f0f7f90a6e35e681b0d16.diff LOG: [LLDB][Save Core Options] Custom ranges should follow the same safety checks as everyone else (#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 #115963 and then realized I was not validated anything from the custom ranges. Added: Modified: lldb/source/Target/Process.cpp lldb/test/API/functionalities/process_save_core_minidump/TestProcessSaveCoreMinidump.py Removed: ################################################################################ diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp index 89731f798deda8..428f8519b72fd5 100644 --- a/lldb/source/Target/Process.cpp +++ b/lldb/source/Target/Process.cpp @@ -6677,11 +6677,8 @@ static void GetUserSpecifiedCoreFileSaveRanges(Process &process, for (const auto &range : regions) { auto entry = option_ranges.FindEntryThatContains(range.GetRange()); - if (entry) { - ranges.Append(range.GetRange().GetRangeBase(), - range.GetRange().GetByteSize(), - CreateCoreFileMemoryRange(range)); - } + if (entry) + AddRegion(range, true, ranges); } } diff --git a/lldb/test/API/functionalities/process_save_core_minidump/TestProcessSaveCoreMinidump.py b/lldb/test/API/functionalities/process_save_core_minidump/TestProcessSaveCoreMinidump.py index 808de687e6ea2e..c2152640c425ce 100644 --- a/lldb/test/API/functionalities/process_save_core_minidump/TestProcessSaveCoreMinidump.py +++ b/lldb/test/API/functionalities/process_save_core_minidump/TestProcessSaveCoreMinidump.py @@ -636,3 +636,42 @@ def minidump_saves_fs_base_region(self): self.assertTrue(self.dbg.DeleteTarget(target)) if os.path.isfile(tls_file): os.unlink(tls_file) + + @skipUnlessPlatform(["linux"]) + @skipUnlessArch("x86_64") + def test_invalid_custom_regions_not_included(self): + options = lldb.SBSaveCoreOptions() + self.build() + exe = self.getBuildArtifact("a.out") + output_file = self.getBuildArtifact("no_empty_regions.dmp") + try: + target = self.dbg.CreateTarget(exe) + process = target.LaunchSimple( + None, None, self.get_process_working_directory() + ) + self.assertState(process.GetState(), lldb.eStateStopped) + options.SetPluginName("minidump") + options.SetOutputFile(lldb.SBFileSpec(output_file)) + options.SetStyle(lldb.eSaveCoreCustomOnly) + region_one = lldb.SBMemoryRegionInfo() + process.GetMemoryRegions().GetMemoryRegionAtIndex(0, region_one) + options.AddMemoryRegionToSave(region_one) + empty_region = lldb.SBMemoryRegionInfo( + "empty region", 0x0, 0x0, 3, True, False + ) + options.AddMemoryRegionToSave(empty_region) + region_with_no_permissions = lldb.SBMemoryRegionInfo( + "no permissions", 0x2AAA, 0x2BBB, 0, True, False + ) + options.AddMemoryRegionToSave(region_with_no_permissions) + error = process.SaveCore(options) + self.assertTrue(error.Success(), error.GetCString()) + core_target = self.dbg.CreateTarget(None) + core_process = core_target.LoadCore(output_file) + self.assertNotIn( + region_with_no_permissions, core_process.GetMemoryRegions() + ) + self.assertNotIn(empty_region, core_process.GetMemoryRegions()) + finally: + if os.path.isfile(output_file): + os.unlink(output_file) _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
