restore ecx after setting the socket options, set default size

Brent Cook · Brent Cook · commit 5a8b6e90f2eb · 2015-05-06T11:56:07.000-05:00
diff --git a/lib/msf/core/payload/linux/bind_tcp.rb b/lib/msf/core/payload/linux/bind_tcp.rb
@@ -55,7 +55,7 @@ def generate_bind_tcp(opts={})
   #
   def required_space
     # Start with our cached default generated size
-    space = cached_size
+    space = 104
 
     # Reliability checks add 4 bytes for the first check, 5 per recv check (2)
     space += 14
@@ -119,6 +119,7 @@ def asm_bind_tcp(opts={})
         int 0x80
         xchg eax,edi                  ; restore the socket handle
         add esp, 0x14
+        pop ecx
       ^
     end
 

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ def generate_bind_tcp(opts={})`
`55`	`55`	`#`
`56`	`56`	`def required_space`
`57`	`57`	`# Start with our cached default generated size`
`58`		`- space = cached_size`
	`58`	`+ space = 104`
`59`	`59`
`60`	`60`	`# Reliability checks add 4 bytes for the first check, 5 per recv check (2)`
`61`	`61`	`space += 14`
`@@ -119,6 +119,7 @@ def asm_bind_tcp(opts={})`
`119`	`119`	`int 0x80`
`120`	`120`	`xchg eax,edi ; restore the socket handle`
`121`	`121`	`add esp, 0x14`
	`122`	`+ pop ecx`
`122`	`123`	`^`
`123`	`124`	`end`
`124`	`125`