fix: changes based on review comments

Author: dledda-r7

lib/msf/base/sessions/mettle_config.rb

@@ -6,7 +6,6 @@
 module Msf
   module Sessions
     module MettleConfig
-
       include Msf::Payload::TransportConfig
 
       def initialize(info = {})
@@ -19,15 +18,21 @@ def initialize(info = {})
               'Fork a new process if the functionality is available',
               default: false
             ),
-            OptEnum.new(
-              'MeterpreterLinuxMinKernel', 
-              [true, 'Linux minimum kernel version for compatibility', '2.6+', ['2.6+', '3.17+']]
-            )
           ]
         )
+        unless staged?
+          register_advanced_options(
+            [
+              OptEnum.new(
+                'PayloadLinuxMinKernel',
+                [true, 'Linux minimum kernel version for compatibility', '2.6+', ['2.6+', '3.17+']]
+              )
+            ]
+          )
+        end
       end
 
-      def generate_uri(opts={})
+      def generate_uri(opts = {})
         ds = opts[:datastore] || datastore
         uri_req_len = ds['StagerURILength'].to_i
 
@@ -37,7 +42,7 @@ def generate_uri(opts={})
         end
 
         if uri_req_len < 5
-          raise ArgumentError, "Minimum StagerURILength is 5"
+          raise ArgumentError, 'Minimum StagerURILength is 5'
         end
 
         generate_uri_uuid_mode(:init_connect, uri_req_len, uuid: opts[:uuid])
@@ -80,7 +85,7 @@ def generate_tcp_uri(opts)
         target_uri
       end
 
-      def generate_config(opts={})
+      def generate_config(opts = {})
         ds = opts[:datastore] || datastore
 
         opts[:background] = ds['MeterpreterTryToFork'] ? 1 : 0
@@ -121,7 +126,6 @@ def encode_stage?
 
         false
       end
-
     end
   end
 end

lib/msf/core/payload/linux/aarch64/meterpreter_loader.rb renamed to lib/msf/core/payload/linux/aarch64/elf_loader.rb

@@ -7,11 +7,11 @@
 #  Parameters: x0-x7
 #  Syscall offset: x8
 #  Return Address for BL: x30
-
-module Msf::Payload::Linux::Aarch64::MeterpreterLoader
+#
+module Msf::Payload::Linux::Aarch64::ElfLoader
   def in_memory_load(payload)
     in_memory_loader = [
-      # fd = memfd_create(NULL,MFD_CLOEXEC) 
+      # fd = memfd_create(NULL,MFD_CLOEXEC)
       0x0a0080d2, # 0x1000:	mov	x10, #0	0x0a0080d2
       0xea0300f9, # 0x1004:	str	x10, [sp]	0xea0300f9
       0xe0030091, # 0x1008:	mov	x0, sp	0xe0030091

lib/msf/core/payload/linux/armbe/meterpreter_loader.rb renamed to lib/msf/core/payload/linux/armbe/elf_loader.rb

@@ -1,4 +1,3 @@
-
 #
 # In memory loader used to execute Mettle ELF file.
 # Compatible with Kernel Linux >= 3.17 (where memfd_create is introduced)
@@ -8,8 +7,8 @@
 #  Parameters: r0-r6
 #  Syscall offset: r7
 #  Return Address: lr/r14
-
-module Msf::Payload::Linux::Armbe::MeterpreterLoader
+#
+module Msf::Payload::Linux::Armbe::ElfLoader
   def in_memory_load(payload)
     in_memory_loader = [
       # fd = memfd_create(NULL,MFD_CLOEXEC)

lib/msf/core/payload/linux/armle/meterpreter_loader.rb renamed to lib/msf/core/payload/linux/armle/elf_loader.rb

@@ -7,8 +7,8 @@
 #  Parameters: r0-r6
 #  Syscall offset: r7
 #  Return Address: lr/r14
-
-module Msf::Payload::Linux::Armle::MeterpreterLoader
+#
+module Msf::Payload::Linux::Armle::ElfLoader
   def in_memory_load(payload)
     in_memory_loader = [
       # fd = memfd_create(NULL,MFD_CLOEXEC)

lib/msf/core/payload/linux/mips64/meterpreter_loader.rb renamed to lib/msf/core/payload/linux/mips64/elf_loader.rb

@@ -9,8 +9,8 @@
 #  Parameters: a0-a3
 #  Syscall offset: v0
 #  Return Address: ra
-
-module Msf::Payload::Linux::Mips64::MeterpreterLoader
+#
+module Msf::Payload::Linux::Mips64::ElfLoader
   def in_memory_load(payload)
     size = payload.length
     size_h = size >> 16

lib/msf/core/payload/linux/mipsbe/meterpreter_loader.rb renamed to lib/msf/core/payload/linux/mipsbe/elf_loader.rb

@@ -9,8 +9,8 @@
 #  Parameters: a0-a3
 #  Syscall offset: v0
 #  Return Address: ra
-
-module Msf::Payload::Linux::Mipsbe::MeterpreterLoader
+#
+module Msf::Payload::Linux::Mipsbe::ElfLoader
   def in_memory_load(payload)
     size = payload.length
     size_h = size >> 16

lib/msf/core/payload/linux/mipsle/meterpreter_loader.rb renamed to lib/msf/core/payload/linux/mipsle/elf_loader.rb

@@ -9,8 +9,8 @@
 #  Parameters: a0-a3
 #  Syscall offset: v0
 #  Return Address: ra
-
-module Msf::Payload::Linux::Mipsle::MeterpreterLoader
+#
+module Msf::Payload::Linux::Mipsle::ElfLoader
   def in_memory_load(payload)
     size = payload.length
     size_h = size >> 16

lib/msf/core/payload/linux/ppc/meterpreter_loader.rb renamed to lib/msf/core/payload/linux/ppc/elf_loader.rb

@@ -3,14 +3,14 @@
 # Compatible with Kernel Linux >= 3.17 (where memfd_create is introduced)
 # Author: Martin Sutovsky <martin_sutovsky[at]rapid7.com>
 # Resource and Credits: https://magisterquis.github.io/2018/03/31/in-memory-only-elf-execution.html
-# PPC conventions 
+# PPC conventions
 #  Syscall Offset: r0
 #  Return value: r3
 #  Return Address: lr
 #  Stack Pointer: r1
 #  Parameters: r3-r10
-
-module Msf::Payload::Linux::Ppc::MeterpreterLoader
+#
+module Msf::Payload::Linux::Ppc::ElfLoader
   def in_memory_load(payload)
     in_memory_loader = [
       # jump to address 0x105c
@@ -53,6 +53,4 @@ def in_memory_load(payload)
     ].pack('N*')
     in_memory_loader
   end
-
 end
-

lib/msf/core/payload/linux/ppc64le/meterpreter_loader.rb renamed to lib/msf/core/payload/linux/ppc64le/elf_loader.rb

@@ -9,8 +9,8 @@
 #  Return Address: lr
 #  Stack Pointer: r1
 #  Parameters: r3-r10
-
-module Msf::Payload::Linux::Ppc64le::MeterpreterLoader
+#
+module Msf::Payload::Linux::Ppc64le::ElfLoader
   def in_memory_load(payload)
     in_memory_loader = [
       # jump to address 0x105c

lib/msf/core/payload/linux/ppce500v2/meterpreter_loader.rb renamed to lib/msf/core/payload/linux/ppce500v2/elf_loader.rb

@@ -9,14 +9,14 @@
 #  Return Address: lr
 #  Stack Pointer: r1
 #  Parameters: r3-r10
-
-module Msf::Payload::Linux::Ppce500v2::MeterpreterLoader
+#
+module Msf::Payload::Linux::Ppce500v2::ElfLoader
   def in_memory_load(payload)
     in_memory_loader = [
       # jump to address 0x105c
       0x4800005c, # 0x1000:	b	0x105c	0x4800005c
 
-      # move from link register (lr) to r15 
+      # move from link register (lr) to r15
       0x7de802a6, # 0x1004:	mflr	r15	0x7de802a6
 
       # fd = memfd_create(NULL,MFD_CLOEXEC)
@@ -52,5 +52,4 @@ def in_memory_load(payload)
     ].pack('N*')
     in_memory_loader
   end
-
 end