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

event fix: bpf_attach map key #2295

Merged
merged 1 commit into from
Oct 25, 2022

Conversation

roikol
Copy link
Contributor

@roikol roikol commented Oct 25, 2022

change bpf_attach_map key to prog_id only,
so we won't have context mismatches and loose the event

Initial Checklist

  • There is an issue describing the need for this PR.
  • Git log contains summary of the change.
  • Git log contains motivation and context of the change.
  • If part of an EPIC, PR git log contains EPIC number.
  • If part of an EPIC, PR was added to EPIC description.

Description (git log)

use only prog_id as the key for bpf_attach_map, to avoid mismatches of the context, and therefore loosing the event.

Fixes: #2294

Type of change

  • Bug fix (non-breaking change fixing an issue, preferable).
  • Quick fix (minor non-breaking change requiring no issue, use with care)
  • Code refactor (code improvement and/or code removal)
  • New feature (non-breaking change adding functionality).
  • Breaking change (cause existing functionality not to work as expected).

How Has This Been Tested?

Tests being included in this PR:

  • Test File A
  • Test File B

Reproduce the test by running:

  • command 01
  • command 02

Final Checklist:

Pick "Bug Fix" or "Feature", delete the other and mark appropriate checks.

  • I have made corresponding changes to the documentation.
  • My code follows the style guidelines (C and Go) of this project.
  • I have performed a self-review of my own code.
  • I have commented all functions/methods created explaining what they do.
  • I have commented my code, particularly in hard-to-understand areas.
  • My changes generate no new warnings.
  • I have added tests that prove my fix, or feature, is effective.
  • New and existing unit tests pass locally with my changes.
  • Any dependent changes have been merged and published before.

Git Log Checklist:

My commits logs have:

  • Subject starts with "subsystem|file: description".
  • Do not end the subject line with a period.
  • Limit the subject line to 50 characters.
  • Separate subject from body with a blank line.
  • Use the imperative mood in the subject line.
  • Wrap the body at 72 characters.
  • Use the body to explain what and why instead of how.

change bpf_attach_map key to prog_id only,
so we won't have context mismatches and loose the event
Copy link
Collaborator

@yanivagman yanivagman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@yanivagman yanivagman merged commit ae722d7 into aquasecurity:main Oct 25, 2022
@@ -959,8 +959,8 @@ BPF_PROG_ARRAY(sys_exit_init_tail, MAX_EVENT_ID); // store prog
BPF_STACK_TRACE(stack_addresses, MAX_STACK_ADDRESSES); // store stack traces
BPF_HASH(module_init_map, u32, kmod_data_t, 256); // holds module information between
BPF_LRU_HASH(fd_arg_path_map, fd_arg_task_t, fd_arg_path_t, 1024); // store fds paths by task
BPF_LRU_HASH(bpf_attach_map, bpf_attach_key_t, bpf_attach_t, 256); // holds bpf prog info
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because you don't use the bpf_attach_key_t anymore, please remove its definition.

BPF_LRU_HASH(bpf_attach_map, bpf_attach_key_t, bpf_attach_t, 256); // holds bpf prog info
BPF_LRU_HASH(bpf_attach_tmp_map, u32, bpf_attach_t, 256); // temporarily hold bpf_attach_t
BPF_LRU_HASH(bpf_attach_map, u32, bpf_attach_t, 1024); // holds bpf prog info
BPF_LRU_HASH(bpf_attach_tmp_map, u32, bpf_attach_t, 1024); // temporarily hold bpf_attach_t
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you expect this map to be used by the same thread in later flow of the same syscall handling, I am not sure you need to increase its size. This is not too big memory allocation, so you can keep it this way though.

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.

[BUG] bpf_attach event sometimes not triggered
3 participants