Skip to content

Commit a3ff34f

Browse files
jslobodzianjslobodzian
committed
Merge branch '3.0-dev' into 3.0
2 parents 3be92e2 + 0604281 commit a3ff34f

132 files changed

Lines changed: 6062 additions & 775 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/policies/resourceManagement.yml‎

Lines changed: 47 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,34 +13,37 @@ configuration:
1313
- payloadType: Pull_Request
1414
then:
1515
- if:
16-
- includesModifiedFiles:
17-
files:
18-
- SPECS/
19-
- SPECS-EXTENDED/
20-
- SPECS-SIGNED/
16+
- filesMatchPattern:
17+
pattern: "^(SPECS|SPECS-EXTENDED|SPECS-SIGNED)/"
18+
matchAny: true
2119
then:
2220
- addLabel:
2321
label: Packaging
2422
- if:
25-
- includesModifiedFiles:
26-
files:
27-
- toolkit/docs/
23+
- filesMatchPattern:
24+
pattern: "^SPECS-EXTENDED/"
25+
matchAny: true
26+
then:
27+
- addLabel:
28+
label: specs-extended
29+
- if:
30+
- filesMatchPattern:
31+
pattern: "^toolkit/docs/"
32+
matchAny: true
2833
then:
2934
- addLabel:
3035
label: documentation
3136
- if:
32-
- includesModifiedFiles:
33-
files:
34-
- toolkit/tools/
35-
- toolkit/scripts/
37+
- filesMatchPattern:
38+
pattern: "^toolkit/(tools|scripts)/"
39+
matchAny: true
3640
then:
3741
- addLabel:
3842
label: Tools
3943
- if:
40-
- includesModifiedFiles:
41-
files:
42-
- toolkit/imageconfigs/
43-
- toolkit/tools/imagegen/configuration
44+
- filesMatchPattern:
45+
pattern: "^toolkit/(imageconfigs|tools/imagegen/configuration)/"
46+
matchAny: true
4447
then:
4548
- addLabel:
4649
label: Schema
@@ -69,16 +72,40 @@ configuration:
6972
then:
7073
- if:
7174
- targetsBranch:
72-
branch: 1.0-dev
75+
branch: main
7376
then:
7477
- addLabel:
75-
label: 1.0-dev
78+
label: main
7679
- if:
7780
- targetsBranch:
78-
branch: main
81+
branch: 2.0
7982
then:
8083
- addLabel:
81-
label: main
84+
label: 2.0
85+
- if:
86+
- targetsBranch:
87+
branch: 3.0-dev
88+
then:
89+
- addLabel:
90+
label: 3.0-dev
91+
- if:
92+
- targetsBranch:
93+
branch: 3.0
94+
then:
95+
- addLabel:
96+
label: 3.0
97+
- if:
98+
- targetsBranch:
99+
branch: fasttrack/2.0
100+
then:
101+
- addLabel:
102+
label: fasttrack/2.0
103+
- if:
104+
- targetsBranch:
105+
branch: fasttrack/3.0
106+
then:
107+
- addLabel:
108+
label: fasttrack/3.0
82109
description:
83110
onFailure:
84111
onSuccess:

‎LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎LICENSES-AND-NOTICES/SPECS/data/licenses.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2223,6 +2223,7 @@
22232223
"cloud-hypervisor-cvm",
22242224
"cmake-fedora",
22252225
"containerd",
2226+
"containerd2",
22262227
"coredns",
22272228
"dcos-cli",
22282229
"debugedit",

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Summary: Signed Linux Kernel for %{buildarch} systems
88
Name: kernel-64k-signed-%{buildarch}
99
Version: 6.6.57.1
10-
Release: 6%{?dist}
10+
Release: 7%{?dist}
1111
License: GPLv2
1212
Vendor: Microsoft Corporation
1313
Distribution: Azure Linux
@@ -105,6 +105,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
105105
%exclude /module_info.ld
106106

107107
%changelog
108+
* Sun Dec 22 2024 Ankita Pareek <ankitapareek@microsoft.com> - 6.6.57.1-7
109+
- Bump release to match kernel
110+
108111
* Wed Dec 18 2024 Rachel Menge <rachelmenge@microsoft.com> - 6.6.57.1-6
109112
- Bump release to match kernel-64k
110113

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
Summary: Signed Linux Kernel for %{buildarch} systems
1111
Name: kernel-signed-%{buildarch}
1212
Version: 6.6.57.1
13-
Release: 6%{?dist}
13+
Release: 7%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
1616
Distribution: Azure Linux
@@ -145,6 +145,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
145145
%exclude /module_info.ld
146146

147147
%changelog
148+
* Sun Dec 22 2024 Ankita Pareek <ankitapareek@microsoft.com> - 6.6.57.1-7
149+
- Bump release to match kernel
150+
148151
* Wed Dec 18 2024 Rachel Menge <rachelmenge@microsoft.com> - 6.6.57.1-6
149152
- Bump release to match kernel-64k
150153

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Summary: Signed Unified Kernel Image for %{buildarch} systems
77
Name: kernel-uki-signed-%{buildarch}
88
Version: 6.6.57.1
9-
Release: 6%{?dist}
9+
Release: 7%{?dist}
1010
License: GPLv2
1111
Vendor: Microsoft Corporation
1212
Distribution: Azure Linux
@@ -68,6 +68,9 @@ popd
6868
/boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi
6969

7070
%changelog
71+
* Sun Dec 22 2024 Ankita Pareek <ankitapareek@microsoft.com> - 6.6.57.1-7
72+
- Bump release to match kernel
73+
7174
* Wed Dec 18 2024 Rachel Menge <rachelmenge@microsoft.com> - 6.6.57.1-6
7275
- Bump release to match kernel-64k
7376

‎SPECS/avahi/CVE-2023-38469.patch‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
From c89fd5f2e85052f1f8b74ddeff38235932236889 Mon Sep 17 00:00:00 2001
2+
From: Kanishk-Bansal <kbkanishk975@gmail.com>
3+
Date: Wed, 27 Nov 2024 08:48:59 +0000
4+
Subject: [PATCH] Fix CVE patch
5+
6+
---
7+
avahi-core/rr.c | 9 ++++++++-
8+
1 file changed, 8 insertions(+), 1 deletion(-)
9+
10+
diff --git a/avahi-core/rr.c b/avahi-core/rr.c
11+
index 7fa0bee..b03a24c 100644
12+
--- a/avahi-core/rr.c
13+
+++ b/avahi-core/rr.c
14+
@@ -32,6 +32,7 @@
15+
#include <avahi-common/malloc.h>
16+
#include <avahi-common/defs.h>
17+
18+
+#include "dns.h"
19+
#include "rr.h"
20+
#include "log.h"
21+
#include "util.h"
22+
@@ -688,11 +689,17 @@ int avahi_record_is_valid(AvahiRecord *r) {
23+
case AVAHI_DNS_TYPE_TXT: {
24+
25+
AvahiStringList *strlst;
26+
+ size_t used = 0;
27+
28+
- for (strlst = r->data.txt.string_list; strlst; strlst = strlst->next)
29+
+ for (strlst = r->data.txt.string_list; strlst; strlst = strlst->next) {
30+
if (strlst->size > 255 || strlst->size <= 0)
31+
return 0;
32+
33+
+ used += 1+strlst->size;
34+
+ if (used > AVAHI_DNS_RDATA_MAX)
35+
+ return 0;
36+
+ }
37+
+
38+
return 1;
39+
}
40+
}
41+
--
42+
2.45.2
43+

‎SPECS/avahi/CVE-2023-38470.patch‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
From cc5f44eb015384d8c764646c48b9da80f811446c Mon Sep 17 00:00:00 2001
2+
From: Kanishk-Bansal <kbkanishk975@gmail.com>
3+
Date: Mon, 2 Dec 2024 10:25:43 +0000
4+
Subject: [PATCH] Fix CVE-2023-38470
5+
6+
---
7+
avahi-common/domain-test.c | 14 ++++++++++++++
8+
avahi-common/domain.c | 2 +-
9+
2 files changed, 15 insertions(+), 1 deletion(-)
10+
11+
diff --git a/avahi-common/domain-test.c b/avahi-common/domain-test.c
12+
index cf763ec..3acc1c1 100644
13+
--- a/avahi-common/domain-test.c
14+
+++ b/avahi-common/domain-test.c
15+
@@ -45,6 +45,20 @@ int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) {
16+
printf("%s\n", s = avahi_normalize_name_strdup("fo\\\\o\\..f oo."));
17+
avahi_free(s);
18+
19+
+ printf("%s\n", s = avahi_normalize_name_strdup("."));
20+
+ avahi_free(s);
21+
+
22+
+ s = avahi_normalize_name_strdup(",.=.}.=.?-.}.=.?.?.}.}.?.?.?.z.?.?.}.}."
23+
+ "}.?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM.=.=.?.?.}.}.?.?.}.}.}"
24+
+ ".?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM.=.=.?.?.}.}.?.?.?.zM.?`"
25+
+ "?.}.}.}.?.?.?.r.=.?.}.=.?.?.}.?.?.?.}.=.?.?.}??.}.}.?.?."
26+
+ "?.z.?.?.}.}.}.?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM.?`?.}.}.}."
27+
+ "??.?.zM.?`?.}.}.}.?.?.?.r.=.?.}.=.?.?.}.?.?.?.}.=.?.?.}?"
28+
+ "?.}.}.?.?.?.z.?.?.}.}.}.?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM."
29+
+ "?`?.}.}.}.?.?.?.r.=.=.?.?`.?.?}.}.}.?.?.?.r.=.?.}.=.?.?."
30+
+ "}.?.?.?.}.=.?.?.}");
31+
+ assert(s == NULL);
32+
+
33+
printf("%i\n", avahi_domain_equal("\\065aa bbb\\.\\046cc.cc\\\\.dee.fff.", "Aaa BBB\\.\\.cc.cc\\\\.dee.fff"));
34+
printf("%i\n", avahi_domain_equal("A", "a"));
35+
36+
diff --git a/avahi-common/domain.c b/avahi-common/domain.c
37+
index 3b1ab68..e66d241 100644
38+
--- a/avahi-common/domain.c
39+
+++ b/avahi-common/domain.c
40+
@@ -201,7 +201,7 @@ char *avahi_normalize_name(const char *s, char *ret_s, size_t size) {
41+
}
42+
43+
if (!empty) {
44+
- if (size < 1)
45+
+ if (size < 2)
46+
return NULL;
47+
48+
*(r++) = '.';
49+
--
50+
2.45.2
51+

0 commit comments

Comments
 (0)