Skip to content

fixed wrong description for shellcraft.amd64.linux.kill()... #1739

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.

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

Merged
merged 5 commits into from
Apr 15, 2021

Conversation

robre
Copy link
Contributor

@robre robre commented Dec 7, 2020

... new desciption copied from pwntools/pwnlib/shellcraft/templates/common/linux/syscalls/kill.asm

Pwntools Pull Request

Thanks for contributing to Pwntools! Take a moment to look at CONTRIBUTING.md to make sure you're familiar with Pwntools development.

Please provide a high-level explanation of what this pull request is for.

Testing

Pull Requests that introduce new code should try to add doctests for that code. See TESTING.md for more information.

Target Branch

Depending on what the PR is for, it needs to target a different branch.

You can always change the branch after you create the PR if it's against the wrong branch.

Branch Type of PR
dev New features, and enhancements
dev Documentation fixes and new tests
stable Bug fixes that affect the current stable branch
beta Bug fixes that affect the current beta branch, but not stable
dev Bug fixes for code that has never been released

Changelog

After creating your Pull Request, please add and push a commit that updates the changelog for the appropriate branch.
You can look at the existing changelog for examples of how to do this.

robre added 2 commits December 7, 2020 18:39
…tion copied from pwntools/pwnlib/shellcraft/templates/common/linux/syscalls/kill.asm
@Arusekk
Copy link
Member

Arusekk commented Dec 7, 2020

This looks great, although this file is generated by pwnlib/data/syscalls/Makefile and friends, see #1733 for reference, and you can check if this gets fixed by it. If applicable, please close and comment on that instead.

@Arusekk
Copy link
Member

Arusekk commented Dec 7, 2020

Wow, it looks like this file is a wrapper around (...).linux.syscalls.kill that defaults the signal to SIGKILL. It could probably use copying to other architectures as well OR moving to shellcraft/templates/common/linux and adding symlinks where appropriate. Sorry for pointing you in the wrong direction before.

EDIT: the same goes for other templates that should provide arch-abstraction (like i386.prolog/epilog missing elsewhere), but they are missing in several places, and could be named to_32, to_16, to_64 instead of to_arm, to_thumb, i386_to_amd64, see also #1485 (nevermind, this would actually leak abstraction and hurt). If you wish, you can help there, too, by the way, and we could put this as some "Finally clean up shellcraft and make it even more arch-agnostic!!11!1one!" into the change log.

@Arusekk Arusekk merged commit 2b71971 into Gallopsled:dev Apr 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants