Skip to content

Upgrading zlib to 1.3.1 #8625

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
Merged
zwass merged 1 commit into from
Jun 18, 2025
Merged

Upgrading zlib to 1.3.1 #8625

zwass merged 1 commit into from
Jun 18, 2025

Conversation

@ksykulev
Copy link
Contributor

@ksykulev ksykulev commented Jun 10, 2025

#8593

Here is the changeset:
madler/zlib@v1.3...v1.3.1

@ksykulev ksykulev requested review from a team as code owners June 10, 2025 18:32
@ksykulev ksykulev mentioned this pull request Jun 10, 2025
Closed
ksykulev
ksykulev commented Jun 10, 2025
View reviewed changes
libraries/third_party_libraries_manifest.json
"version": "1.3",
"commit": "09155eaa2f9270dc4ed1fa13e2b4b2613e6e4851",
"ignored-cves": [
"CVE-2023-45853"
Copy link
Contributor Author

@ksykulev ksykulev Jun 10, 2025

Choose a reason for hiding this comment

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

1.3.1 also fixes this CVE madler/zlib#868 (comment)

lucasmrod
lucasmrod approved these changes Jun 10, 2025
View reviewed changes
Copy link
Contributor

@lucasmrod lucasmrod left a comment

Choose a reason for hiding this comment

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

LGTM! (I can help smoke test builds if needed.)

@ksykulev
Copy link
Contributor Author

ksykulev commented Jun 10, 2025 •
edited
Loading

Doesn't look like there is a whole bunch of uses currently.

During office hours we discussed whether or not we want to sneak this into the upcoming 5.18 release, and the consensus seemed like no. So gives me a bit more time to test on windows/linux.

$ grep -ir 'zlib' osquery/
osquery/tables/system/tests/linux/rpm_packages_tests.cpp:      {"zlib-devel", "1.2.11", "202827943881ba133a7e8ca91290dcc71083a8e1"},
osquery/remote/CMakeLists.txt:    thirdparty_zlib
osquery/remote/tests/requests_tests.cpp:   * Reference: http://www.zlib.org/rfc-gzip.html
osquery/remote/tests/requests_tests.cpp:   * https://github.com/madler/zlib/blob/master/zutil.h#L86
osquery/remote/requests.cpp:#include <zlib.h>
osquery/remote/requests.cpp:#define MOD_GZIP_ZLIB_WINDOWSIZE 15
osquery/remote/requests.cpp:#define MOD_GZIP_ZLIB_CFACTOR 9
osquery/remote/requests.cpp:                   MOD_GZIP_ZLIB_WINDOWSIZE + 16,
osquery/remote/requests.cpp:                   MOD_GZIP_ZLIB_CFACTOR,

$ grep -ir 'compressString' osquery/
osquery/remote/requests.h:std::string compressString(const std::string& data);
osquery/remote/transports/tls.cpp:      response_ = client->post(r, (compress) ? compressString(params) : params);
osquery/remote/transports/tls.cpp:      response_ = client->put(r, (compress) ? compressString(params) : params);
osquery/remote/tests/requests_tests.cpp:    response_status_ = Status(0, (compress) ? compressString(params) : params);
osquery/remote/requests.cpp:std::string compressString(const std::string& data) {

@zwass zwass merged commit 12264c6 into osquery:master Jun 18, 2025
22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lucasmrod lucasmrod lucasmrod approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@ksykulev @lucasmrod @zwass