microsoft
/
CBL-Mariner
зеркало из https://github.com/microsoft/CBL-Mariner.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Upgrade kernel-hci to 5.15.70.1 and other updates from main kernel package (#3932) 

* Update kernel-hci

* Update cgmanifest.json

* Update cgmanifest.json
This commit is contained in:
Vince Perri 2022-10-07 12:04:41 -04:00 коммит произвёл GitHub
Родитель 96b35817fe
Коммит 0cfe13348d
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
31 изменённых файлов: 113 добавлений и 11 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

13
SPECS/kernel-hci/CVE-2021-33655.nopatch Normal file
Просмотреть файл

@ -0,0 +1,13 @@
CVE-2021-33655 - patched in 5.15.63
upstream 65a01e601dbba8b7a51a2677811f70f783766682
stable 6886327780254ba749b770373653b6afc2a339fc
upstream e64242caef18b4a5840b0e7a9bff37abd4f4f933
stable 9c9e44bb3dd5233232f2379c2dde0e403b1fd642
upstream 6c11df58fd1ac0aefcb3b227f72769272b939e56
stable 738d06ef99cb3143513debec193959de50483b78
upstream e64242caef18b4a5840b0e7a9bff37abd4f4f933
stable d51dee39db9b57096e483e9bdc57138ee082eacc
upstream 3663a2fb325b8782524f3edb0ae32d6faa615109
stable cc409f88e8f71235dda7d2eddae26e481503ea4d
upstream 955f04766d4e6eb94bf3baa539e096808c74ebfb
stable 989b2c40322e1d12df34cee6425d56c5d7fea4bf

2
SPECS/kernel-hci/CVE-2021-3669.nopatch Normal file
Просмотреть файл

@ -0,0 +1,2 @@
CVE-2021-3669 - Fix already present in 5.15.* LTS kernel:
Commit: 20401d1058f3f841f35a594ac2fc1293710e55b9

3
SPECS/kernel-hci/CVE-2022-0168.nopatch Normal file
Просмотреть файл

@ -0,0 +1,3 @@
CVE-2022-0168 - patched in 5.15.33 - (generated by autopatch tool)
upstream d6f5e358452479fa8a773b5c6ccc9e4ec5a20880 - stable 39a4bf7d1a23dd172526c2fb0db480c5d5c63bd6

2
SPECS/kernel-hci/CVE-2022-0171.nopatch Normal file
Просмотреть файл

@ -0,0 +1,2 @@
CVE-2022-0171 - patched in 5.15.70 - (generated by autopatch tool)
upstream 683412ccf61294d727ead4a73d97397396e69a6b - stable 39b0235284c7aa33a64e07b825add7a2c108094a

3
SPECS/kernel-hci/CVE-2022-1016.nopatch Normal file
Просмотреть файл

@ -0,0 +1,3 @@
CVE-2022-1016 - Fix already backported to 5.15.70:
Upstream: 4c905f6740a365464e91467aa50916555b28213d
Stable: fafb904156fbb8f1dd34970cd5223e00b47c33be

3
SPECS/kernel-hci/CVE-2022-1198.nopatch Normal file
Просмотреть файл

@ -0,0 +1,3 @@
CVE-2022-1198 - patched in 5.15.33 - (generated by autopatch tool)
upstream efe4186e6a1b54bf38b9e05450d43b0da1fd7739 - stable 3eb18f8a1d02a9462a0e4903efc674ca3d0406d1

5
SPECS/kernel-hci/CVE-2022-1199.nopatch Normal file
Просмотреть файл

@ -0,0 +1,5 @@
CVE-2022-1199 - patched in 5.15.35 - (generated by autopatch tool)
upstream 4e0f718daf97d47cf7dec122da1be970f145c809 - stable 4c958f0c5714812461da7785393315b35145ac8c
upstream 7ec02f5ac8a5be5a3f20611731243dc5e1d9ba10 - stable da6509fba636f7f8b2e902b1e4742fdbf1bf059f
upstream 71171ac8eb34ce7fe6b3267dce27c313ab3cb3ac - stable 46ad629e58ce3a88c924ff3c5a7e9129b0df5659

4
SPECS/kernel-hci/CVE-2022-1205.nopatch Normal file
Просмотреть файл

@ -0,0 +1,4 @@
CVE-2022-1205 - patched in 5.15.35 - (generated by autopatch tool)
upstream fc6d01ff9ef03b66d4a3a23b46fc3c3d8cf92009 - stable 43c107021d9160f6a1610bafba6dadc0323ae548
upstream 82e31755e55fbcea6a9dfaae5fe4860ade17cbc0 - stable 85f25bb9a0051198af48ac2f3afc9f16f2277114

3
SPECS/kernel-hci/CVE-2022-1263.nopatch Normal file
Просмотреть файл

@ -0,0 +1,3 @@
CVE-2022-1263 - patched in 5.15.34 - (generated by autopatch tool)
upstream 5593473a1e6c743764b08e3b6071cb43b5cfa6c4 - stable 226b4327ef5c88572fc12187193f1b5073c10837

3
SPECS/kernel-hci/CVE-2022-1882.nopatch Normal file
Просмотреть файл

@ -0,0 +1,3 @@
CVE-2022-1882 - Fix already backported to 5.15.70:
Upstream: 353f7988dd8413c47718f7ca79c030b6fb62cfe5
Stable: ba3a8af8a21a81cfd0c8c689a81261caba934f97

3
SPECS/kernel-hci/CVE-2022-1976.nopatch Normal file
Просмотреть файл

@ -0,0 +1,3 @@
CVE-2022-1976 - already patched in 5.15.69.1 stable kernel
upstream: 386e4fb6962b9f248a80f8870aea0870ca603e89
stable: 3746d62ecf1c872a520c4866118edccb121c44fd

5
SPECS/kernel-hci/CVE-2022-2153.nopatch Normal file
Просмотреть файл

@ -0,0 +1,5 @@
CVE-2022-2153 - patched in 5.15.33 - (generated by autopatch tool)
upstream 00b5f37189d24ac3ed46cb7f11742094778c46ce - stable 0e5dbc0540baa89faf4c04ccc7e9c4fe6b1d7bf4
upstream b1e34d325397a33d97d845e312d7cf2a8b646b44 - stable ba6e8c2df52047a32953588b49d9addbd843a098
upstream 7ec37d1cbe17d8189d9562178d8b29167fe1c31a - stable 569a229142e95610adc1041ae9ca1f417c4c6a3e

3
SPECS/kernel-hci/CVE-2022-2873.nopatch Normal file
Просмотреть файл

@ -0,0 +1,3 @@
CVE-2022-2873 - Fix already backported to 5.15.70:
Upstream: 690b2549b19563ec5ad53e5c82f6a944d910086e
Stable: 24c6fc6e7453f64cf6cbb4218c62aafdecc16ee1

3
SPECS/kernel-hci/CVE-2022-2905.nopatch Normal file
Просмотреть файл

@ -0,0 +1,3 @@
CVE-2022-2905 - already patched in 5.15.69.1 stable kernel
upstream: a657182a5c5150cdfacb6640aad1d2712571a409
stable: 4f672112f8665102a5842c170be1713f8ff95919

3
SPECS/kernel-hci/CVE-2022-2959.nopatch Normal file
Просмотреть файл

@ -0,0 +1,3 @@
CVE-2022-2959 - patched in 5.15.45 - (generated by autopatch tool)
upstream 189b0ddc245139af81198d1a3637cac74f96e13a - stable cf2fbc56c478a34a68ff1fa6ad08460054dfd499

3
SPECS/kernel-hci/CVE-2022-2977.nopatch Normal file
Просмотреть файл

@ -0,0 +1,3 @@
CVE-2022-2977 - already patched in 5.15.69.1 stable kernel
upstream: 7e0438f83dc769465ee663bb5dcf8cc154940712
stable: 662893b4f6bd466ff9e1cd454c44c26d32d554fe

3
SPECS/kernel-hci/CVE-2022-3028.nopatch Normal file
Просмотреть файл

@ -0,0 +1,3 @@
CVE-2022-3028 - patched in 5.15.64 - (generated by autopatch tool)
upstream ba953a9d89a00c078b85f4b190bc1dde66fe16b5 - stable 103bd319c0fc90f1cb013c3a508615e6df8af823

3
SPECS/kernel-hci/CVE-2022-3077.nopatch Normal file
Просмотреть файл

@ -0,0 +1,3 @@
CVE-2022-3077 - patched in 5.15.45 - (generated by autopatch tool)
upstream 690b2549b19563ec5ad53e5c82f6a944d910086e - stable 24c6fc6e7453f64cf6cbb4218c62aafdecc16ee1

3
SPECS/kernel-hci/CVE-2022-3078.nopatch Normal file
Просмотреть файл

@ -0,0 +1,3 @@
CVE-2022-3078 - already patched in 5.15.69.1 stable kernel
upstream: e6a21a14106d9718aa4f8e115b1e474888eeba44
stable: 9dd2fd7a1f84c947561af29424c5ddcecfcf2cbe

4
SPECS/kernel-hci/CVE-2022-3170.nopatch Normal file
Просмотреть файл

@ -0,0 +1,4 @@
CVE-2022-3170 - offending commit not present in 5.15.69
upstream offending commit#1: 6ab55ec0a938c7f943a4edba3d6514f775983887
upstream offending commit#2: c27e1efb61c545f36c450ef60862df9251d239a4
upstream fix commit: 5934d9a0383619c14df91af8fd76261dc3de2f5f

3
SPECS/kernel-hci/CVE-2022-3202.nopatch Normal file
Просмотреть файл

@ -0,0 +1,3 @@
CVE-2022-3202 - patched in 5.15.34 - (generated by autopatch tool)
upstream a53046291020ec41e09181396c1e829287b48d47 - stable d925b7e78b62805fcc5440d1521181c82b6f03cb

3
SPECS/kernel-hci/CVE-2022-3303.nopatch Normal file
Просмотреть файл

@ -0,0 +1,3 @@
CVE-2022-3303 - patched in 5.15.68 - (generated by autopatch tool)
upstream 8423f0b6d513b259fdab9c9bf4aaa6188d054c2d - stable 8015ef9e8a0ee5cecfd0cb6805834d007ab26f86

3
SPECS/kernel-hci/CVE-2022-39188.nopatch Normal file
Просмотреть файл

@ -0,0 +1,3 @@
CVE-2022-39188 - patched in 5.15.65 - (generated by autopatch tool)
upstream b67fbebd4cf980aecbcc750e1462128bffe8ae15 - stable 3ffb97fce282df03723995f5eed6a559d008078e

3
SPECS/kernel-hci/CVE-2022-39189.nopatch Normal file
Просмотреть файл

@ -0,0 +1,3 @@
CVE-2022-39189 - patched in 5.15.60 - (generated by autopatch tool)
upstream 6cd88243c7e03845a450795e134b488fc2afb736 - stable 92343314d34e04da0923cefd3be67521d706fa35

3
SPECS/kernel-hci/CVE-2022-39190.nopatch Normal file
Просмотреть файл

@ -0,0 +1,3 @@
CVE-2022-39190 - patched in 5.15.64 - (generated by autopatch tool)
upstream e02f0d3970404bfea385b6edb86f2d936db0ea2b - stable 51f192ae71c3431aa69a988449ee2fd288e57648

2
SPECS/kernel-hci/CVE-2022-39842.nopatch Normal file
Просмотреть файл

@ -0,0 +1,2 @@
CVE-2022-39842 - patched in 5.15.70 - (generated by autopatch tool)
upstream a09d2d00af53b43c6f11e6ab3cb58443c2cac8a7 - stable ab5140c6ddd7473509e12f468948de91138b124e

3
SPECS/kernel-hci/CVE-2022-40307.nopatch Normal file
Просмотреть файл

@ -0,0 +1,3 @@
CVE-2022-40307 - already patched in 5.15.69.1 stable kernel
upstream: 9cb636b5f6a8cc6d1b50809ec8f8d33ae0c84c95
stable: dd291e070be0eca8807476b022bda00c891d9066

10
SPECS/kernel-hci/config
Просмотреть файл

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86_64 5.15.63.1 Kernel Configuration
# Linux/x86_64 5.15.70.1 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y
@ -786,7 +786,7 @@ CONFIG_HAVE_STACK_VALIDATION=y
CONFIG_HAVE_RELIABLE_STACKTRACE=y
CONFIG_OLD_SIGSUSPEND3=y
CONFIG_COMPAT_OLD_SIGACTION=y
# CONFIG_COMPAT_32BIT_TIME is not set
CONFIG_COMPAT_32BIT_TIME=y
CONFIG_HAVE_ARCH_VMAP_STACK=y
CONFIG_VMAP_STACK=y
CONFIG_HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET=y
@ -2114,7 +2114,7 @@ CONFIG_CHR_DEV_SG=y
CONFIG_BLK_DEV_BSG=y
# CONFIG_CHR_DEV_SCH is not set
# CONFIG_SCSI_CONSTANTS is not set
# CONFIG_SCSI_LOGGING is not set
CONFIG_SCSI_LOGGING=y
CONFIG_SCSI_SCAN_ASYNC=y
#
@ -6524,9 +6524,9 @@ CONFIG_UDF_FS=y
#
# DOS/FAT/EXFAT/NT Filesystems
#
CONFIG_FAT_FS=m
CONFIG_FAT_FS=y
CONFIG_MSDOS_FS=m
CONFIG_VFAT_FS=m
CONFIG_VFAT_FS=y
CONFIG_FAT_DEFAULT_CODEPAGE=437
CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
# CONFIG_FAT_DEFAULT_UTF8 is not set

4
SPECS/kernel-hci/kernel-hci.signatures.json
Просмотреть файл

@ -1,7 +1,7 @@
{
"Signatures": {
"cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0",
"config": "d39a73124cd4c135d0717752f5707c87a2f53bcdf4bb483b3813da40ba1b9167",
"kernel-5.15.63.1.tar.gz": "ead7508937c262a154f2ca22efdb4de4b8760a7572a5bc9b58083271a9765cc7"
"config": "7946cde6d9a69dc4d17212ed8a178d77f3e67929693889105d07aebb684b501b",
"kernel-5.15.70.1.tar.gz": "6a4e09c466d6b13118de2d40a4e554f7e692679562c4843b525f12e4bec17296"
}
}

12
SPECS/kernel-hci/kernel-hci.spec
Просмотреть файл

@ -8,7 +8,7 @@
Summary: Linux Kernel for HCI
Name: kernel-hci
Version: 5.15.63.1
Version: 5.15.70.1
Release: 1%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
@ -243,7 +243,7 @@ ln -s vmlinux-%{uname_r} %{buildroot}%{_libdir}/debug/lib/modules/%{uname_r}/vml
cat > %{buildroot}/boot/linux-%{uname_r}.cfg << "EOF"
# GRUB Environment Block
mariner_cmdline=init=/lib/systemd/systemd ro loglevel=3 crashkernel=128M
mariner_cmdline=init=/lib/systemd/systemd ro loglevel=3 crashkernel=256M
mariner_linux=vmlinuz-%{uname_r}
mariner_initrd=initrd.img-%{uname_r}
EOF
@ -393,6 +393,14 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%{_sysconfdir}/bash_completion.d/bpftool
%changelog
* Wed Oct 5 2022 Vince Perri <viperri@microsoft.com> - 5.15.70.1-1
- Synchronize with mainline kernel:
- Upgrade to 5.15.70.1
- Enable SCSI logging facility (CONFIG_SCSI_LOGGING=y)
- Enable 32-bit time syscall support (CONFIG_COMPAT_32BIT_TIME=y)
- Setting vfat module in kernel config to Y to be baked in (CONFIG_FAT_FS=y, CONFIG_VFAT_FS=y)
- Adjust crashkernel param to crash, dump memory to a file, and recover correctly (crashkernel=256M)
* Wed Aug 31 2022 Vince Perri <viperri@microsoft.com> - 5.15.63.1-1
- Rename kernel package to kernel-hci
- Remove no-vmw-sta from kernel command-line to remove vmware extension

4
cgmanifest.json
Просмотреть файл

@ -7371,8 +7371,8 @@
"type": "other",
"other": {
"name": "kernel-hci",
"version": "5.15.63.1",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.63.1.tar.gz"
"version": "5.15.70.1",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.70.1.tar.gz"
}
}
},