update sources and patches to Ubuntu-6.8.0-32.32

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2024-05-02 13:51:01 +02:00
parent 1c9271db59
commit 1313c6a7b3
6 changed files with 11 additions and 14 deletions

View File

@ -55,7 +55,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2 files changed, 111 insertions(+) 2 files changed, 111 insertions(+)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index cfff5d4df6a0..21b6d7871493 100644 index 3470cb524222..3c9192618839 100644
--- a/Documentation/admin-guide/kernel-parameters.txt --- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -4399,6 +4399,15 @@ @@ -4399,6 +4399,15 @@

View File

@ -108,7 +108,7 @@ index 856e3037e74f..0ac5a84adcd5 100644
int cpuid_query_maxphyaddr(struct kvm_vcpu *vcpu); int cpuid_query_maxphyaddr(struct kvm_vcpu *vcpu);
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index ffe580169c93..f0870144a6cf 100644 index 8e4e48840290..3af8e426ead3 100644
--- a/arch/x86/kvm/x86.c --- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c
@@ -5580,6 +5580,19 @@ static int kvm_vcpu_ioctl_x86_set_xsave(struct kvm_vcpu *vcpu, @@ -5580,6 +5580,19 @@ static int kvm_vcpu_ioctl_x86_set_xsave(struct kvm_vcpu *vcpu,

View File

@ -17,10 +17,10 @@ Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/security/apparmor/af_inet.c b/security/apparmor/af_inet.c diff --git a/security/apparmor/af_inet.c b/security/apparmor/af_inet.c
index fb5cd985630d..6a056e1c30d6 100644 index 57b710054a76..35f905d9b960 100644
--- a/security/apparmor/af_inet.c --- a/security/apparmor/af_inet.c
+++ b/security/apparmor/af_inet.c +++ b/security/apparmor/af_inet.c
@@ -768,7 +768,7 @@ int aa_inet_msg_perm(const char *op, u32 request, struct socket *sock, @@ -766,7 +766,7 @@ int aa_inet_msg_perm(const char *op, u32 request, struct socket *sock,
/* do we need early bailout for !family ... */ /* do we need early bailout for !family ... */
return sk_has_perm2(sock->sk, op, request, profile, ad, return sk_has_perm2(sock->sk, op, request, profile, ad,
map_sock_addr(sock, ADDR_LOCAL, &laddr, &ad), map_sock_addr(sock, ADDR_LOCAL, &laddr, &ad),

View File

@ -1,7 +1,7 @@
From 29ba89f1895285f06c333546882e0c5ae9a6df23 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "Borislav Petkov (AMD)" <bp@alien8.de> From: "Borislav Petkov (AMD)" <bp@alien8.de>
Date: Sun, 24 Mar 2024 20:51:35 +0100 Date: Sun, 24 Mar 2024 20:51:35 +0100
Subject: x86/CPU/AMD: Improve the erratum 1386 workaround Subject: [PATCH] x86/CPU/AMD: Improve the erratum 1386 workaround
Disable XSAVES only on machines which haven't loaded the microcode Disable XSAVES only on machines which haven't loaded the microcode
revision containing the erratum fix. revision containing the erratum fix.
@ -21,7 +21,7 @@ Link: https://lore.kernel.org/r/20240324200525.GBZgCHhYFsBj12PrKv@fat_crate.loca
2 files changed, 20 insertions(+) 2 files changed, 20 insertions(+)
diff --git a/arch/x86/include/asm/cpu_device_id.h b/arch/x86/include/asm/cpu_device_id.h diff --git a/arch/x86/include/asm/cpu_device_id.h b/arch/x86/include/asm/cpu_device_id.h
index eb8fcede9e3bf4..bf4e065cf1e2fc 100644 index eb8fcede9e3b..bf4e065cf1e2 100644
--- a/arch/x86/include/asm/cpu_device_id.h --- a/arch/x86/include/asm/cpu_device_id.h
+++ b/arch/x86/include/asm/cpu_device_id.h +++ b/arch/x86/include/asm/cpu_device_id.h
@@ -190,6 +190,14 @@ struct x86_cpu_desc { @@ -190,6 +190,14 @@ struct x86_cpu_desc {
@ -40,7 +40,7 @@ index eb8fcede9e3bf4..bf4e065cf1e2fc 100644
extern bool x86_cpu_has_min_microcode_rev(const struct x86_cpu_desc *table); extern bool x86_cpu_has_min_microcode_rev(const struct x86_cpu_desc *table);
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 6d8677e80ddbb1..873f0fdc2ef8a4 100644 index dfa8d0cf5e18..22a263b1a884 100644
--- a/arch/x86/kernel/cpu/amd.c --- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c
@@ -13,6 +13,7 @@ @@ -13,6 +13,7 @@
@ -51,7 +51,7 @@ index 6d8677e80ddbb1..873f0fdc2ef8a4 100644
#include <asm/spec-ctrl.h> #include <asm/spec-ctrl.h>
#include <asm/smp.h> #include <asm/smp.h>
#include <asm/numa.h> #include <asm/numa.h>
@@ -802,6 +803,11 @@ static void init_amd_bd(struct cpuinfo_x86 *c) @@ -926,6 +927,11 @@ static void init_amd_bd(struct cpuinfo_x86 *c)
clear_rdrand_cpuid_bit(c); clear_rdrand_cpuid_bit(c);
} }
@ -63,7 +63,7 @@ index 6d8677e80ddbb1..873f0fdc2ef8a4 100644
static void fix_erratum_1386(struct cpuinfo_x86 *c) static void fix_erratum_1386(struct cpuinfo_x86 *c)
{ {
/* /*
@@ -811,7 +817,13 @@ static void fix_erratum_1386(struct cpuinfo_x86 *c) @@ -935,7 +941,13 @@ static void fix_erratum_1386(struct cpuinfo_x86 *c)
* *
* Affected parts all have no supervisor XSAVE states, meaning that * Affected parts all have no supervisor XSAVE states, meaning that
* the XSAVEC instruction (which works fine) is equivalent. * the XSAVEC instruction (which works fine) is equivalent.
@ -77,6 +77,3 @@ index 6d8677e80ddbb1..873f0fdc2ef8a4 100644
clear_cpu_cap(c, X86_FEATURE_XSAVES); clear_cpu_cap(c, X86_FEATURE_XSAVES);
} }
--
cgit 1.2.3-korg

@ -1 +1 @@
Subproject commit 168e7b6ca98325ef7253b7112ed5b861c1bb519b Subproject commit 227b79edaa927cc75ad84f5a035411cf1ef5977b