Check payload arch

Author: Meatballs1

modules/exploits/windows/smb/psexec_psh.rb

@@ -52,11 +52,11 @@ def initialize(info = {})
 					'DisableNops'  => true,
 					'StackAdjustment' => -3500
 				},
-			'Arch'		 => [ ARCH_X86, ARCH_X86_64 ],
 			'Platform'       => 'win',
 			'Targets'        =>
 				[
-					[ 'Automatic', { } ],
+					[ 'Windows x86', { 'Arch' => ARCH_X86 } ],
+					[ 'Windows x64', { 'Arch' => ARCH_X86_64 } ]
 				],
 			'DefaultTarget'  => 0,
 			'References'     => [
@@ -77,6 +77,10 @@ def exploit
 			print_warning("You probably want to DisablePayloadHandler and use exploit/multi/handler with the PERSIST option.")
 		end
 
+		if datastore['RUN_WOW64'] and target_arch.first == "x86_64"
+			fail_with(Exploit::Failure::BadConfig, "Select an x86 target and payload with RUN_WOW64 enabled")
+		end
+
 		#Try and authenticate with given credentials
 		if connect
 			begin