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

utils: use MachineGUID correctly. #8724

Open
wants to merge 7 commits into
base: master
Choose a base branch
from

Conversation

pwhelan
Copy link
Contributor

@pwhelan pwhelan commented Apr 16, 2024

correctly copy the buffer from RegQuery in flb_utils_get_machine_id when querying the MachineGUID.


Enter [N/A] in the box, if an item is not applicable to your change.

Testing
Before we can approve your change; please submit the following in a comment:

  • Example configuration file for the change
  • Debug log output from testing the change
  • Attached Valgrind output that shows no leaks or memory corruption was found

If this is a change to packaging of containers or native binaries then please confirm it works for all targets.

  • Run local packaging test showing all targets (including any new ones) build.
  • Set ok-package-test label to test for all targets (requires maintainer to do).

Documentation

  • Documentation required for this feature

Backporting

  • Backport to latest stable release.

Fluent Bit is licensed under Apache 2.0, by submitting this pull request I understand that this code will be released under the terms of that license.

correctly copy the buffer from RegQuery in flb_utils_get_machine_id when
querying the MachineGUID.

Signed-off-by: Phillip Whelan <phil@calyptia.com>
…tability.

Add tests for flb_utils_get_machine_id to make sure the ID is consistent and
is not full of zeroes.

Signed-off-by: Phillip Whelan <phil@calyptia.com>
Signed-off-by: Phillip Whelan <phil@calyptia.com>
Signed-off-by: Phillip Whelan <phil@calyptia.com>
Signed-off-by: Phillip Whelan <phil@calyptia.com>
…_id.

Signed-off-by: Phillip Whelan <phil@calyptia.com>
@edsiper
Copy link
Member

edsiper commented Apr 18, 2024

@pwhelan something is happening in the windows side:

image

Signed-off-by: Phillip Whelan <phil@calyptia.com>
@@ -1415,14 +1415,20 @@ int flb_utils_get_machine_id(char **out_id, size_t *out_size)

if (status == ERROR_SUCCESS) {
*out_id = flb_calloc(1, dwBufSize+1);
memcpy(*out_id, buf, dwBufSize);
Copy link
Member

Choose a reason for hiding this comment

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

please validate the previous memory allocation before doing memcpy()

Copy link
Member

Choose a reason for hiding this comment

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

@pwhelan ping

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants