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.

Sign up for GitHub

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

Jump to bottom

Upgrade mysql to 8.0.40 #10774

Merged
merged 3 commits into from
Oct 22, 2024
Merged

Upgrade mysql to 8.0.40 #10774

merged 3 commits into from
Oct 22, 2024

Conversation

realsdx
Copy link
Contributor

@realsdx realsdx commented Oct 17, 2024 •
edited
Loading

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

Fixes 40 CVEs --
CVE-2024-21193
CVE-2024-21194
CVE-2024-21162
CVE-2024-21157
CVE-2024-21130
CVE-2024-20996
CVE-2024-21129
CVE-2024-21159
CVE-2024-21135
CVE-2024-21173
CVE-2024-21160
CVE-2024-21125
CVE-2024-21134
CVE-2024-21127
CVE-2024-21142
CVE-2024-21166
CVE-2024-21163
CVE-2024-21203
CVE-2024-21219
CVE-2024-21247
CVE-2024-21237
CVE-2024-21231
CVE-2024-21213
CVE-2024-21218
CVE-2024-21197
CVE-2024-21230
CVE-2024-21207
CVE-2024-21201
CVE-2024-21198
CVE-2024-21238
CVE-2024-21196
CVE-2024-21239
CVE-2024-21199
CVE-2024-21241
CVE-2024-21236
CVE-2024-21212
CVE-2024-21096
CVE-2024-21171
CVE-2024-21165
CVE-2023-46219

Change Log
  • Upgrade to 8.0.40
Does this affect the toolchain?

NO

Links to CVEs
Test Methodology

@microsoft-github-policy-service microsoft-github-policy-service bot added the main PR Destined for main label Oct 17, 2024
@realsdx realsdx marked this pull request as ready for review October 18, 2024 11:57
@realsdx realsdx requested a review from a team as a code owner October 18, 2024 11:57
xordux
xordux previously approved these changes Oct 21, 2024
View reviewed changes
@realsdx realsdx changed the base branch from main to fasttrack/2.0 October 21, 2024 15:04
@realsdx realsdx dismissed xordux’s stale review October 21, 2024 15:04

The base branch was changed.

@realsdx realsdx changed the base branch from fasttrack/2.0 to main October 21, 2024 15:17
@realsdx realsdx force-pushed the sudipta/mysql-cve-upgrade branch from f0c3026 to 7af1c25 Compare October 21, 2024 15:23
@realsdx realsdx changed the base branch from main to fasttrack/2.0 October 21, 2024 15:24
@realsdx
Copy link
Contributor Author

realsdx commented Oct 21, 2024

Retargeted to fasttrack/2.0

@anphel31 anphel31 added fasttrack/2.0 PRs Destined for AzureLinux 2.0 and removed main PR Destined for main labels Oct 21, 2024
anphel31
anphel31 reviewed Oct 21, 2024
View reviewed changes
SPECS/mysql/mysql.spec Outdated
@@ -98,6 +97,10 @@ fi
%{_libdir}/pkgconfig/mysqlclient.pc

%changelog
* Fri Oct 18 2024 Sudipta Pandit <[email protected]> - 8.0.37-1
Copy link
Member

Choose a reason for hiding this comment

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

This should be version 8.0.40-1

SPECS/mysql/mysql.spec Outdated
@@ -98,6 +97,10 @@ fi
%{_libdir}/pkgconfig/mysqlclient.pc

%changelog
* Fri Oct 18 2024 Sudipta Pandit <[email protected]> - 8.0.37-1
- Upgrade to 8.0.40 to fix CVE-2024-21096
Copy link
Member

Choose a reason for hiding this comment

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

Can you list the other CVEs fixed by this upgrade? Or mention that it fixes 19 CVES

Copy link
Contributor Author

@realsdx realsdx Oct 21, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I have changed the word to multiple, as now I am seeing more CVEs will be fixed by this. Should I list all of them in changelog? or adding them to this GitHub PR description will work as well?

Copy link
Member

Choose a reason for hiding this comment

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

It would be best to list all of the CVEs that we know are fixed

jslobodzian
jslobodzian reviewed Oct 21, 2024
View reviewed changes
SPECS/mysql/mysql.spec Outdated
@@ -98,6 +97,10 @@ fi
%{_libdir}/pkgconfig/mysqlclient.pc

%changelog
* Fri Oct 18 2024 Sudipta Pandit <[email protected]> - 8.0.37-1
Copy link
Contributor

Choose a reason for hiding this comment

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

version number is wrong in changelog

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed

@realsdx
Copy link
Contributor Author

realsdx commented Oct 21, 2024

New buddy build: https://dev.azure.com/mariner-org/mariner/_build/results?buildId=660991&view=results

@jslobodzian jslobodzian merged commit 91f8315 into fasttrack/2.0 Oct 22, 2024
15 of 18 checks passed
@jslobodzian jslobodzian deleted the sudipta/mysql-cve-upgrade branch October 22, 2024 18:45
CBL-Mariner-Bot pushed a commit that referenced this pull request Oct 22, 2024
@realsdx @CBL-Mariner-Bot
Upgrade mysql to 8.0.40 (#10774)
eec28ed 
(cherry picked from commit 91f8315)
@CBL-Mariner-Bot CBL-Mariner-Bot mentioned this pull request Oct 22, 2024
Merged
@CBL-Mariner-Bot
Copy link
Collaborator

Auto cherry-pick results:

Auto cherry-pick pipeline run -> https://dev.azure.com/mariner-org/mariner/_build/results?buildId=661630&view=results

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@anphel31 anphel31 anphel31 approved these changes

@jslobodzian jslobodzian jslobodzian approved these changes

@xordux xordux xordux left review comments

Assignees
No one assigned
Labels
fasttrack/2.0 PRs Destined for AzureLinux 2.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@realsdx @CBL-Mariner-Bot @xordux @jslobodzian @anphel31