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

fluent-bit: Address CVE-2024-25431 #11096

Merged
merged 4 commits into from
Nov 22, 2024

Conversation

Ankita13-code
Copy link
Contributor

@Ankita13-code Ankita13-code commented Nov 15, 2024

Merge Checklist

All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)

  • The toolchain has been rebuilt successfully (or no changes were made to it)
  • The toolchain/worker package manifests are up-to-date
  • Any updated packages successfully build (or no packages were changed)
  • Packages depending on static components modified in this PR (Golang, *-static subpackages, etc.) have had their Release tag incremented.
  • Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files
  • All package sources are available
  • cgmanifest files are up-to-date and sorted (./cgmanifest.json, ./toolkit/scripts/toolchain/cgmanifest.json, .github/workflows/cgmanifest.json)
  • LICENSE-MAP files are up-to-date (./LICENSES-AND-NOTICES/SPECS/data/licenses.json, ./LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md, ./LICENSES-AND-NOTICES/SPECS/LICENSE-EXCEPTIONS.PHOTON)
  • All source files have up-to-date hashes in the *.signatures.json files
  • sudo make go-tidy-all and sudo make go-test-coverage pass
  • Documentation has been updated to match any changes to the build system
  • Ready to merge

Summary

What does the PR accomplish, why was it needed?
This PR fixes CVE-2024-25431.
Original patch from the upstream can be found here. However there is an indentation difference in a few lines in the if (initialize) code block as follows -

Upstream code (which was then modified to create the original upstream patch) -
image

Code in our version 3.0.6 of fluent-bit -
image

In our current code, the line:

module->functions[initialize->index - module->import_function_count]
is one continuous line with the assignment, while in the patch it's split across multiple lines with different indentation. Hence, I created a new patch for all these changes from the upstream patch for this CVE fix.

Change Log
  • Add patch for fixing CVE-2024-25431. Modified the upstream patch to accommodate the indentation changes as per the code used in our versions of fluent-bit package.
Does this affect the toolchain?

NO

Associated issues
  • #xxxx
Links to CVEs
Test Methodology

@Ankita13-code Ankita13-code marked this pull request as ready for review November 15, 2024 10:46
@Ankita13-code Ankita13-code requested a review from a team as a code owner November 15, 2024 10:46
@jslobodzian jslobodzian merged commit 3988fcb into fasttrack/3.0 Nov 22, 2024
15 of 18 checks passed
@jslobodzian jslobodzian deleted the ankitapareek/3.0-fluent-bit-CVE-fix branch November 22, 2024 20:29
CBL-Mariner-Bot pushed a commit that referenced this pull request Nov 22, 2024
Signed-off-by: ankita <[email protected]>
Co-authored-by: ankita <[email protected]>
Co-authored-by: Mykhailo Bykhovtsev <[email protected]>
Co-authored-by: jslobodzian <[email protected]>
(cherry picked from commit 3988fcb)
@CBL-Mariner-Bot
Copy link
Collaborator

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.

4 participants