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

Fix copy arguments for strict aligned architectures #36976

Merged
merged 1 commit into from
Oct 31, 2023
Merged

Conversation

haesbaert
Copy link
Contributor

@haesbaert haesbaert commented Oct 27, 2023

Proposed commit message

Fix copy arguments for strict aligned architectures

Small typo on copy arguments. In practice only affects arm32 and arm64 as I doubt there are users
of other architectures around.

Without this fix, Auditbeat would incorrectly decode ktrace events in non i386/amd64.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

@haesbaert haesbaert added the bug label Oct 27, 2023
@haesbaert haesbaert requested a review from a team as a code owner October 27, 2023 11:22
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 27, 2023
@mergify
Copy link
Contributor

mergify bot commented Oct 27, 2023

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @haesbaert? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v8./d.0 is the label to automatically backport to the 8./d branch. /d is the digit

@haesbaert haesbaert added the Team:Security-Linux Platform Linux Platform Team in Security Solution label Oct 27, 2023
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Oct 27, 2023
@elasticmachine
Copy link
Collaborator

elasticmachine commented Oct 27, 2023

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Duration: 41 min 20 sec

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@mergify
Copy link
Contributor

mergify bot commented Oct 27, 2023

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b copy-args upstream/copy-args
git merge upstream/main
git push upstream copy-args

Small typo. In practice only affects arm32 and arm64 as I doubt there are users
of other architectures around.
@@ -16,7 +16,7 @@ import (
var errBadSize = errors.New("bad size for integer")

func copyInt(dst unsafe.Pointer, src unsafe.Pointer, len uint8) error {
copy((*(*[maxIntSizeBytes]byte)(src))[:len], (*(*[maxIntSizeBytes]byte)(src))[:len])
copy((*(*[maxIntSizeBytes]byte)(dst))[:len], (*(*[maxIntSizeBytes]byte)(src))[:len])
Copy link
Contributor

Choose a reason for hiding this comment

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

This can be brought into the modern era and have error handling added if it is

func copyInt(dst unsafe.Pointer, src unsafe.Pointer, len uint8) error {
	switch len {
	case 1, 2, 4, 8:
		copy(unsafe.Slice((*byte)(dst), len), unsafe.Slice((*byte)(src), len))
		return nil
	default:
		return errBadSize
	}
}

(we can also remove the array punning below by changing the preamble in readInt to asSlice := unsafe.Slice((*byte)(ptr), len).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That's great, but can we do this in a second future step? I've found this just by reading the code and don't have a proper setup in place to test more invasive changes.

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah, fair enough.

@haesbaert haesbaert merged commit 069bf04 into main Oct 31, 2023
8 checks passed
@haesbaert haesbaert deleted the copy-args branch October 31, 2023 07:52
Scholar-Li pushed a commit to Scholar-Li/beats that referenced this pull request Feb 5, 2024
elastic#36976)

Small typo. In practice only affects arm32 and arm64 as I doubt there are users
of other architectures around.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Auditbeat bug Team:Security-Linux Platform Linux Platform Team in Security Solution
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants