Skip to content

Commit c5b6704

Browse files
authored
Remove Amateur Radio X.25 PLP Rose for CVE-2022-2961 (#10826)
The rose_bind() function which is used in the AX.25 PLP Rose protocol introduced a race condition which has CVE-2022-2961. Therefore remove rose support.
1 parent 1729e75 commit c5b6704

File tree

9 files changed

+19
-10
lines changed

9 files changed

+19
-10
lines changed

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: 5.15.167.1
13-
Release: 1%{?dist}
13+
Release: 2%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
1616
Distribution: Mariner
@@ -153,6 +153,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
153153
%exclude /module_info.ld
154154

155155
%changelog
156+
* Wed Oct 23 2024 Rachel Menge <[email protected]> - 5.15.167.1-2
157+
- Bump release to match kernel
158+
156159
* Wed Sep 18 2024 CBL-Mariner Servicing Account <[email protected]> - 5.15.167.1-1
157160
- Auto-upgrade to 5.15.167.1
158161

SPECS/kernel-headers/kernel-headers.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
Summary: Linux API header files
1313
Name: kernel-headers
1414
Version: 5.15.167.1
15-
Release: 1%{?dist}
15+
Release: 2%{?dist}
1616
License: GPLv2
1717
Vendor: Microsoft Corporation
1818
Distribution: Mariner
@@ -73,6 +73,9 @@ done
7373
%endif
7474

7575
%changelog
76+
* Wed Oct 23 2024 Rachel Menge <[email protected]> - 5.15.167.1-2
77+
- Bump release to match kernel
78+
7679
* Wed Sep 18 2024 CBL-Mariner Servicing Account <[email protected]> - 5.15.167.1-1
7780
- Auto-upgrade to 5.15.167.1
7881

SPECS/kernel/config_aarch64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1789,7 +1789,7 @@ CONFIG_HAMRADIO=y
17891789
CONFIG_AX25=m
17901790
CONFIG_AX25_DAMA_SLAVE=y
17911791
CONFIG_NETROM=m
1792-
CONFIG_ROSE=m
1792+
# CONFIG_ROSE is not set
17931793

17941794
#
17951795
# AX.25 network device drivers

SPECS/kernel/kernel.signatures.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"Signatures": {
33
"cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0",
44
"config": "dc024483419fd8d1df7191058e01d80d7421d1c141f0bfc30f330201abb51ed3",
5-
"config_aarch64": "784b95a886e48269d5da1ca7451ead489a84d8af9a8579874f9554741fa73916",
5+
"config_aarch64": "000300cac16ea745e68e93e1cada7c344518d4e848e287530b2d3f1225b51e05",
66
"sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f",
77
"kernel-5.15.167.1.tar.gz": "2f529a3abf4167d1de5f7dd73043827db2c08d647d924990843ee914b0558ee0"
88
}

SPECS/kernel/kernel.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
Summary: Linux Kernel
2929
Name: kernel
3030
Version: 5.15.167.1
31-
Release: 1%{?dist}
31+
Release: 2%{?dist}
3232
License: GPLv2
3333
Vendor: Microsoft Corporation
3434
Distribution: Mariner
@@ -426,6 +426,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
426426
%{_sysconfdir}/bash_completion.d/bpftool
427427

428428
%changelog
429+
* Wed Oct 23 2024 Rachel Menge <[email protected]> - 5.15.167.1-2
430+
- Remove Amateur Radio X.25 PLP Rose for CVE-2022-2961
431+
429432
* Wed Sep 18 2024 CBL-Mariner Servicing Account <[email protected]> - 5.15.167.1-1
430433
- Auto-upgrade to 5.15.167.1
431434

toolkit/resources/manifests/package/pkggen_core_aarch64.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
filesystem-1.1-20.cm2.aarch64.rpm
2-
kernel-headers-5.15.167.1-1.cm2.noarch.rpm
2+
kernel-headers-5.15.167.1-2.cm2.noarch.rpm
33
glibc-2.35-7.cm2.aarch64.rpm
44
glibc-devel-2.35-7.cm2.aarch64.rpm
55
glibc-i18n-2.35-7.cm2.aarch64.rpm

toolkit/resources/manifests/package/pkggen_core_x86_64.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
filesystem-1.1-20.cm2.x86_64.rpm
2-
kernel-headers-5.15.167.1-1.cm2.noarch.rpm
2+
kernel-headers-5.15.167.1-2.cm2.noarch.rpm
33
glibc-2.35-7.cm2.x86_64.rpm
44
glibc-devel-2.35-7.cm2.x86_64.rpm
55
glibc-i18n-2.35-7.cm2.x86_64.rpm

toolkit/resources/manifests/package/toolchain_aarch64.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ intltool-0.51.0-7.cm2.noarch.rpm
136136
itstool-2.0.6-4.cm2.noarch.rpm
137137
kbd-2.2.0-1.cm2.aarch64.rpm
138138
kbd-debuginfo-2.2.0-1.cm2.aarch64.rpm
139-
kernel-headers-5.15.167.1-1.cm2.noarch.rpm
139+
kernel-headers-5.15.167.1-2.cm2.noarch.rpm
140140
kmod-29-2.cm2.aarch64.rpm
141141
kmod-debuginfo-29-2.cm2.aarch64.rpm
142142
kmod-devel-29-2.cm2.aarch64.rpm

toolkit/resources/manifests/package/toolchain_x86_64.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ intltool-0.51.0-7.cm2.noarch.rpm
141141
itstool-2.0.6-4.cm2.noarch.rpm
142142
kbd-2.2.0-1.cm2.x86_64.rpm
143143
kbd-debuginfo-2.2.0-1.cm2.x86_64.rpm
144-
kernel-cross-headers-5.15.167.1-1.cm2.noarch.rpm
145-
kernel-headers-5.15.167.1-1.cm2.noarch.rpm
144+
kernel-cross-headers-5.15.167.1-2.cm2.noarch.rpm
145+
kernel-headers-5.15.167.1-2.cm2.noarch.rpm
146146
kmod-29-2.cm2.x86_64.rpm
147147
kmod-debuginfo-29-2.cm2.x86_64.rpm
148148
kmod-devel-29-2.cm2.x86_64.rpm

0 commit comments

Comments
 (0)