Update kernel source to stable 5.4.51 (#59)

* kernel-headers: Update source to 5.4.51

* hyperv-daemons: Update source to 5.4.51

* kernel: Update to 5.4.51

* kernel-hyperv: Update to 5.4.51

* kernel: Add nopatch for fixed CVEs

Address CVE-2020-11494, CVE-2020-11565, CVE-2020-12655, CVE-2020-12771,
CVE-2020-13974, CVE-2020-15393, CVE-2020-8647, CVE-2020-8648, CVE-2020-8649,
CVE-2020-9383, CVE-2020-11725

* cgmanifest: Update kernel urls to 5.4.51
This commit is contained in:
Christopher Co 2020-08-26 15:25:40 -07:00 коммит произвёл GitHub
Родитель 833c167b32
Коммит 17b2b03820
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
33 изменённых файлов: 95 добавлений и 65 удалений

Просмотреть файл

@ -1,8 +1,8 @@
%global debug_package %{nil}
Summary: Signed Linux Kernel for aarch64 systems
Name: kernel-signed-aarch64
Version: 5.4.42
Release: 12%{?dist}
Version: 5.4.51
Release: 1%{?dist}
License: GPLv2
URL: https://github.com/microsoft/WSL2-Linux-Kernel
Group: System Environment/Kernel
@ -80,6 +80,8 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%config %{_localstatedir}/lib/initramfs/kernel/%{uname_r}
%changelog
* Wed Aug 19 2020 Chris Co <chrco@microsoft.com> 5.4.51-1
- Update source to 5.4.51
* Wed Aug 19 2020 Chris Co <chrco@microsoft.com> 5.4.42-12
- Update release number
* Tue Aug 18 2020 Chris Co <chrco@microsoft.com> 5.4.42-11

Просмотреть файл

@ -1,8 +1,8 @@
%global debug_package %{nil}
Summary: Signed Linux Kernel for x86_64 systems
Name: kernel-signed-x64
Version: 5.4.42
Release: 12%{?dist}
Version: 5.4.51
Release: 1%{?dist}
License: GPLv2
URL: https://github.com/microsoft/WSL2-Linux-Kernel
Group: System Environment/Kernel
@ -80,6 +80,8 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%config %{_localstatedir}/lib/initramfs/kernel/%{uname_r}
%changelog
* Wed Aug 19 2020 Chris Co <chrco@microsoft.com> 5.4.51-1
- Update source to 5.4.51
* Wed Aug 19 2020 Chris Co <chrco@microsoft.com> 5.4.42-12
- Update release number
* Tue Aug 18 2020 Chris Co <chrco@microsoft.com> 5.4.42-11

Просмотреть файл

@ -6,6 +6,6 @@
"hypervkvpd.service": "25339871302f7a47e1aecfa9fc2586c78bc37edb98773752f0a5dec30f0ed3a1",
"hypervvss.rules": "94cead44245ef6553ab79c0bbac8419e3ff4b241f01bcec66e6f508098cbedd1",
"hypervvssd.service": "22270d9f0f23af4ea7905f19c1d5d5495e40c1f782cbb87a99f8aec5a011078d",
"linux-msft-5.4.42.tar.gz": "5067bd1b4f8a5dafc0438686f9d55fadae1a1d14a266311f6821bfa9e33781f8"
"linux-msft-5.4.51.tar.gz": "68519d9752065992789d59dd5fdb730017d6571534458508060027c920962b45"
}
}

Просмотреть файл

@ -9,7 +9,7 @@
Summary: Hyper-V daemons suite
Name: hyperv-daemons
Version: 5.4.42
Version: 5.4.51
Release: 1%{?dist}
License: GPLv2+
URL: https://github.com/microsoft/WSL2-Linux-Kernel
@ -230,6 +230,9 @@ fi
%changelog
* Wed Aug 19 2020 Chris Co <chrco@microsoft.com> 5.4.51-1
- Update source to 5.4.51
* Tue Jun 16 2020 Paul Monson <paulmon@microsoft.com> 5.4.42-1
- Initial CBL-Mariner import from Fedora 32 (license: MIT)
- Update to match version 5.4.42 of the kernel.

Просмотреть файл

@ -1,5 +1,5 @@
{
"Signatures": {
"linux-msft-5.4.42.tar.gz": "5067bd1b4f8a5dafc0438686f9d55fadae1a1d14a266311f6821bfa9e33781f8"
"linux-msft-5.4.51.tar.gz": "68519d9752065992789d59dd5fdb730017d6571534458508060027c920962b45"
}
}

Просмотреть файл

@ -1,6 +1,6 @@
Summary: Linux API header files
Name: kernel-headers
Version: 5.4.42
Version: 5.4.51
Release: 1%{?dist}
License: GPLv2
URL: https://github.com/microsoft/WSL2-Linux-Kernel
@ -27,6 +27,8 @@ cp -rv usr/include/* /%{buildroot}%{_includedir}
%defattr(-,root,root)
%{_includedir}/*
%changelog
* Wed Aug 19 2020 Chris Co <chrco@microsoft.com> 5.4.51-1
- Update source to 5.4.51
* Fri Jun 12 2020 Chris Co <chrco@microsoft.com> 5.4.42-1
- Update source to 5.4.42
* Thu Apr 30 2020 Emre Girgin <mrgirgin@microsoft.com> 5.4.23-2

Просмотреть файл

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86_64 5.4.42 Kernel Configuration
# Linux/x86_64 5.4.51 Kernel Configuration
#
#
@ -121,6 +121,7 @@ CONFIG_RCU_STALL_COMMON=y
CONFIG_RCU_NEED_SEGCBLIST=y
# end of RCU Subsystem
CONFIG_BUILD_BIN2C=y
CONFIG_IKCONFIG=y
# CONFIG_IKCONFIG_PROC is not set
# CONFIG_IKHEADERS is not set
@ -369,6 +370,7 @@ CONFIG_X86_DIRECT_GBPAGES=y
CONFIG_ARCH_SPARSEMEM_ENABLE=y
CONFIG_ARCH_SPARSEMEM_DEFAULT=y
CONFIG_ARCH_SELECT_MEMORY_MODEL=y
CONFIG_ARCH_PROC_KCORE_TEXT=y
CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
# CONFIG_X86_PMEM_LEGACY is not set
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
@ -569,6 +571,7 @@ CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
#
# CONFIG_EFI_VARS is not set
CONFIG_EFI_ESRT=y
CONFIG_EFI_RUNTIME_MAP=y
# CONFIG_EFI_FAKE_MEMMAP is not set
CONFIG_EFI_RUNTIME_WRAPPERS=y
# CONFIG_EFI_CAPSULE_LOADER is not set
@ -3256,6 +3259,7 @@ CONFIG_HYPERV=m
CONFIG_HYPERV_TIMER=y
CONFIG_HYPERV_UTILS=m
CONFIG_HYPERV_BALLOON=m
CONFIG_DXGKRNL=m
# end of Microsoft Hyper-V guest support
# CONFIG_GREYBUS is not set

Просмотреть файл

@ -1,6 +1,6 @@
{
"Signatures": {
"config": "b6b92676da3878a143eff28c60afd63b4fd1abf719a620048a07aea4e699b0f7",
"linux-msft-5.4.42.tar.gz": "5067bd1b4f8a5dafc0438686f9d55fadae1a1d14a266311f6821bfa9e33781f8"
"config": "7b4a585097acebeb8f5eba7e91160dc0722d1a18669d53b1ce0e79a0c7bc2545",
"linux-msft-5.4.51.tar.gz": "68519d9752065992789d59dd5fdb730017d6571534458508060027c920962b45"
}
}

Просмотреть файл

@ -1,9 +1,8 @@
%global with_signed 0
%global security_hardening none
Summary: Linux Kernel optimized for Hyper-V
Name: kernel-hyperv
Version: 5.4.42
Release: 6%{?dist}
Version: 5.4.51
Release: 1%{?dist}
License: GPLv2
URL: https://github.com/microsoft/WSL2-Linux-Kernel
Group: System Environment/Kernel
@ -11,9 +10,6 @@ Vendor: Microsoft Corporation
Distribution: Mariner
Source0: https://github.com/microsoft/WSL2-Linux-Kernel/archive/linux-msft-%{version}.tar.gz
Source1: config
%if 0%{?with_signed}
Source100: vmlinuz-hyperv-x86_64.%{version}-%{release}.signed
%endif
ExclusiveArch: x86_64
@ -36,15 +32,6 @@ Requires(postun): coreutils
%description
The kernel-hyperv package contains the Linux kernel, optimized for Hyper-V
%if 0%{?with_signed}
%package signed
Summary: Production-signed Linux Kernel optimized for Hyper-V
Group: System Environment/Kernel
Requires: %{name} = %{version}-%{release}
%description signed
This package contains the Linux kernel package optimized for Hyper-V, with kernel signed with the production key
%endif
%package devel
Summary: Kernel Dev
Group: System Environment/Kernel
@ -170,12 +157,6 @@ find %{buildroot}/lib/modules -name '*.ko' -print0 | xargs -0 chmod u+x
# Linux version that was affected is 4.4.26
make -C tools JOBS=1 DESTDIR=%{buildroot} prefix=%{_prefix} perf_install
# Incorporate signed kernel binaries if enabled
%if 0%{?with_signed}
echo "Overwriting kernel binary with signed x86_64 kernel binary"
cp %{SOURCE100} %{buildroot}/boot/vmlinuz-%{uname_r}
%endif
%triggerin -- initramfs
mkdir -p %{_localstatedir}/lib/rpm-state/initramfs/pending
touch %{_localstatedir}/lib/rpm-state/initramfs/pending/%{uname_r}
@ -217,10 +198,6 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%exclude /lib/modules/%{uname_r}/kernel/sound
%exclude /lib/modules/%{uname_r}/kernel/arch/x86/oprofile/
%if 0%{?with_signed}
%files signed
%endif
%files docs
%defattr(-,root,root)
%{_defaultdocdir}/linux-%{uname_r}/*
@ -248,6 +225,10 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%{_libdir}/perf/include/bpf/*
%changelog
* Wed Aug 19 2020 Chris Co <chrco@microsoft.com> 5.4.51-1
- Update source to 5.4.51
- Remove signed subpackage
- Enable DXGKRNL config
* Fri Aug 07 2020 Mateusz Malisz <mamalisz@microsoft.com> 5.4.42-6
- Add crashkernel=128M to kernel cmdline
* Tue Aug 04 2020 Pawel Winogrodzki <pawelwi@microsoft.com> 5.4.42-5

Просмотреть файл

@ -0,0 +1 @@
Already patched in 5.4.51 stable kernel

Просмотреть файл

@ -0,0 +1 @@
Already patched in 5.4.51 stable kernel

Просмотреть файл

@ -0,0 +1 @@
Disputed upstream.

Просмотреть файл

@ -0,0 +1 @@
Already patched in 5.4.51 stable kernel

Просмотреть файл

@ -0,0 +1 @@
Already patched in 5.4.51 stable kernel

Просмотреть файл

@ -0,0 +1 @@
Already patched in 5.4.51 stable kernel

Просмотреть файл

@ -0,0 +1 @@
Already patched in 5.4.51 stable kernel

Просмотреть файл

@ -0,0 +1 @@
Already patched in 5.4.51 stable kernel

Просмотреть файл

@ -0,0 +1 @@
Already patched in 5.4.51 stable kernel

Просмотреть файл

@ -0,0 +1 @@
Already patched in 5.4.51 stable kernel

Просмотреть файл

@ -0,0 +1 @@
Already patched in 5.4.51 stable kernel

Просмотреть файл

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86_64 5.4.42 Kernel Configuration
# Linux/x86_64 5.4.51 Kernel Configuration
#
#
@ -5069,6 +5069,7 @@ CONFIG_HYPERV=m
CONFIG_HYPERV_TIMER=y
CONFIG_HYPERV_UTILS=m
CONFIG_HYPERV_BALLOON=m
CONFIG_DXGKRNL=m
# end of Microsoft Hyper-V guest support
#

Просмотреть файл

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 5.4.42 Kernel Configuration
# Linux/arm64 5.4.51 Kernel Configuration
#
#

Просмотреть файл

@ -1,7 +1,7 @@
{
"Signatures": {
"config": "6b7f77c20ec33457c8f3079bbefea25261dc49c5301ed79bcc54692519fcd708",
"config_aarch64": "cdd7dda76915a09c17ac8e811f6c81655f89cbdf9b9c6f9cf3e2f7a8638618bc",
"linux-msft-5.4.42.tar.gz": "5067bd1b4f8a5dafc0438686f9d55fadae1a1d14a266311f6821bfa9e33781f8"
"config": "51608598af8508723cadff27fbc8f7cb5d1cb905c94fa0186c8c2b186e96625b",
"config_aarch64": "15986870ba303135c25f0b45435b8d9da80f83aea2d453c6c146fcdfad4822de",
"linux-msft-5.4.51.tar.gz": "68519d9752065992789d59dd5fdb730017d6571534458508060027c920962b45"
}
}

Просмотреть файл

@ -1,8 +1,8 @@
%global security_hardening none
Summary: Linux Kernel
Name: kernel
Version: 5.4.42
Release: 12%{?dist}
Version: 5.4.51
Release: 1%{?dist}
License: GPLv2
URL: https://github.com/microsoft/WSL2-Linux-Kernel
Group: System Environment/Kernel
@ -13,10 +13,28 @@ Source1: config
Source2: config_aarch64
Patch0: e1000e-add-support-for-comet-lake.patch
# Kernel CVEs are addressed by moving to a newer version of the stable kernel.
# Since kernel CVEs are filed against the upstream kernel version and not the
# stable kernel version, our automated tooling will still flag the CVE as not
# fixed.
# To indicate a kernel CVE is fixed to our automated tooling, add nopatch files
# but do not apply them as a real patch. Each nopatch file should contain
# information on why the CVE nopatch was applied.
Patch1000: CVE-2020-8992.nopatch
Patch1001: CVE-2020-12770.nopatch
Patch1002: CVE-2020-13143.nopatch
Patch1003: CVE-2020-11884.nopatch
Patch1004: CVE-2020-11494.nopatch
Patch1005: CVE-2020-11565.nopatch
Patch1006: CVE-2020-12655.nopatch
Patch1007: CVE-2020-12771.nopatch
Patch1008: CVE-2020-13974.nopatch
Patch1009: CVE-2020-15393.nopatch
Patch1010: CVE-2020-8647.nopatch
Patch1011: CVE-2020-8648.nopatch
Patch1012: CVE-2020-8649.nopatch
Patch1013: CVE-2020-9383.nopatch
Patch1014: CVE-2020-11725.nopatch
BuildRequires: bc
BuildRequires: kbd
@ -282,6 +300,12 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%{_libdir}/perf/include/bpf/*
%changelog
* Wed Aug 19 2020 Chris Co <chrco@microsoft.com> 5.4.51-1
- Update source to 5.4.51
- Enable DXGKRNL config
- Address CVE-2020-11494, CVE-2020-11565, CVE-2020-12655, CVE-2020-12771,
- CVE-2020-13974, CVE-2020-15393, CVE-2020-8647, CVE-2020-8648, CVE-2020-8649,
- CVE-2020-9383, CVE-2020-11725
* Wed Aug 19 2020 Chris Co <chrco@microsoft.com> 5.4.42-12
- Remove the signed package depends
* Tue Aug 18 2020 Chris Co <chrco@microsoft.com> 5.4.42-11

Просмотреть файл

@ -1465,8 +1465,8 @@
"type": "other",
"other": {
"name": "hyperv-daemons",
"version": "5.4.42",
"downloadUrl": "https://github.com/microsoft/WSL2-Linux-Kernel/archive/linux-msft-5.4.42.tar.gz"
"version": "5.4.51",
"downloadUrl": "https://github.com/microsoft/WSL2-Linux-Kernel/archive/linux-msft-5.4.51.tar.gz"
}
}
},
@ -1725,8 +1725,8 @@
"type": "other",
"other": {
"name": "kernel-headers",
"version": "5.4.42",
"downloadUrl": "https://github.com/microsoft/WSL2-Linux-Kernel/archive/linux-msft-5.4.42.tar.gz"
"version": "5.4.51",
"downloadUrl": "https://github.com/microsoft/WSL2-Linux-Kernel/archive/linux-msft-5.4.51.tar.gz"
}
}
},
@ -1735,8 +1735,8 @@
"type": "other",
"other": {
"name": "kernel-hyperv",
"version": "5.4.42",
"downloadUrl": "https://github.com/microsoft/WSL2-Linux-Kernel/archive/linux-msft-5.4.42.tar.gz"
"version": "5.4.51",
"downloadUrl": "https://github.com/microsoft/WSL2-Linux-Kernel/archive/linux-msft-5.4.51.tar.gz"
}
}
},
@ -1745,8 +1745,8 @@
"type": "other",
"other": {
"name": "kernel",
"version": "5.4.42",
"downloadUrl": "https://github.com/microsoft/WSL2-Linux-Kernel/archive/linux-msft-5.4.42.tar.gz"
"version": "5.4.51",
"downloadUrl": "https://github.com/microsoft/WSL2-Linux-Kernel/archive/linux-msft-5.4.51.tar.gz"
}
}
},

Просмотреть файл

@ -1,5 +1,5 @@
filesystem-1.1-7.cm1.aarch64.rpm
kernel-headers-5.4.42-1.cm1.noarch.rpm
kernel-headers-5.4.51-1.cm1.noarch.rpm
glibc-2.28-11.cm1.aarch64.rpm
glibc-devel-2.28-11.cm1.aarch64.rpm
glibc-i18n-2.28-11.cm1.aarch64.rpm

Просмотреть файл

@ -1,5 +1,5 @@
filesystem-1.1-7.cm1.x86_64.rpm
kernel-headers-5.4.42-1.cm1.noarch.rpm
kernel-headers-5.4.51-1.cm1.noarch.rpm
glibc-2.28-11.cm1.x86_64.rpm
glibc-devel-2.28-11.cm1.x86_64.rpm
glibc-i18n-2.28-11.cm1.x86_64.rpm

Просмотреть файл

@ -143,7 +143,7 @@ json-c-debuginfo-0.14-2.cm1.aarch64.rpm
json-c-devel-0.14-2.cm1.aarch64.rpm
kbd-2.0.4-5.cm1.aarch64.rpm
kbd-debuginfo-2.0.4-5.cm1.aarch64.rpm
kernel-headers-5.4.42-1.cm1.noarch.rpm
kernel-headers-5.4.51-1.cm1.noarch.rpm
kmod-25-4.cm1.aarch64.rpm
kmod-debuginfo-25-4.cm1.aarch64.rpm
kmod-devel-25-4.cm1.aarch64.rpm

Просмотреть файл

@ -143,7 +143,7 @@ json-c-debuginfo-0.14-2.cm1.x86_64.rpm
json-c-devel-0.14-2.cm1.x86_64.rpm
kbd-2.0.4-5.cm1.x86_64.rpm
kbd-debuginfo-2.0.4-5.cm1.x86_64.rpm
kernel-headers-5.4.42-1.cm1.noarch.rpm
kernel-headers-5.4.51-1.cm1.noarch.rpm
kmod-25-4.cm1.x86_64.rpm
kmod-debuginfo-25-4.cm1.x86_64.rpm
kmod-devel-25-4.cm1.x86_64.rpm

Просмотреть файл

@ -98,7 +98,7 @@ ef8c2c1d16a00bd95b9fdcef63b8a2ca libXtst-1.2.3.tar.bz2
4cbe1c1def7a5e1b0ed5fce8e512f4c6 libXvMC-1.0.10.tar.bz2
d7dd9b9df336b7dd4028b6b56542ff2c libXxf86dga-1.1.4.tar.bz2
298b8fff82df17304dfdb5fe4066fe3a libXxf86vm-1.1.4.tar.bz2
c607387ac53044e272d364ac177796c7 linux-msft-5.4.42.tar.gz
86a48b2be4b9f6b696025fde83d7524f linux-msft-5.4.51.tar.gz
63ecacd3ff6552537a73f8c30c396caf lua-5.3.5-shared_library-1.patch
4f4b4f323fd3514a68e0ab3da8ce3455 lua-5.3.5.tar.gz
730bb15d96fffe47e148d1e09235af82 m4-1.4.18.tar.xz

Просмотреть файл

@ -39,7 +39,7 @@ http://ftp.gnu.org/gnu/readline/readline-7.0.tar.gz
http://ftp.gnu.org/gnu/tar/tar-1.30.tar.xz
http://ftp.gnu.org/gnu/texinfo/texinfo-6.5.tar.xz
https://www.cpan.org/src/5.0/perl-5.30.3.tar.gz
https://github.com/microsoft/WSL2-Linux-Kernel/archive/linux-msft-5.4.42.tar.gz
https://github.com/microsoft/WSL2-Linux-Kernel/archive/linux-msft-5.4.51.tar.gz
http://ftp.gnu.org/gnu/bash/bash-4.4.18.tar.gz
https://ftp.gnu.org/gnu/bison/bison-3.1.tar.xz
https://sourceware.org/pub/bzip2/bzip2-1.0.6.tar.gz

Просмотреть файл

@ -57,14 +57,14 @@ set -e
#
cd /sources
echo Linux-5.4.42 API Headers
tar xf linux-msft-5.4.42.tar.gz
pushd WSL2-Linux-Kernel-linux-msft-5.4.42
echo Linux-5.4.51 API Headers
tar xf linux-msft-5.4.51.tar.gz
pushd WSL2-Linux-Kernel-linux-msft-5.4.51
make mrproper
make headers
cp -rv usr/include/* /usr/include
popd
rm -rf WSL2-Linux-Kernel-linux-msft-5.4.42
rm -rf WSL2-Linux-Kernel-linux-msft-5.4.51
touch /logs/status_kernel_headers_complete
echo 6.8. Man-pages-5.02

Просмотреть файл

@ -113,14 +113,14 @@ rm -rf gcc-9.1.0
touch $LFS/logs/temptoolchain/status_gcc_pass1_complete
echo Linux-5.4.42 API Headers
tar xf linux-msft-5.4.42.tar.gz
pushd WSL2-Linux-Kernel-linux-msft-5.4.42
echo Linux-5.4.51 API Headers
tar xf linux-msft-5.4.51.tar.gz
pushd WSL2-Linux-Kernel-linux-msft-5.4.51
make mrproper
make headers
cp -rv usr/include/* /tools/include
popd
rm -rf WSL2-Linux-Kernel-linux-msft-5.4.42
rm -rf WSL2-Linux-Kernel-linux-msft-5.4.51
touch $LFS/logs/temptoolchain/status_kernel_headers_complete