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

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

Merged
merged 4 commits into from
Nov 22, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
83b1c22
fluent-bit: Address CVE-2024-25431
Nov 15, 2024
120ae99
Merge branch 'fasttrack/3.0' into ankitapareek/3.0-fluent-bit-CVE-fix
Ankita13-code Nov 18, 2024
6b71cbe
Merge branch 'fasttrack/3.0' into ankitapareek/3.0-fluent-bit-CVE-fix
mbykhovtsev-ms Nov 22, 2024
ea43dcb
Merge branch 'fasttrack/3.0' into ankitapareek/3.0-fluent-bit-CVE-fix
jslobodzian Nov 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 48 additions & 0 deletions SPECS/fluent-bit/CVE-2024-25431.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
diff --git a/lib/wasm-micro-runtime-WAMR-1.3.0/core/iwasm/interpreter/wasm_loader.c b/lib/wasm-micro-runtime-WAMR-1.3.0/core/iwasm/interpreter/wasm_loader.c
index 2a06f42..506ee29 100644
--- a/lib/wasm-micro-runtime-WAMR-1.3.0/core/iwasm/interpreter/wasm_loader.c
+++ b/lib/wasm-micro-runtime-WAMR-1.3.0/core/iwasm/interpreter/wasm_loader.c
@@ -3980,14 +3980,22 @@ check_wasi_abi_compatibility(const WASMModule *module,
/* clang-format on */

WASMExport *initialize = NULL, *memory = NULL, *start = NULL;
+ uint32 import_function_count = module->import_function_count;
+ WASMType *func_type;

/* (func (export "_start") (...) */
start = wasm_loader_find_export(module, "", "_start", EXPORT_KIND_FUNC,
error_buf, error_buf_size);
if (start) {
- WASMType *func_type =
- module->functions[start->index - module->import_function_count]
- ->func_type;
+ if (start->index < import_function_count) {
+ set_error_buf(
+ error_buf, error_buf_size,
+ "the builtin _start function can not be an import function");
+ return false;
+ }
+
+ func_type =
+ module->functions[start->index - import_function_count]->func_type;
if (func_type->param_count || func_type->result_count) {
set_error_buf(error_buf, error_buf_size,
"the signature of builtin _start function is wrong");
@@ -3999,8 +4007,15 @@ check_wasi_abi_compatibility(const WASMModule *module,
initialize = wasm_loader_find_export(
module, "", "_initialize", EXPORT_KIND_FUNC, error_buf, error_buf_size);
if (initialize) {
- WASMType *func_type =
- module->functions[initialize->index - module->import_function_count]
+ if (initialize->index < import_function_count) {
+ set_error_buf(error_buf, error_buf_size,
+ "the builtin _initialize function can not be an "
+ "import function");
+ return false;
+ }
+
+ func_type =
+ module->functions[initialize->index - import_function_count]
->func_type;
if (func_type->param_count || func_type->result_count) {
set_error_buf(
6 changes: 5 additions & 1 deletion SPECS/fluent-bit/fluent-bit.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Summary: Fast and Lightweight Log processor and forwarder for Linux, BSD and OSX
Name: fluent-bit
Version: 3.0.6
Release: 2%{?dist}
Release: 3%{?dist}
License: Apache-2.0
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand All @@ -10,6 +10,7 @@ Source0: https://github.com/fluent/%{name}/archive/refs/tags/v%{version}.
Patch0: CVE-2024-34250.patch
Patch1: CVE-2024-25629.patch
Patch2: CVE-2024-28182.patch
Patch3: CVE-2024-25431.patch
BuildRequires: bison
BuildRequires: cmake
BuildRequires: cyrus-sasl-devel
Expand Down Expand Up @@ -83,6 +84,9 @@ Development files for %{name}
%{_libdir}/fluent-bit/*.so

%changelog
* Fri Nov 15 2024 Ankita Pareek <[email protected]> - 3.0.6-3
- Address CVE-2024-25431

* Tue Oct 15 2024 Chris Gunn <[email protected]> - 3.0.6-2
- CVE-2024-34250
- CVE-2024-25629
Expand Down
Loading