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

[main] Update kernel to v5.15.32.1 (#2699) 

* kernel: Update to v5.15.32.1

* Add files

* Add kernel-rt update, mana config

* Fix date in changelog
This commit is contained in:
Neha Agarwal 2022-04-11 12:16:54 -07:00 коммит произвёл GitHub
Родитель ed6ba712d4
Коммит a8b995a2a6
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
30 изменённых файлов: 129 добавлений и 73 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

7
SPECS-SIGNED/kernel-signed/kernel-signed.spec
Просмотреть файл

@ -9,8 +9,8 @@
%define uname_r %{version}-%{release}
Summary: Signed Linux Kernel for %{buildarch} systems
Name: kernel-signed-%{buildarch}
Version: 5.15.26.1
Release: 4%{?dist}
Version: 5.15.32.1
Release: 1%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
@ -153,6 +153,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%exclude /module_info.ld
%changelog
* Fri Apr 08 2022 Neha Agarwal <nehaagarwal@microsoft.com> - 5.15.32.1-1
- Update source to 5.15.32.1
* Tue Apr 05 2022 Henry Li <lihl@microsoft.com> - 5.15.26.1-4
- Bump release number to match kernel release

2
SPECS/hyperv-daemons/hyperv-daemons.signatures.json
Просмотреть файл

@ -7,6 +7,6 @@
"hypervkvpd.service": "25339871302f7a47e1aecfa9fc2586c78bc37edb98773752f0a5dec30f0ed3a1",
"hypervvss.rules": "94cead44245ef6553ab79c0bbac8419e3ff4b241f01bcec66e6f508098cbedd1",
"hypervvssd.service": "22270d9f0f23af4ea7905f19c1d5d5495e40c1f782cbb87a99f8aec5a011078d",
"kernel-5.15.26.1.tar.gz": "2cbcede7448516beb64a94220bf1b60937956a433cecd7a0ecb244e1bfeeae21"
"kernel-5.15.32.1.tar.gz": "8f87899c194ba5e17714a647b303c2e7104fb86ed32aae3c5d892f6edf708749"
}
}

5
SPECS/hyperv-daemons/hyperv-daemons.spec
Просмотреть файл

@ -8,7 +8,7 @@
%global udev_prefix 70
Summary: Hyper-V daemons suite
Name: hyperv-daemons
Version: 5.15.26.1
Version: 5.15.32.1
Release: 1%{?dist}
License: GPLv2+
Vendor: Microsoft Corporation
@ -219,6 +219,9 @@ fi
%{_sbindir}/lsvmbus
%changelog
* Fri Apr 08 2022 Neha Agarwal <nehaagarwal@microsoft.com> - 5.15.32.1-1
- Update source to 5.15.32.1
* Tue Mar 08 2022 cameronbaird <cameronbaird@microsoft.com> - 5.15.26.1-1
- Update source to 5.15.26.1

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

@ -1,5 +1,5 @@
{
"Signatures": {
"kernel-5.15.26.1.tar.gz": "2cbcede7448516beb64a94220bf1b60937956a433cecd7a0ecb244e1bfeeae21"
"kernel-5.15.32.1.tar.gz": "8f87899c194ba5e17714a647b303c2e7104fb86ed32aae3c5d892f6edf708749"
}
}

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

@ -1,7 +1,7 @@
Summary: Linux API header files
Name: kernel-headers
Version: 5.15.26.1
Release: 4%{?dist}
Version: 5.15.32.1
Release: 1%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
@ -37,6 +37,9 @@ cp -rv usr/include/* /%{buildroot}%{_includedir}
%{_includedir}/*
%changelog
* Fri Apr 08 2022 Neha Agarwal <nehaagarwal@microsoft.com> - 5.15.32.1-1
- Update source to 5.15.32.1
* Tue Apr 05 2022 Henry Li <lihl@microsoft.com> - 5.15.26.1-4
- Bump release number to match kernel release

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

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86_64 5.15.26.1 Kernel Configuration
# Linux/x86_64 5.15.32.1 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y

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

@ -1,8 +1,8 @@
{
"Signatures": {
"cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0",
"config": "816a4054128ea59fbe2b25f6ebe9902fe9dc600f9027f9f7e2ab169decaefddb",
"kernel-5.15.26.1.tar.gz": "2cbcede7448516beb64a94220bf1b60937956a433cecd7a0ecb244e1bfeeae21",
"config": "fcd21baa2e67f08f310bde054ac3933d84a67ef5ae06c51b13f141029ed9a0fa",
"kernel-5.15.32.1.tar.gz": "8f87899c194ba5e17714a647b303c2e7104fb86ed32aae3c5d892f6edf708749",
"sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f"
}
}

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

@ -1,11 +1,11 @@
%global security_hardening none
%global sha512hmac bash %{_sourcedir}/sha512hmac-openssl.sh
%global rt_version rt34
%global rt_version rt39
%define uname_r %{version}-%{rt_version}-%{release}
Summary: Realtime Linux Kernel
Name: kernel-rt
Version: 5.15.26.1
Release: 4%{?dist}
Version: 5.15.32.1
Release: 1%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
@ -19,7 +19,7 @@ Source3: cbl-mariner-ca-20211013.pem
# When updating, make sure to grab the matching patch from
# https://mirrors.edge.kernel.org/pub/linux/kernel/projects/rt/
# Also, remember to bump the global rt_version macro above ^
Patch0: patch-5.15.26-%{rt_version}.patch
Patch0: patch-5.15.32-%{rt_version}.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
@ -349,6 +349,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%{_sysconfdir}/bash_completion.d/bpftool
%changelog
* Fri Apr 08 2022 Neha Agarwal <nehaagarwal@microsoft.com> - 5.15.32.1-1
- Update source to 5.15.32.1
* Tue Apr 05 2022 Henry Li <lihl@microsoft.com> - 5.15.26.1-4
- Add Dell devices support

58
SPECS/kernel-rt/patch-5.15.26-rt34.patch → SPECS/kernel-rt/patch-5.15.32-rt39.patch
Просмотреть файл

@ -142,7 +142,7 @@ index a646a3f6440f..beb09d74684f 100644
DEFINE(TI_CPU, offsetof(struct thread_info, cpu));
DEFINE(TI_CPU_DOMAIN, offsetof(struct thread_info, cpu_domain));
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index d8e28abd468c..6eef0eb99fe6 100644
index 46b697dfa4cf..ff9bb5cc4738 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -206,11 +206,18 @@ ENDPROC(__dabt_svc)
@ -235,7 +235,7 @@ index efa402025031..59487ee9fd61 100644
return 0;
}
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 0758ea0717f9..ce63a0d3ad42 100644
index 1a18c9045773..c0d64ae6089b 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -88,6 +88,7 @@ config ARM64
@ -263,7 +263,7 @@ index 0758ea0717f9..ce63a0d3ad42 100644
select POWER_SUPPLY
select SPARSE_IRQ
diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h
index 72f95c6a7051..30fe8c324ce6 100644
index 08363d3cc1da..d2e4bb32eb2a 100644
--- a/arch/arm64/include/asm/pgtable.h
+++ b/arch/arm64/include/asm/pgtable.h
@@ -1001,7 +1001,7 @@ static inline void update_mmu_cache(struct vm_area_struct *vma,
@ -490,7 +490,7 @@ index c287b9407f28..1d65f2801e13 100644
uprobe_notify_resume(regs);
diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
index f9c7e4e61b29..0ff22589ee1c 100644
index 0b2f684cd8ca..88b671e8afbd 100644
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@ -829,7 +829,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu)
@ -1362,10 +1362,10 @@ index a1202536fc57..a26a7c3849f5 100644
#define orc_warn_current(args...) \
({ \
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 33cb06518124..b0b2122c51a3 100644
index 61bc54748f22..62597025b6e7 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -8526,6 +8526,14 @@ int kvm_arch_init(void *opaque)
@@ -8535,6 +8535,14 @@ int kvm_arch_init(void *opaque)
goto out;
}
@ -1673,7 +1673,7 @@ index d3f2e5364c27..9c4a99757afd 100644
return 0;
}
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index 9fa86288b78a..7de3f5b6e8d0 100644
index e3df82d5d37a..5502e176d51b 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -66,7 +66,7 @@ struct mm_struct efi_mm = {
@ -5065,7 +5065,7 @@ index 91a43e57a32e..1d099609568d 100644
}
diff --git a/kernel/fork.c b/kernel/fork.c
index 28aee1a8875b..29f8781e8a45 100644
index 89475c994ca9..dc1aa0f71089 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -289,7 +289,10 @@ static inline void free_thread_stack(struct task_struct *tsk)
@ -7539,7 +7539,7 @@ index 4ca6d5b199e8..477ebf6ec712 100644
div = div < 0 ? 7 : div > sizeof(long) * 8 - 2 ? sizeof(long) * 8 - 2 : div;
bl = max(rdp->blimit, pending >> div);
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index c2dec6ce9809..443fe7f04429 100644
index a0747eaa2dba..a031f078b084 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -74,7 +74,11 @@ __read_mostly int sysctl_resched_latency_warn_once = 1;
@ -7676,7 +7676,7 @@ index c2dec6ce9809..443fe7f04429 100644
}
}
@@ -4384,6 +4431,9 @@ int sched_fork(unsigned long clone_flags, struct task_struct *p)
@@ -4385,6 +4432,9 @@ int sched_fork(unsigned long clone_flags, struct task_struct *p)
p->on_cpu = 0;
#endif
init_task_preempt_count(p);
@ -7686,7 +7686,7 @@ index c2dec6ce9809..443fe7f04429 100644
#ifdef CONFIG_SMP
plist_node_init(&p->pushable_tasks, MAX_PRIO);
RB_CLEAR_NODE(&p->pushable_dl_tasks);
@@ -4840,20 +4890,18 @@ static struct rq *finish_task_switch(struct task_struct *prev)
@@ -4849,20 +4899,18 @@ static struct rq *finish_task_switch(struct task_struct *prev)
*/
if (mm) {
membarrier_mm_sync_core_before_usermode(mm);
@ -7712,7 +7712,7 @@ index c2dec6ce9809..443fe7f04429 100644
put_task_struct_rcu_user(prev);
}
@@ -6254,6 +6302,7 @@ static void __sched notrace __schedule(unsigned int sched_mode)
@@ -6263,6 +6311,7 @@ static void __sched notrace __schedule(unsigned int sched_mode)
next = pick_next_task(rq, prev, &rf);
clear_tsk_need_resched(prev);
@ -7720,7 +7720,7 @@ index c2dec6ce9809..443fe7f04429 100644
clear_preempt_need_resched();
#ifdef CONFIG_SCHED_DEBUG
rq->last_seen_need_resched_ns = 0;
@@ -6471,6 +6520,30 @@ static void __sched notrace preempt_schedule_common(void)
@@ -6480,6 +6529,30 @@ static void __sched notrace preempt_schedule_common(void)
} while (need_resched());
}
@ -7751,7 +7751,7 @@ index c2dec6ce9809..443fe7f04429 100644
#ifdef CONFIG_PREEMPTION
/*
* This is the entry point to schedule() from in-kernel preemption
@@ -6484,7 +6557,8 @@ asmlinkage __visible void __sched notrace preempt_schedule(void)
@@ -6493,7 +6566,8 @@ asmlinkage __visible void __sched notrace preempt_schedule(void)
*/
if (likely(!preemptible()))
return;
@ -7761,7 +7761,7 @@ index c2dec6ce9809..443fe7f04429 100644
preempt_schedule_common();
}
NOKPROBE_SYMBOL(preempt_schedule);
@@ -6517,6 +6591,9 @@ asmlinkage __visible void __sched notrace preempt_schedule_notrace(void)
@@ -6526,6 +6600,9 @@ asmlinkage __visible void __sched notrace preempt_schedule_notrace(void)
if (likely(!preemptible()))
return;
@ -7771,7 +7771,7 @@ index c2dec6ce9809..443fe7f04429 100644
do {
/*
* Because the function tracer can trace preempt_count_sub()
@@ -8669,7 +8746,9 @@ void __init init_idle(struct task_struct *idle, int cpu)
@@ -8678,7 +8755,9 @@ void __init init_idle(struct task_struct *idle, int cpu)
/* Set the preempt count _outside_ the spinlocks! */
init_idle_preempt_count(idle, cpu);
@ -7782,7 +7782,7 @@ index c2dec6ce9809..443fe7f04429 100644
/*
* The idle tasks have their own, simple scheduling class:
*/
@@ -9463,14 +9542,8 @@ void __init sched_init(void)
@@ -9472,14 +9551,8 @@ void __init sched_init(void)
}
#ifdef CONFIG_DEBUG_ATOMIC_SLEEP
@ -7798,7 +7798,7 @@ index c2dec6ce9809..443fe7f04429 100644
{
unsigned int state = get_current_state();
/*
@@ -9484,11 +9557,32 @@ void __might_sleep(const char *file, int line, int preempt_offset)
@@ -9493,11 +9566,32 @@ void __might_sleep(const char *file, int line, int preempt_offset)
(void *)current->task_state_change,
(void *)current->task_state_change);
@ -7833,7 +7833,7 @@ index c2dec6ce9809..443fe7f04429 100644
{
/* Ratelimiting timestamp: */
static unsigned long prev_jiffy;
@@ -9498,7 +9592,7 @@ void ___might_sleep(const char *file, int line, int preempt_offset)
@@ -9507,7 +9601,7 @@ void ___might_sleep(const char *file, int line, int preempt_offset)
/* WARN_ON_ONCE() by default, no rate limit required: */
rcu_sleep_check();
@ -7842,7 +7842,7 @@ index c2dec6ce9809..443fe7f04429 100644
!is_idle_task(current) && !current->non_block_count) ||
system_state == SYSTEM_BOOTING || system_state > SYSTEM_RUNNING ||
oops_in_progress)
@@ -9511,29 +9605,33 @@ void ___might_sleep(const char *file, int line, int preempt_offset)
@@ -9520,29 +9614,33 @@ void ___might_sleep(const char *file, int line, int preempt_offset)
/* Save this before calling printk(), since that will clobber it: */
preempt_disable_ip = get_preempt_disable_ip(current);
@ -8107,7 +8107,7 @@ index 4e8698e62f07..3d0157bd4e14 100644
rd->visit_gen = 0;
diff --git a/kernel/signal.c b/kernel/signal.c
index aea93d6a5520..484a3c046448 100644
index 6e3dbb3d1217..116f9d38ac32 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1324,6 +1324,34 @@ force_sig_info_to_task(struct kernel_siginfo *info, struct task_struct *t,
@ -8338,10 +8338,10 @@ index b73e8850e58d..149cc4b08d8e 100644
}
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 618c20ce2479..72e544f77e4f 100644
index 01002656f1ae..76ea2013135c 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -2634,7 +2634,13 @@ unsigned int tracing_gen_ctx_irq_test(unsigned int irqs_status)
@@ -2636,7 +2636,13 @@ unsigned int tracing_gen_ctx_irq_test(unsigned int irqs_status)
trace_flags |= TRACE_FLAG_NEED_RESCHED;
if (test_preempt_need_resched())
trace_flags |= TRACE_FLAG_PREEMPT_RESCHED;
@ -8356,7 +8356,7 @@ index 618c20ce2479..72e544f77e4f 100644
(min_t(unsigned int, migration_disable_value(), 0xf)) << 4;
}
@@ -4210,15 +4216,17 @@ unsigned long trace_total_entries(struct trace_array *tr)
@@ -4212,15 +4218,17 @@ unsigned long trace_total_entries(struct trace_array *tr)
static void print_lat_help_header(struct seq_file *m)
{
@ -8383,7 +8383,7 @@ index 618c20ce2479..72e544f77e4f 100644
}
static void print_event_info(struct array_buffer *buf, struct seq_file *m)
@@ -4252,14 +4260,16 @@ static void print_func_help_header_irq(struct array_buffer *buf, struct seq_file
@@ -4254,14 +4262,16 @@ static void print_func_help_header_irq(struct array_buffer *buf, struct seq_file
print_event_info(buf, m);
@ -9213,11 +9213,11 @@ index abb3432ed744..d5e82e4a57ad 100644
kunmap(miter->page);
diff --git a/localversion-rt b/localversion-rt
new file mode 100644
index 000000000000..21988f9ad53f
index 000000000000..5498386d0d0c
--- /dev/null
+++ b/localversion-rt
@@ -0,0 +1 @@
+-rt34
+-rt39
diff --git a/mm/Kconfig b/mm/Kconfig
index c048dea7e342..88778414465b 100644
--- a/mm/Kconfig
@ -9261,7 +9261,7 @@ index 7773bae3b6ed..33ecf2df08d1 100644
/*
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index e8a807c78110..3c5be440ab30 100644
index 8375eecc55de..f81f11bcce5a 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -1918,11 +1918,12 @@ static void *new_vmap_block(unsigned int order, gfp_t gfp_mask)
@ -11446,7 +11446,7 @@ index a66398fb2d6d..377f896bdedc 100644
return -1;
return 0;
diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
index 6316bd2b8f37..dfc9d12caef8 100644
index d4b663401be1..e77738621485 100644
--- a/net/sunrpc/svc_xprt.c
+++ b/net/sunrpc/svc_xprt.c
@@ -441,7 +441,7 @@ void svc_xprt_do_enqueue(struct svc_xprt *xprt)

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

@ -0,0 +1,6 @@
CVE-2021-4002 - Partially backported to 5.15.26.1
Upstream: 13e4ad2ce8df6e058ef482a31fdd81c725b0f7ea
Stable: not backported, because the function this patch is for move_hugetlb_page_tables, does not get added until this commit: 550a7d60bd5e35a56942dba6d8a26752beb26c9f
Upstream: a4a118f2eead1d6c49e00765de89878288d4b890
Stable: 556d59293a2a94863797a7a50890992aa5e8db16

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

@ -0,0 +1,3 @@
CVE-2022-0516 - Already backported to 5.15.26.1
Upsteam: 2c212e1baedcd782b2535a3f86bc491977677c0e
Stable: 14f880ea779e11a6c162f122c1199e3578e6e3f3

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

@ -0,0 +1,3 @@
CVE-2022-0742 - Already backported to 5.15.27.1
Upstream: 2d3916f3189172d5c69d33065c3c21119fe539fc
Stable: 771aca9bc70709771f66c3e7c00ce87339aa1790

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

@ -0,0 +1,3 @@
CVE-2022-1011 - Already backported to 5.15.30.1
Upstream: 0c4bcfdecb1ac0967619ee7ff44871d93c08c909
Stable: ca62747b38f59d4e75967ebf63c992de8852ca1b

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

@ -0,0 +1,6 @@
CVE-2022-24958 - Already backported to 5.15.27.1
Upstream: 501e38a5531efbd77d5c73c0ba838a889bfc1d74
Stable: ab3656acb7b4f33a30970a920ed90f0db36d940b
Upstream: 89f3594d0de58e8a57d92d497dea9fee3d4b9cda
Stable: 07de9a494b5ae41b9253411a8e9576d7fceedcc3

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

@ -0,0 +1,3 @@
CVE-2022-26490 - Already backported to 5.15.32.1
Upstream: 4fbcc1a4cb20fe26ad0225679c536c80f1648221
Stable: a34c47b1ab07153a047476de83581dc822287f39

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

@ -0,0 +1,3 @@
CVE-2022-26878 - Already backported to 5.15.26.1
Upstream: 1d0688421449718c6c5f46e458a378c9b530ba18
Stable: 1f2270e161f978912100dd7acdfe1894bebcd4f6

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

@ -0,0 +1,3 @@
CVE-2022-27223 - Already backported to 5.15.26.1
Upstream: 7f14c7227f342d9932f9b918893c8814f86d2a0d
Stable: 2c775ad1fd5e014b35e483da2aab8400933fb09d

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

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86_64 5.15.26.1 Kernel Configuration
# Linux/x86_64 5.15.32.1 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y
@ -2532,7 +2532,7 @@ CONFIG_I40EVF=m
CONFIG_FM10K=m
# CONFIG_IGC is not set
CONFIG_NET_VENDOR_MICROSOFT=y
# CONFIG_MICROSOFT_MANA is not set
CONFIG_MICROSOFT_MANA=m
CONFIG_JME=m
CONFIG_NET_VENDOR_LITEX=y
CONFIG_NET_VENDOR_MARVELL=y

2
SPECS/kernel/config_aarch64
Просмотреть файл

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 5.15.26.1 Kernel Configuration
# Linux/arm64 5.15.32.1 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y

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

@ -1,9 +1,9 @@
{
"Signatures": {
"cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0",
"config": "3df3e14c34a95e8d4a1565a0a75cb7bddf4347a0b194bf4bb08807f210850184",
"config_aarch64": "b5bdb8db704121cf546d37bb67ef58b7548c1064c7913116abf8074834f21c83",
"kernel-5.15.26.1.tar.gz": "2cbcede7448516beb64a94220bf1b60937956a433cecd7a0ecb244e1bfeeae21",
"config": "e2dc9935575e1390bbf9d51a3469cedb9a60392dd86349aa32171102a5126a84",
"config_aarch64": "e20d4991633326d47172a6fe7c73ebb674c037bf65d7566a94921ad165327b1a",
"kernel-5.15.32.1.tar.gz": "8f87899c194ba5e17714a647b303c2e7104fb86ed32aae3c5d892f6edf708749",
"sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f"
}
}

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

@ -6,8 +6,8 @@
%endif
Summary: Linux Kernel
Name: kernel
Version: 5.15.26.1
Release: 4%{?dist}
Version: 5.15.32.1
Release: 1%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
@ -59,6 +59,14 @@ Patch1033: CVE-2011-0640.nopatch
Patch1034: CVE-2022-0492.nopatch
Patch1035: CVE-2021-3743.nopatch
Patch1036: CVE-2022-26966.nopatch
Patch1037: CVE-2022-0516.nopatch
Patch1038: CVE-2022-26878.nopatch
Patch1039: CVE-2022-27223.nopatch
Patch1040: CVE-2022-24958.nopatch
Patch1041: CVE-2022-0742.nopatch
Patch1042: CVE-2022-1011.nopatch
Patch1043: CVE-2022-26490.nopatch
Patch1044: CVE-2021-4002.nopatch
BuildRequires: audit-devel
BuildRequires: bash
BuildRequires: bc
@ -407,6 +415,12 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%{_sysconfdir}/bash_completion.d/bpftool
%changelog
* Fri Apr 08 2022 Neha Agarwal <nehaagarwal@microsoft.com> - 5.15.32.1-1
- Update source to 5.15.32.1
- Address CVES: 2022-0516, 2022-26878, 2022-27223, 2022-24958, 2022-0742,
2022-1011, 2022-26490, 2021-4002
- Enable MANA driver config
* Tue Apr 05 2022 Henry Li <lihl@microsoft.com> - 5.15.26.1-4
- Add Dell devices support

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

@ -6600,8 +6600,8 @@
"type": "other",
"other": {
"name": "hyperv-daemons",
"version": "5.15.26.1",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.15.26.1.tar.gz"
"version": "5.15.32.1",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.15.32.1.tar.gz"
}
}
},
@ -8401,8 +8401,8 @@
"type": "other",
"other": {
"name": "kernel",
"version": "5.15.26.1",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.15.26.1.tar.gz"
"version": "5.15.32.1",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.15.32.1.tar.gz"
}
}
},
@ -8411,8 +8411,8 @@
"type": "other",
"other": {
"name": "kernel-headers",
"version": "5.15.26.1",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.15.26.1.tar.gz"
"version": "5.15.32.1",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.15.32.1.tar.gz"
}
}
},
@ -8421,8 +8421,8 @@
"type": "other",
"other": {
"name": "kernel-rt",
"version": "5.15.26.1",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.15.26.1.tar.gz"
"version": "5.15.32.1",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.15.32.1.tar.gz"
}
}
},

2
toolkit/resources/manifests/package/pkggen_core_aarch64.txt
Просмотреть файл

@ -1,5 +1,5 @@
filesystem-1.1-8.cm2.aarch64.rpm
kernel-headers-5.15.26.1-4.cm2.noarch.rpm
kernel-headers-5.15.32.1-1.cm2.noarch.rpm
glibc-2.34-3.cm2.aarch64.rpm
glibc-devel-2.34-3.cm2.aarch64.rpm
glibc-i18n-2.34-3.cm2.aarch64.rpm

2
toolkit/resources/manifests/package/pkggen_core_x86_64.txt
Просмотреть файл

@ -1,5 +1,5 @@
filesystem-1.1-8.cm2.x86_64.rpm
kernel-headers-5.15.26.1-4.cm2.noarch.rpm
kernel-headers-5.15.32.1-1.cm2.noarch.rpm
glibc-2.34-3.cm2.x86_64.rpm
glibc-devel-2.34-3.cm2.x86_64.rpm
glibc-i18n-2.34-3.cm2.x86_64.rpm

2
toolkit/resources/manifests/package/toolchain_aarch64.txt
Просмотреть файл

@ -134,7 +134,7 @@ intltool-0.51.0-7.cm2.noarch.rpm
itstool-2.0.6-4.cm2.noarch.rpm
kbd-2.2.0-1.cm2.aarch64.rpm
kbd-debuginfo-2.2.0-1.cm2.aarch64.rpm
kernel-headers-5.15.26.1-4.cm2.noarch.rpm
kernel-headers-5.15.32.1-1.cm2.noarch.rpm
kmod-29-1.cm2.aarch64.rpm
kmod-debuginfo-29-1.cm2.aarch64.rpm
kmod-devel-29-1.cm2.aarch64.rpm

2
toolkit/resources/manifests/package/toolchain_x86_64.txt
Просмотреть файл

@ -134,7 +134,7 @@ intltool-0.51.0-7.cm2.noarch.rpm
itstool-2.0.6-4.cm2.noarch.rpm
kbd-2.2.0-1.cm2.x86_64.rpm
kbd-debuginfo-2.2.0-1.cm2.x86_64.rpm
kernel-headers-5.15.26.1-4.cm2.noarch.rpm
kernel-headers-5.15.32.1-1.cm2.noarch.rpm
kmod-29-1.cm2.x86_64.rpm
kmod-debuginfo-29-1.cm2.x86_64.rpm
kmod-devel-29-1.cm2.x86_64.rpm

2
toolkit/scripts/toolchain/container/Dockerfile
Просмотреть файл

@ -57,7 +57,7 @@ COPY [ "./toolchain-sha256sums", \
WORKDIR $LFS/sources
RUN wget -nv --no-clobber --timeout=30 --continue --input-file=$LFS/tools/toolchain-local-wget-list --directory-prefix=$LFS/sources; exit 0
RUN wget -nv --no-clobber --timeout=30 --continue --input-file=$LFS/tools/toolchain-remote-wget-list --directory-prefix=$LFS/sources; exit 0
RUN wget -nv --no-clobber --timeout=30 --continue https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.15.26.1.tar.gz -O kernel-5.15.26.1.tar.gz --directory-prefix=$LFS/sources; exit 0
RUN wget -nv --no-clobber --timeout=30 --continue https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.15.32.1.tar.gz -O kernel-5.15.32.1.tar.gz --directory-prefix=$LFS/sources; exit 0
USER root
RUN sha256sum -c $LFS/tools/toolchain-sha256sums && \
groupadd lfs && \

2
toolkit/scripts/toolchain/container/toolchain-sha256sums
Просмотреть файл

@ -26,7 +26,7 @@ fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2 gmp-6.2.1.tar.
5c10da312460aec721984d5d83246d24520ec438dd48d7ab5a05dbc0d6d6823c grep-3.7.tar.xz
3a48a9d6c97750bfbd535feeb5be0111db6406ddb7bb79fc680809cda6d828a5 groff-1.22.3.tar.gz
9b9a95d68fdcb936849a4d6fada8bf8686cddf58b9b26c9c4289ed0c92a77907 gzip-1.11.tar.xz
2cbcede7448516beb64a94220bf1b60937956a433cecd7a0ecb244e1bfeeae21 kernel-5.15.26.1.tar.gz
8f87899c194ba5e17714a647b303c2e7104fb86ed32aae3c5d892f6edf708749 kernel-5.15.32.1.tar.gz
a36613695ffa2905fdedc997b6df04a3006ccfd71d747a339b78aa8412c3d852 libarchive-3.6.0.tar.gz
b630b7c484271b3ba867680d6a14b10a86cfa67247a14631b14c06731d5a458b libcap-2.26.tar.xz
0d72e12e4f2afff67fd7b9df0a24d7ba42b5a7c9211ac5b3dcccc5cd8b286f2b libpipeline-1.5.0.tar.gz

8
toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh
Просмотреть файл

@ -67,14 +67,14 @@ set -e
#
cd /sources
echo Linux-5.15.26.1 API Headers
tar xf kernel-5.15.26.1.tar.gz
pushd CBL-Mariner-Linux-Kernel-rolling-lts-mariner-5.15.26.1
echo Linux-5.15.32.1 API Headers
tar xf kernel-5.15.32.1.tar.gz
pushd CBL-Mariner-Linux-Kernel-rolling-lts-mariner-5.15.32.1
make mrproper
make headers
cp -rv usr/include/* /usr/include
popd
rm -rf CBL-Mariner-Linux-Kernel-rolling-lts-mariner-5.15.26.1
rm -rf CBL-Mariner-Linux-Kernel-rolling-lts-mariner-5.15.32.1
touch /logs/status_kernel_headers_complete
echo 6.8. Man-pages-5.02

8
toolkit/scripts/toolchain/container/toolchain_build_temp_tools.sh
Просмотреть файл

@ -114,14 +114,14 @@ rm -rf gcc-11.2.0
touch $LFS/logs/temptoolchain/status_gcc_pass1_complete
echo Linux-5.15.26.1 API Headers
tar xf kernel-5.15.26.1.tar.gz
pushd CBL-Mariner-Linux-Kernel-rolling-lts-mariner-5.15.26.1
echo Linux-5.15.32.1 API Headers
tar xf kernel-5.15.32.1.tar.gz
pushd CBL-Mariner-Linux-Kernel-rolling-lts-mariner-5.15.32.1
make mrproper
make headers
cp -rv usr/include/* /tools/include
popd
rm -rf CBL-Mariner-Linux-Kernel-rolling-lts-mariner-5.15.26.1
rm -rf CBL-Mariner-Linux-Kernel-rolling-lts-mariner-5.15.32.1
touch $LFS/logs/temptoolchain/status_kernel_headers_complete