Land rapid7#7071, Fix off-by-one error in rapid7#6954

Author: bwatters-r7

lib/msf/core/payload/linux/bind_tcp.rb

@@ -30,7 +30,7 @@ def generate
     }
 
     # Generate the more advanced stager if we have the space
-    if self.available_space && required_space < self.available_space
+    if self.available_space && required_space <= self.available_space
       conf[:exitfunk] = datastore['EXITFUNC'],
       conf[:reliable] = true
     end

lib/msf/core/payload/linux/reverse_tcp.rb

@@ -33,7 +33,7 @@ def generate
     }
 
     # Generate the advanced stager if we have space
-    if self.available_space && required_space < self.available_space
+    if self.available_space && required_space <= self.available_space
       conf[:exitfunk] = datastore['EXITFUNC']
       conf[:reliable] = true
     end

lib/msf/core/payload/windows/bind_tcp.rb

@@ -34,7 +34,7 @@ def generate
     }
 
     # Generate the more advanced stager if we have the space
-    if self.available_space && required_space < self.available_space
+    if self.available_space && required_space <= self.available_space
       conf[:exitfunk] = datastore['EXITFUNC'],
       conf[:reliable] = true
     end

lib/msf/core/payload/windows/bind_tcp_rc4.rb

@@ -32,7 +32,7 @@ def generate
     }
 
     # Generate the more advanced stager if we have the space
-    if self.available_space && required_space < self.available_space
+    if self.available_space && required_space <= self.available_space
       conf[:exitfunk] = datastore['EXITFUNC'],
       conf[:reliable] = true
     end

lib/msf/core/payload/windows/reverse_http.rb

@@ -50,7 +50,7 @@ def generate(opts={})
     }
 
     # Add extra options if we have enough space
-    if self.available_space && required_space < self.available_space
+    if self.available_space && required_space <= self.available_space
       conf[:url]        = luri + generate_uri
       conf[:exitfunk]   = datastore['EXITFUNC']
       conf[:ua]         = datastore['MeterpreterUserAgent']

lib/msf/core/payload/windows/reverse_tcp.rb

@@ -34,7 +34,7 @@ def generate
     }
 
     # Generate the advanced stager if we have space
-    if self.available_space && required_space < self.available_space
+    if self.available_space && required_space <= self.available_space
       conf[:exitfunk] = datastore['EXITFUNC']
       conf[:reliable] = true
     end

lib/msf/core/payload/windows/reverse_tcp_dns.rb

@@ -38,7 +38,7 @@ def generate
     }
 
     # Generate the advanced stager if we have space
-    if self.available_space && required_space < self.available_space
+    if self.available_space && required_space <= self.available_space
       conf[:exitfunk] = datastore['EXITFUNC']
       conf[:reliable] = true
     end

lib/msf/core/payload/windows/reverse_tcp_rc4.rb

@@ -34,7 +34,7 @@ def generate
     }
 
     # Generate the advanced stager if we have space
-    if self.available_space && required_space < self.available_space
+    if self.available_space && required_space <= self.available_space
       conf[:exitfunk] = datastore['EXITFUNC']
       conf[:reliable] = true
     end

lib/msf/core/payload/windows/reverse_tcp_rc4_dns.rb

@@ -34,7 +34,7 @@ def generate
     }
 
     # Generate the advanced stager if we have space
-    if self.available_space && required_space < self.available_space
+    if self.available_space && required_space <= self.available_space
       conf[:exitfunk] = datastore['EXITFUNC']
       conf[:reliable] = true
     end

lib/msf/core/payload/windows/reverse_winhttp.rb

@@ -36,7 +36,7 @@ def generate(opts={})
     }
 
     # Add extra options if we have enough space
-    if self.available_space && required_space < self.available_space
+    if self.available_space && required_space <= self.available_space
       conf[:uri]              = generate_uri
       conf[:exitfunk]         = datastore['EXITFUNC']
       conf[:verify_cert_hash] = opts[:verify_cert_hash]