[lldb][FreeBSDKernel] Add missing error checks in DynamicLoader

[mchoo7]

Add extra guards in case a call to function fails. For example, the result of ReadMemory() cannot be trusted when error.Fail() is true, and this change ensures the code executes properly according to the value of the error.

[llvmbot]

@llvm/pr-subscribers-lldb

Author: Minsoo Choo (mchoo7)

Changes

Add extra guards in case a call to function fails. For example, the result of ReadMemory() cannot be trusted when error.Fail() is true, and this change ensures the code executes properly according to the value of the error.

---

Full diff: https://github.com/llvm/llvm-project/pull/189250.diff

1 Files Affected:

• (modified) lldb/source/Plugins/DynamicLoader/FreeBSD-Kernel/DynamicLoaderFreeBSDKernel.cpp (+3-3)

diff --git a/lldb/source/Plugins/DynamicLoader/FreeBSD-Kernel/DynamicLoaderFreeBSDKernel.cpp b/lldb/source/Plugins/DynamicLoader/FreeBSD-Kernel/DynamicLoaderFreeBSDKernel.cpp
index 00b1de6aee369..c2329f17b339d 100644
--- a/lldb/source/Plugins/DynamicLoader/FreeBSD-Kernel/DynamicLoaderFreeBSDKernel.cpp
+++ b/lldb/source/Plugins/DynamicLoader/FreeBSD-Kernel/DynamicLoaderFreeBSDKernel.cpp
@@ -162,7 +162,7 @@ bool DynamicLoaderFreeBSDKernel::ReadELFHeader(Process *process,
     *read_error = false;
 
   if (process->ReadMemory(addr, &header, sizeof(header), error) !=
-      sizeof(header)) {
+      sizeof(header) || error.Fail()) {
     if (read_error)
       *read_error = true;
     return false;
@@ -291,7 +291,7 @@ bool DynamicLoaderFreeBSDKernel::KModImageInfo::ReadMemoryModule(
       llvm::ELF::Elf64_Ehdr elf_eheader;
       Status error;
       if (process->ReadMemory(m_load_address, &elf_eheader, sizeof(elf_eheader),
-                              error) == sizeof(elf_eheader))
+                              error) == sizeof(elf_eheader) && error.Success())
         size_to_read = sizeof(llvm::ELF::Elf64_Ehdr) +
                        elf_eheader.e_phnum * elf_eheader.e_phentsize;
     }
@@ -358,7 +358,7 @@ bool DynamicLoaderFreeBSDKernel::KModImageInfo::LoadImageUsingMemoryModule(
       if (IsKernel()) {
         Status error;
         if (PluginManager::DownloadObjectAndSymbolFile(module_spec, error,
-                                                       true)) {
+                                                       true) && error.Success()) {
           if (FileSystem::Instance().Exists(module_spec.GetFileSpec()))
             m_module_sp = std::make_shared<Module>(module_spec.GetFileSpec(),
                                                    target.GetArchitecture());

[github-actions]

✅ With the latest revision this PR passed the C/C++ code formatter.

[aokblast]

LGTM