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.

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

injector: push apart overlapping traps #1739

Merged
merged 1 commit into from
Jul 22, 2024

Conversation

alex-pentagrid
Copy link
Contributor

Due to changed vdso layout in modern kernels (at least 6.2), linux injector when parsing vdso in find_syscall can first find the address of the trap we are already standing on. This leads to a violation of the injection logic.
So in this case we can simply skip first occurence of syscall call in vdso and try to find next.

@drakvuf-jenkins
Copy link
Collaborator

Can one of the admins verify this patch?

@tklengyel
Copy link
Owner

@drakvuf-jenkins Test this please

@alex-pentagrid
Copy link
Contributor Author

@tklengyel can you please restart the infer job, as it's fail is not related to the changes of this PR

@alex-pentagrid alex-pentagrid force-pushed the injector-trap-overlap-fix branch from 5ad7e84 to 000a22f Compare January 15, 2024 07:19
@tklengyel
Copy link
Owner

@drakvuf-jenkins Test this please

@tklengyel tklengyel merged commit 5c5f69d into tklengyel:main Jul 22, 2024
41 checks passed
@alex-pentagrid alex-pentagrid deleted the injector-trap-overlap-fix branch August 5, 2024 14:41
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.

3 participants