Skip to content

Commit 6be6cfd

Browse files
jslobodzianjslobodzian
committed
Merge branch 'main' into joslobo/jan-update-2
2 parents 85b357b + 1328bab commit 6be6cfd

77 files changed

Lines changed: 2684 additions & 180 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/go-test-coverage.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020

2121
- name: Set up Go 1.x
22-
uses: actions/setup-go@v4
22+
uses: actions/setup-go@v5
2323
with:
2424
go-version: '${{ env.EXPECTED_GO_VERSION }}'
2525
id: go

‎.github/workflows/quickstart_1.0.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
ref: '1.0-stable'
2222

2323
- name: Set up Go 1.19
24-
uses: actions/setup-go@v2
24+
uses: actions/setup-go@v5
2525
with:
2626
go-version: 1.19
2727
id: go
@@ -49,7 +49,7 @@ jobs:
4949
ref: '1.0-stable'
5050

5151
- name: Set up Go 1.19
52-
uses: actions/setup-go@v2
52+
uses: actions/setup-go@v5
5353
with:
5454
go-version: 1.19
5555
id: go
@@ -76,7 +76,7 @@ jobs:
7676
ref: '1.0-stable'
7777

7878
- name: Set up Go 1.19
79-
uses: actions/setup-go@v2
79+
uses: actions/setup-go@v5
8080
with:
8181
go-version: 1.19
8282
id: go

‎.github/workflows/quickstart_2.0.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
ref: '2.0-stable'
2222

2323
- name: Set up Go 1.20
24-
uses: actions/setup-go@v2
24+
uses: actions/setup-go@v5
2525
with:
2626
go-version: 1.20
2727
id: go
@@ -50,7 +50,7 @@ jobs:
5050
ref: '2.0-stable'
5151

5252
- name: Set up Go 1.20
53-
uses: actions/setup-go@v2
53+
uses: actions/setup-go@v5
5454
with:
5555
go-version: 1.20
5656
id: go
@@ -78,7 +78,7 @@ jobs:
7878
ref: '2.0-stable'
7979

8080
- name: Set up Go 1.20
81-
uses: actions/setup-go@v2
81+
uses: actions/setup-go@v5
8282
with:
8383
go-version: 1.20
8484
id: go

‎SPECS-EXTENDED/libdwarf/libdwarf.signatures.json‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎SPECS-SIGNED/kernel-azure-signed/kernel-azure-signed.spec‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
%define uname_r %{version}-%{release}
1010
Summary: Signed Linux Kernel for Azure
1111
Name: kernel-azure-signed-%{buildarch}
12-
Version: 5.15.139.1
12+
Version: 5.15.145.2
1313
Release: 1%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
@@ -153,6 +153,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
153153
%exclude /module_info.ld
154154

155155
%changelog
156+
* Tue Jan 16 2024 Gary Swalling <gaswal@microsoft.com> - 5.15.145.2-1
157+
- Update to 5.15.145.2
158+
156159
* Tue Dec 05 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.139.1-1
157160
- Auto-upgrade to 5.15.139.1
158161

‎SPECS-SIGNED/kernel-hci-signed/kernel-hci-signed.spec‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
%define uname_r %{version}-%{release}
55
Summary: Signed Linux Kernel for HCI
66
Name: kernel-hci-signed-%{buildarch}
7-
Version: 5.15.139.1
7+
Version: 5.15.145.2
88
Release: 1%{?dist}
99
License: GPLv2
1010
Vendor: Microsoft Corporation
@@ -149,6 +149,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
149149
%exclude /module_info.ld
150150

151151
%changelog
152+
* Tue Jan 16 2024 Gary Swalling <gaswal@microsoft.com> - 5.15.145.2-1
153+
- Update to 5.15.145.2
154+
152155
* Tue Dec 05 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.139.1-1
153156
- Auto-upgrade to 5.15.139.1
154157

‎SPECS-SIGNED/kernel-mos-signed/kernel-mos-signed.spec‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
%define uname_r %{version}-%{release}
55
Summary: Signed Linux Kernel for MOS systems
66
Name: kernel-mos-signed-%{buildarch}
7-
Version: 5.15.139.1
7+
Version: 5.15.145.2
88
Release: 1%{?dist}
99
License: GPLv2
1010
Vendor: Microsoft Corporation
@@ -150,6 +150,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
150150
%exclude /module_info.ld
151151

152152
%changelog
153+
* Tue Jan 16 2024 Gary Swalling <gaswal@microsoft.com> - 5.15.145.2-1
154+
- Update to 5.15.145.2
155+
153156
* Mon Dec 11 2023 Rachel Menge <rachelmenge@microsoft.com> - 5.15.139.1-1
154157
- Update to 5.15.139.1
155158

‎SPECS-SIGNED/kernel-signed/kernel-signed.spec‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
%define uname_r %{version}-%{release}
1010
Summary: Signed Linux Kernel for %{buildarch} systems
1111
Name: kernel-signed-%{buildarch}
12-
Version: 5.15.139.1
12+
Version: 5.15.145.2
1313
Release: 1%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
@@ -153,6 +153,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
153153
%exclude /module_info.ld
154154

155155
%changelog
156+
* Tue Jan 16 2024 Gary Swalling <gaswal@microsoft.com> - 5.15.145.2-1
157+
- Update to 5.15.145.2
158+
156159
* Tue Dec 05 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.139.1-1
157160
- Auto-upgrade to 5.15.139.1
158161

‎SPECS/fluent-bit/CVE-2023-52284.patch‎

Lines changed: 154 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
1+
diff --git a/lib/wasm-micro-runtime-WAMR-1.2.2/core/iwasm/interpreter/wasm_loader.c b/lib/wasm-micro-runtime-WAMR-1.2.2/core/iwasm/interpreter/wasm_loader.c
2+
index a3c4f42..eb7bf58 100644
3+
--- a/lib/wasm-micro-runtime-WAMR-1.2.2/core/iwasm/interpreter/wasm_loader.c
4+
+++ b/lib/wasm-micro-runtime-WAMR-1.2.2/core/iwasm/interpreter/wasm_loader.c
5+
@@ -5475,6 +5475,7 @@ wasm_loader_pop_frame_ref(WASMLoaderContext *ctx, uint8 type, char *error_buf,
6+
return true;
7+
}
8+
9+
+#if WASM_ENABLE_FAST_INTERP == 0
10+
static bool
11+
wasm_loader_push_pop_frame_ref(WASMLoaderContext *ctx, uint8 pop_cnt,
12+
uint8 type_push, uint8 type_pop, char *error_buf,
13+
@@ -5489,6 +5490,7 @@ wasm_loader_push_pop_frame_ref(WASMLoaderContext *ctx, uint8 pop_cnt,
14+
return false;
15+
return true;
16+
}
17+
+#endif
18+
19+
static bool
20+
wasm_loader_push_frame_csp(WASMLoaderContext *ctx, uint8 label_type,
21+
@@ -6165,27 +6167,6 @@ wasm_loader_pop_frame_offset(WASMLoaderContext *ctx, uint8 type,
22+
return true;
23+
}
24+
25+
-static bool
26+
-wasm_loader_push_pop_frame_offset(WASMLoaderContext *ctx, uint8 pop_cnt,
27+
- uint8 type_push, uint8 type_pop,
28+
- bool disable_emit, int16 operand_offset,
29+
- char *error_buf, uint32 error_buf_size)
30+
-{
31+
- uint8 i;
32+
-
33+
- for (i = 0; i < pop_cnt; i++) {
34+
- if (!wasm_loader_pop_frame_offset(ctx, type_pop, error_buf,
35+
- error_buf_size))
36+
- return false;
37+
- }
38+
- if (!wasm_loader_push_frame_offset(ctx, type_push, disable_emit,
39+
- operand_offset, error_buf,
40+
- error_buf_size))
41+
- return false;
42+
-
43+
- return true;
44+
-}
45+
-
46+
static bool
47+
wasm_loader_push_frame_ref_offset(WASMLoaderContext *ctx, uint8 type,
48+
bool disable_emit, int16 operand_offset,
49+
@@ -6219,12 +6200,24 @@ wasm_loader_push_pop_frame_ref_offset(WASMLoaderContext *ctx, uint8 pop_cnt,
50+
bool disable_emit, int16 operand_offset,
51+
char *error_buf, uint32 error_buf_size)
52+
{
53+
- if (!wasm_loader_push_pop_frame_offset(ctx, pop_cnt, type_push, type_pop,
54+
- disable_emit, operand_offset,
55+
- error_buf, error_buf_size))
56+
+ uint8 i;
57+
+
58+
+ for (i = 0; i < pop_cnt; i++) {
59+
+ if (!wasm_loader_pop_frame_offset(ctx, type_pop, error_buf,
60+
+ error_buf_size))
61+
+ return false;
62+
+
63+
+ if (!wasm_loader_pop_frame_ref(ctx, type_pop, error_buf,
64+
+ error_buf_size))
65+
+ return false;
66+
+ }
67+
+
68+
+ if (!wasm_loader_push_frame_offset(ctx, type_push, disable_emit,
69+
+ operand_offset, error_buf,
70+
+ error_buf_size))
71+
return false;
72+
- if (!wasm_loader_push_pop_frame_ref(ctx, pop_cnt, type_push, type_pop,
73+
- error_buf, error_buf_size))
74+
+
75+
+ if (!wasm_loader_push_frame_ref(ctx, type_push, error_buf, error_buf_size))
76+
return false;
77+
78+
return true;
79+
diff --git a/lib/wasm-micro-runtime-WAMR-1.2.2/core/iwasm/interpreter/wasm_mini_loader.c b/lib/wasm-micro-runtime-WAMR-1.2.2/core/iwasm/interpreter/wasm_mini_loader.c
80+
index aa5e18f..83be375 100644
81+
--- a/lib/wasm-micro-runtime-WAMR-1.2.2/core/iwasm/interpreter/wasm_mini_loader.c
82+
+++ b/lib/wasm-micro-runtime-WAMR-1.2.2/core/iwasm/interpreter/wasm_mini_loader.c
83+
@@ -3936,6 +3936,7 @@ wasm_loader_pop_frame_ref(WASMLoaderContext *ctx, uint8 type, char *error_buf,
84+
return true;
85+
}
86+
87+
+#if WASM_ENABLE_FAST_INTERP == 0
88+
static bool
89+
wasm_loader_push_pop_frame_ref(WASMLoaderContext *ctx, uint8 pop_cnt,
90+
uint8 type_push, uint8 type_pop, char *error_buf,
91+
@@ -3950,6 +3951,7 @@ wasm_loader_push_pop_frame_ref(WASMLoaderContext *ctx, uint8 pop_cnt,
92+
return false;
93+
return true;
94+
}
95+
+#endif
96+
97+
static bool
98+
wasm_loader_push_frame_csp(WASMLoaderContext *ctx, uint8 label_type,
99+
@@ -4607,25 +4609,6 @@ wasm_loader_pop_frame_offset(WASMLoaderContext *ctx, uint8 type,
100+
return true;
101+
}
102+
103+
-static bool
104+
-wasm_loader_push_pop_frame_offset(WASMLoaderContext *ctx, uint8 pop_cnt,
105+
- uint8 type_push, uint8 type_pop,
106+
- bool disable_emit, int16 operand_offset,
107+
- char *error_buf, uint32 error_buf_size)
108+
-{
109+
- for (int i = 0; i < pop_cnt; i++) {
110+
- if (!wasm_loader_pop_frame_offset(ctx, type_pop, error_buf,
111+
- error_buf_size))
112+
- return false;
113+
- }
114+
- if (!wasm_loader_push_frame_offset(ctx, type_push, disable_emit,
115+
- operand_offset, error_buf,
116+
- error_buf_size))
117+
- return false;
118+
-
119+
- return true;
120+
-}
121+
-
122+
static bool
123+
wasm_loader_push_frame_ref_offset(WASMLoaderContext *ctx, uint8 type,
124+
bool disable_emit, int16 operand_offset,
125+
@@ -4659,12 +4642,24 @@ wasm_loader_push_pop_frame_ref_offset(WASMLoaderContext *ctx, uint8 pop_cnt,
126+
bool disable_emit, int16 operand_offset,
127+
char *error_buf, uint32 error_buf_size)
128+
{
129+
- if (!wasm_loader_push_pop_frame_offset(ctx, pop_cnt, type_push, type_pop,
130+
- disable_emit, operand_offset,
131+
- error_buf, error_buf_size))
132+
+ uint8 i;
133+
+
134+
+ for (i = 0; i < pop_cnt; i++) {
135+
+ if (!wasm_loader_pop_frame_offset(ctx, type_pop, error_buf,
136+
+ error_buf_size))
137+
+ return false;
138+
+
139+
+ if (!wasm_loader_pop_frame_ref(ctx, type_pop, error_buf,
140+
+ error_buf_size))
141+
+ return false;
142+
+ }
143+
+
144+
+ if (!wasm_loader_push_frame_offset(ctx, type_push, disable_emit,
145+
+ operand_offset, error_buf,
146+
+ error_buf_size))
147+
return false;
148+
- if (!wasm_loader_push_pop_frame_ref(ctx, pop_cnt, type_push, type_pop,
149+
- error_buf, error_buf_size))
150+
+
151+
+ if (!wasm_loader_push_frame_ref(ctx, type_push, error_buf, error_buf_size))
152+
return false;
153+
154+
return true;

‎SPECS/fluent-bit/fluent-bit.spec‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
Summary: Fast and Lightweight Log processor and forwarder for Linux, BSD and OSX
22
Name: fluent-bit
33
Version: 2.1.10
4-
Release: 2%{?dist}
4+
Release: 3%{?dist}
55
License: Apache-2.0
66
Vendor: Microsoft Corporation
77
Distribution: Mariner
88
URL: https://fluentbit.io
99
Source0: https://github.com/fluent/%{name}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
1010
Patch0: CVE-2023-48105.patch
11+
Patch1: CVE-2023-52284.patch
1112
BuildRequires: bison
1213
BuildRequires: cmake
1314
BuildRequires: cyrus-sasl-devel
@@ -38,7 +39,7 @@ Requires: %{name} = %{version}
3839
Development files for %{name}
3940

4041
%prep
41-
%setup -q
42+
%autosetup -p1
4243

4344
%build
4445

@@ -81,6 +82,10 @@ Development files for %{name}
8182
%{_libdir}/fluent-bit/*.so
8283

8384
%changelog
85+
* Wed Jan 10 2024 Henry Li <lihl@microsoft.com> - 2.1.10-3
86+
- Address CVE-2023-52284
87+
- Change to autosetup
88+
8489
* Wed Dec 06 2023 Chris Gunn <chrisgun@Microsoft.com> - 2.1.10-2
8590
- CVE-2023-48105
8691

0 commit comments

Comments
 (0)