Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change memory types from DWORD to QWORD #3416

Merged
merged 2 commits into from
Jun 12, 2014
Merged

Change memory types from DWORD to QWORD #3416

merged 2 commits into from
Jun 12, 2014

Conversation

OJ
Copy link
Contributor

@OJ OJ commented Jun 1, 2014

This was causing memory allocations to fail on x64 in cases where the higher bits were set in addresses. Yes, another pointer truncation problem.

This is required to make rapid7/meterpreter#76 work in all cases on the MSF side.

@OJ
Change memory types from DWORD to QWORD
8346e20 
This was causing memory allocations to fail on x64 in cases where
the higher bits were set in addresses.
@OJ OJ mentioned this pull request Jun 1, 2014
Merged
4 tasks
@wvu
Copy link
Contributor

wvu commented Jun 2, 2014

Nice catch, @Meatballs1!

@OJ
Updated more UINT TLVs to QWORDS
a53955a 
All with the goal of removing more pointer truncation issues.
@OJ
Copy link
Contributor Author

OJ commented Jun 4, 2014

Updated again to match the changes that are in the Meterpreter side of the PR.

@Meatballs1
Copy link
Contributor

@OJ Do you want to submit the latest bins for this? Or are we going to gem it up?

@OJ
Copy link
Contributor Author

OJ commented Jun 6, 2014

I think we still have to submit bins don't we? The gem thing is not quite
ready.

@todb-r7 can you please confirm?

@OJ
Copy link
Contributor Author

OJ commented Jun 9, 2014

Bump @todb-r7 ?

@todb
Copy link
Contributor

todb commented Jun 9, 2014

Just reviewing the meterpreter side, looks like that was landed after the OpenSSL fixes. (Aka #3423 ). Looks like the testing needed is all doc'ed on the meterpreter side as well.

As for the gem business, not quite there yet, but I'm happy to use this PR as the test case and roll that through tomorrow with @cdoughty-r7 after a quick sync-up.

Thanks for the bump fellows!

Sent from a tiny computer.
PGP KeyId: 4096R/F577904A
https://gist.github.com/todb-r7/84ae2e08eb4dafbc4822
Text (insecure): 512-438-9165

@OJ
Copy link
Contributor Author

OJ commented Jun 9, 2014

Thanks mate. Let me know what you need from me to make this happen. Happy
with using this as the test case too.

@Meatballs1
Copy link
Contributor

💎

@todb-r7
Copy link

todb-r7 commented Jun 12, 2014

Looks good to me.

@todb-r7 todb-r7 merged commit a53955a into rapid7:master Jun 12, 2014
todb-r7 pushed a commit that referenced this pull request Jun 12, 2014
Land #3416, fix DWORD/QWORD bug
40b5405
@todb-r7
Copy link

todb-r7 commented Jun 12, 2014

Note, all I did was step through the use cases on rapid7/meterpreter#76, nothing untoward came up.

@OJ
Copy link
Contributor Author

OJ commented Jun 12, 2014

Awesome, thanks Tod!

@OJ
Copy link
Contributor Author

OJ commented Jun 12, 2014

What's the plan for the binaries?

@Meatballs1
Copy link
Contributor

hehe just raised that question :)

todb-r7 pushed a commit that referenced this pull request Jun 12, 2014
Revert #3416, needs the correct bins first
3d73414 
This was a whoops on my part. I will reland this when I have the
Meterpreter bins all sorted.

This reverts commit 40b5405, reversing
changes made to 86e4eaa.
@todb-r7
Copy link

todb-r7 commented Jun 12, 2014

Yes I'm an idiot, had the binaries generated up but didn't actually do anything with them.

Let me sort that right now. In the meantime, reverted.

To recommit this, revert 3d73414 .

One sec.

@todb-r7
Copy link

todb-r7 commented Jun 12, 2014

Also there is no way this is "newbie friendly."

@wvu
Copy link
Contributor

wvu commented Jun 12, 2014

Who tagged all these PRs as newbie-friendly??

todb-r7 pushed a commit to todb-r7/metasploit-framework that referenced this pull request Jun 12, 2014
Add Meterpreter bins for PR76
af9028e 
These are the binaries generated for rapid7/meterpreter#76 , against
commit 2776adb8b91d9967983033c0e770c46a10a68002

These bins are need to make rapid7#3416 actually functional
todb-r7 pushed a commit to todb-r7/metasploit-framework that referenced this pull request Jun 12, 2014
Land rapid7#3416 again, now that the bins are available
cbedea2 
This reverts commit 3d73414.
@todb-r7 todb-r7 mentioned this pull request Jun 12, 2014
Merged
todb-r7 pushed a commit to todb-r7/metasploit-framework that referenced this pull request Jun 12, 2014
Land rapid7#3450 (techincally not mine but @Meatballs1)
537772e 
This lands rapid7#3416 again as well, but now with the bins from
rapid7/meterpreter#76

Sorry for the mixup.
@OJ
Copy link
Contributor Author

OJ commented Jun 12, 2014

Wasn't me!

@OJ OJ deleted the fix_thread_create branch June 17, 2014 23:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
library meterpreter
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@OJ @wvu @Meatballs1 @todb @todb-r7 @jvazquez-r7