Fixed faulty read loop #1239
Merged
Fixed faulty read loop #1239
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Can you add a test for this? Probably easiest to use the runners to exec your shellcode. |
|
That should be doable, but how do I run a doctest from inside a template? |
|
@zachriggle I added a doctest the same way as the echo shellcode did it but I don't know how to actually run it. However, if I run the code manually I get the expected result. |
zachriggle
requested changes
Jan 15, 2019
|
|
||
| >>> stage_2 = asm(shellcraft.echo('hello') + "\n" + shellcraft.syscalls.exit(42)) | ||
| >>> p = run_assembly(shellcraft.stager(0, len(stage_2))) | ||
| >>> for c in stage_2: |
There was a problem hiding this comment.
Your indentation is incorrect here. Looks like you added a tab. The error on Travis is a bit misleading, but this is the reason.
**********************************************************************
File "shellcraft/i386.rst", line ?, in default
Failed example:
for c in stage_2:
Exception raised:
Traceback (most recent call last):
File "/opt/python/2.7.14/lib/python2.7/doctest.py", line 1315, in __run
compileflags, 1) in test.globs
File "/home/travis/virtualenv/python2.7.14/lib/python2.7/site-packages/sphinx/ext/doctest.py", line 480, in compile
return compile(code, name, self.type, flags, dont_inherit)
File "<doctest default[2]>", line 1
for c in stage_2:
^
SyntaxError: unexpected EOF while parsing
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
i386 linux stager had socket in wrong register and did not increment the destination pointer register after each read. This PR fixes this issue.