From e31e3fc54517d916e5d5d4e116a3b66aa5c6c179 Mon Sep 17 00:00:00 2001
From: Brent Cook <bcook@rapid7.com>
Date: Mon, 29 May 2017 23:41:10 -0500
Subject: [PATCH] add additional architectures and targets

---
 Gemfile.lock                                  |  4 +--
 metasploit-framework.gemspec                  |  2 +-
 .../exploits/linux/samba/is_known_pipename.rb | 36 +++++++++----------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 1c5394bfd6..2e0377088d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -58,7 +58,7 @@ PATH
       rb-readline
       recog
       redcarpet
-      rex-arch (= 0.1.4)
+      rex-arch
       rex-bin_tools
       rex-core
       rex-encoder
@@ -281,7 +281,7 @@ GEM
     recog (2.1.7)
       nokogiri
     redcarpet (3.4.0)
-    rex-arch (0.1.4)
+    rex-arch (0.1.8)
       rex-text
     rex-bin_tools (0.1.3)
       metasm
diff --git a/metasploit-framework.gemspec b/metasploit-framework.gemspec
index 0e57c6cc1e..157446c165 100644
--- a/metasploit-framework.gemspec
+++ b/metasploit-framework.gemspec
@@ -135,7 +135,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'rex-struct2'
   # Library which contains architecture specific information such as registers, opcodes,
   # and stack manipulation routines.
-  spec.add_runtime_dependency 'rex-arch', '0.1.4'
+  spec.add_runtime_dependency 'rex-arch'
   # Library for working with OLE.
   spec.add_runtime_dependency 'rex-ole'
   # Library for creating and/or parsing MIME messages.
diff --git a/modules/exploits/linux/samba/is_known_pipename.rb b/modules/exploits/linux/samba/is_known_pipename.rb
index c899efb6c1..39db497718 100644
--- a/modules/exploits/linux/samba/is_known_pipename.rb
+++ b/modules/exploits/linux/samba/is_known_pipename.rb
@@ -60,10 +60,13 @@ class MetasploitModule < Msf::Exploit::Remote
           [ 'Linux MIPS',       { 'Arch' => ARCH_MIPS } ],
           [ 'Linux MIPSLE',     { 'Arch' => ARCH_MIPSLE } ],
           [ 'Linux MIPS64',     { 'Arch' => ARCH_MIPS64 } ],
+          [ 'Linux MIPS64LE',   { 'Arch' => ARCH_MIPS64LE } ],
           [ 'Linux PPC',        { 'Arch' => ARCH_PPC } ],
           [ 'Linux PPC64',      { 'Arch' => ARCH_PPC64 } ],
           [ 'Linux PPC64 (LE)', { 'Arch' => ARCH_PPC64LE } ],
           [ 'Linux SPARC',      { 'Arch' => ARCH_SPARC } ],
+          [ 'Linux SPARC64',    { 'Arch' => ARCH_SPARC64 } ],
+          [ 'Linux s390x',      { 'Arch' => ARCH_ZARCH } ],
         ],
       'DefaultOptions' =>
         {
@@ -85,24 +88,21 @@ class MetasploitModule < Msf::Exploit::Remote
   def setup
     super
     @@payload_arch_mappings = {
-        ARCH_X86     => [ 'x86' ],
-        ARCH_X64     => [ 'x86_64' ],
-        ARCH_MIPS    => [ 'mips' ],
-        ARCH_MIPSLE  => [ 'mipsel' ],
-        ARCH_MIPSBE  => [ 'mips' ],
-        ARCH_MIPS64  => [ 'mips64' ],
-        ARCH_PPC     => [ 'powerpc' ],
-        ARCH_PPC64   => [ 'powerpc64' ],
-        ARCH_PPC64LE => [ 'powerpc64le' ],
-        ARCH_SPARC   => [ 'sparc' ],
-        ARCH_ARMLE   => [ 'armel', 'armhf' ],
-        ARCH_AARCH64 => [ 'aarch64' ],
-        #
-        # Missing from Rex::Arch
-        #   ARCH_MIPS64LE = 'mips64el',
-        #   ARCH_SPARC64  = 'sparc64',
-        #   ARCH_S390X    = 's390x',
-        #
+        ARCH_X86      => [ 'x86' ],
+        ARCH_X64      => [ 'x86_64' ],
+        ARCH_MIPS     => [ 'mips' ],
+        ARCH_MIPSLE   => [ 'mipsel' ],
+        ARCH_MIPSBE   => [ 'mips' ],
+        ARCH_MIPS64   => [ 'mips64' ],
+        ARCH_MIPS64LE => [ 'mips64el' ],
+        ARCH_PPC      => [ 'powerpc' ],
+        ARCH_PPC64    => [ 'powerpc64' ],
+        ARCH_PPC64LE  => [ 'powerpc64le' ],
+        ARCH_SPARC    => [ 'sparc' ],
+        ARCH_SPARC64  => [ 'sparc64' ],
+        ARCH_ARMLE    => [ 'armel', 'armhf' ],
+        ARCH_AARCH64  => [ 'aarch64' ],
+        ARCH_ZARCH    => [ 's390x' ],
     }
 
     # Architectures we don't offically support but can shell anyways with interact