Linux fixes for syscalls, filetracer and added linux support for fileextractor

src/libinjector/linux/methods/linux_read_file.c

@@ -206,8 +206,9 @@ event_response_t handle_read_file(drakvuf_t drakvuf, drakvuf_trap_info_t* info)
             if (!call_open_syscall_cb(injector, info->regs))
                 return cleanup(drakvuf, info, true);
 
+            // Use FILE_BUF_SIZE for the first read, not injector->buffer.len which is 0
             if (!setup_read_syscall(injector, info->regs, injector->fd,
-                    injector->virtual_memory_addr, injector->buffer.len))
+                    injector->virtual_memory_addr, FILE_BUF_SIZE))
                 return cleanup(drakvuf, info, true);
 
             return VMI_EVENT_RESPONSE_SET_REGISTERS;
@@ -234,8 +235,9 @@ event_response_t handle_read_file(drakvuf_t drakvuf, drakvuf_trap_info_t* info)
                 if (!write_buffer_to_file(drakvuf, info, injector->buffer.len))
                     return cleanup(drakvuf, info, true);
 
+                // Always use FILE_BUF_SIZE for the read buffer size
                 if (!setup_read_syscall(injector, info->regs, injector->fd,
-                        injector->virtual_memory_addr, injector->buffer.len))
+                        injector->virtual_memory_addr, FILE_BUF_SIZE))
                     return cleanup(drakvuf, info, true);
 
                 return override_step(base_injector, STEP4, VMI_EVENT_RESPONSE_SET_REGISTERS);
@@ -253,6 +255,8 @@ event_response_t handle_read_file(drakvuf_t drakvuf, drakvuf_trap_info_t* info)
             // restore regs
             copy_gprs(info->regs, &injector->saved_regs);
 
+            injector->rc = INJECTOR_SUCCEEDED;
+
             return VMI_EVENT_RESPONSE_SET_REGISTERS;
         }
         case STEP6: // cleanup

src/plugins/Makefile.am

@@ -148,6 +148,8 @@ sources += fileextractor/fileextractor.h
 sources += fileextractor/private.h
 sources += fileextractor/win.cpp
 sources += fileextractor/win.h
+sources += fileextractor/linux.cpp
+sources += fileextractor/linux.h
 endif
 
 if PLUGIN_OBJMON

src/plugins/fileextractor/fileextractor.cpp

@@ -107,15 +107,18 @@
 
 #include "fileextractor.h"
 #include "win.h"
+#include "linux.h"
 
 fileextractor::fileextractor(drakvuf_t drakvuf, const fileextractor_config* config, output_format_t output) : pluginex(drakvuf, output)
 {
     auto os = drakvuf_get_os_type(drakvuf);
     if (os == VMI_OS_WINDOWS)
         this->wf = std::make_unique<win_fileextractor>(drakvuf, config, output);
+    else if (os == VMI_OS_LINUX)
+        this->lf = std::make_unique<linux_fileextractor>(drakvuf, config, output);
     else
     {
-        PRINT_DEBUG("[FILEEXTRACTOR] Other platforms no supported yet\n");
+        PRINT_DEBUG("[FILEEXTRACTOR] Unsupported platform\n");
         throw -1;
     }
 }
@@ -125,9 +128,11 @@ bool fileextractor::stop_impl()
     auto os = drakvuf_get_os_type(this->drakvuf);
     if (os == VMI_OS_WINDOWS)
         return this->wf->stop();
+    else if (os == VMI_OS_LINUX)
+        return this->lf->stop();
     else
     {
-        PRINT_DEBUG("[FILEEXTRACTOR] Other platforms no supported yet\n");
+        PRINT_DEBUG("[FILEEXTRACTOR] Unsupported platform\n");
         return true;
     }
 }

src/plugins/fileextractor/fileextractor.h

@@ -107,13 +107,15 @@
 
 #include "plugins/plugins_ex.h"
 #include "win.h"
+#include "linux.h"
 
 #include <memory>
 
 class fileextractor : public pluginex
 {
 public:
     std::unique_ptr<win_fileextractor> wf;
+    std::unique_ptr<linux_fileextractor> lf;
 
     fileextractor(drakvuf_t drakvuf, const fileextractor_config* config, output_format_t output);
     ~fileextractor() = default;