From 67ef5e4955cfee8a0fe4a445600706c58861ccf4 Mon Sep 17 00:00:00 2001 From: Kernel Build Daemon Date: Apr 14 2024 05:40:05 +0000 Subject: Merge branch 'SLE15-SP5' into SLE15-SP5-AZURE --- diff --git a/blacklist.conf b/blacklist.conf index 078cf42..e6f12a8 100644 --- a/blacklist.conf +++ b/blacklist.conf @@ -853,3 +853,4 @@ c7ac8231ace9b07306d0299969e42073b189c70a # prereq of f7ec1cd5cc7ef3ad964b677ba82 13b7bc60b5353371460a203df6c38ccd38ad7a3a # prereq of f7ec1cd5cc7ef3ad964b677ba82b8b77f1c93009 daa694e4137571b4ebec330f9a9b4d54aa8b8089 # prereq of f7ec1cd5cc7ef3ad964b677ba82b8b77f1c93009 f7ec1cd5cc7ef3ad964b677ba82b8b77f1c93009 # performance optimization, see bsc#1222436 +b377c66ae3509ccea596512d6afb4777711c4870 # we don't have annotate_noendbr diff --git a/patches.kabi/PCI-Add-locking-to-RMW-PCI-Express-Capability-Regist.patch b/patches.kabi/PCI-Add-locking-to-RMW-PCI-Express-Capability-Regist.patch index 08188fb..fb8161f 100644 --- a/patches.kabi/PCI-Add-locking-to-RMW-PCI-Express-Capability-Regist.patch +++ b/patches.kabi/PCI-Add-locking-to-RMW-PCI-Express-Capability-Regist.patch @@ -18,8 +18,8 @@ exported function. Signed-off-by: Jiri Slaby --- drivers/pci/access.c | 27 +++++++++++++++++++++++++++ - include/linux/pci.h | 35 ++++++----------------------------- - 2 files changed, 33 insertions(+), 29 deletions(-) + include/linux/pci.h | 33 +++++---------------------------- + 2 files changed, 32 insertions(+), 28 deletions(-) --- a/drivers/pci/access.c +++ b/drivers/pci/access.c @@ -67,7 +67,7 @@ Signed-off-by: Jiri Slaby u32 saved_config_space[16]; /* Config space saved at suspend time */ struct hlist_head saved_cap_space; int rom_attr_enabled; /* Display of ROM attribute enabled? */ -@@ -516,11 +515,14 @@ struct pci_dev { +@@ -516,6 +515,9 @@ struct pci_dev { /* These methods index pci_reset_fn_methods[] */ u8 reset_methods[PCI_NUM_RESET_METHODS]; /* In priority order */ @@ -77,12 +77,6 @@ Signed-off-by: Jiri Slaby }; static inline struct pci_dev *pci_physfn(struct pci_dev *dev) - { --#ifdef CONFIG_PCI_IOV -+#ifdef CONFIG_PCI_IOe - if (dev->is_virtfn) - dev = dev->physfn; - #endif @@ -1212,6 +1214,8 @@ int pcie_capability_read_word(struct pci int pcie_capability_read_dword(struct pci_dev *dev, int pos, u32 *val); int pcie_capability_write_word(struct pci_dev *dev, int pos, u16 val); diff --git a/patches.kabi/kabi-allow-extra-bugints.patch b/patches.kabi/kabi-allow-extra-bugints.patch index 385a00b..fe19c90 100644 --- a/patches.kabi/kabi-allow-extra-bugints.patch +++ b/patches.kabi/kabi-allow-extra-bugints.patch @@ -11,14 +11,14 @@ cpuid_x86::x86_ext_capability and also at the end ot cpu_caps_set array. Signed-off-by: Nikolay Borisov --- - arch/x86/include/asm/cpufeature.h | 80 ++++++++++++++++++++++++++++++++----- + arch/x86/include/asm/cpufeature.h | 89 +++++++++++++++++++++++++++++++------ arch/x86/include/asm/cpufeatures.h | 3 - arch/x86/include/asm/processor.h | 3 - - arch/x86/kernel/alternative.c | 2 - arch/x86/kernel/cpu/common.c | 7 ++- + arch/x86/kernel/alternative.c | 5 +- + arch/x86/kernel/cpu/common.c | 7 ++ arch/x86/kernel/cpu/mkcapflags.sh | 4 - arch/x86/kernel/cpu/proc.c | 4 - - 7 files changed, 85 insertions(+), 18 deletions(-) + 7 files changed, 92 insertions(+), 23 deletions(-) --- a/arch/x86/include/asm/cpufeature.h +++ b/arch/x86/include/asm/cpufeature.h @@ -117,8 +117,20 @@ Signed-off-by: Nikolay Borisov #if defined(__clang__) && !defined(CONFIG_CC_HAS_ASM_GOTO) -@@ -207,15 +256,26 @@ t_no: - ) +@@ -200,22 +249,34 @@ t_no: + } + + #define static_cpu_has(bit) \ +-( \ +- __builtin_constant_p(boot_cpu_has(bit)) ? \ ++({ \ ++ BUILD_BUG_ON_MSG((bit >> 5) >= NCAPINTS+NBUGINTS, "extended bits/bugs not supported"); \ ++ (__builtin_constant_p(boot_cpu_has(bit)) ? \ + boot_cpu_has(bit) : \ +- _static_cpu_has(bit) \ +-) ++ _static_cpu_has(bit)); \ ++}) #endif -#define cpu_has_bug(c, bit) cpu_has(c, (bit)) @@ -190,6 +202,16 @@ Signed-off-by: Nikolay Borisov /* * Patch if either: +@@ -396,7 +396,8 @@ void __init_or_module noinline apply_alt + * - feature not present but ALTINSTR_FLAG_INV is set to mean, + * patch if feature is *NOT* present. + */ +- if (!boot_cpu_has(feature) == !(a->cpuid & ALTINSTR_FLAG_INV)) { ++ if ((a->cpuid < NCAPINTS && (!boot_cpu_has(feature) == !(a->cpuid & ALTINSTR_FLAG_INV))) ++ || (a->cpuid > NCAPINTS && (!boot_cpu_has_bug(feature) == !(a->cpuid & ALTINSTR_FLAG_INV)))) { + optimize_nops_inplace(instr, a->instrlen); + continue; + } --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -678,7 +678,7 @@ static const char *table_lookup_model(st diff --git a/patches.suse/RAS-Avoid-build-errors-when-CONFIG_DEBUG_FS-n.patch b/patches.suse/RAS-Avoid-build-errors-when-CONFIG_DEBUG_FS-n.patch new file mode 100644 index 0000000..c15e51e --- /dev/null +++ b/patches.suse/RAS-Avoid-build-errors-when-CONFIG_DEBUG_FS-n.patch @@ -0,0 +1,48 @@ +From: Yazen Ghannam +Date: Tue, 26 Mar 2024 20:32:52 +0000 +Subject: RAS: Avoid build errors when CONFIG_DEBUG_FS=n +Git-commit: a6b227d70d2ad9eb08adc3fe532ebb7ec88ac897 +Patch-mainline: v6.9-rc2 +References: git-fixes + +A new helper was introduced for RAS modules to be able to get the RAS +subsystem debugfs root directory. The helper is defined in debugfs.c +which is only built when CONFIG_DEBUG_FS=y. + +However, it's possible that the modules would include debugfs support +for optional functionality. One current example is the fmpm module. In +this case, a build error will occur when CONFIG_RAS_FMPM is selected and +CONFIG_DEBUG_FS=n. + +Add an inline helper function stub for the CONFIG_DEBUG_FS=n case as the +fmpm module can function without the debugfs functionality too. + +Fixes: 9d2b6fa09d15 ("RAS: Export helper to get ras_debugfs_dir") +Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218640 +Reported-by: anthony s. knowles +Signed-off-by: Yazen Ghannam +Signed-off-by: Borislav Petkov (AMD) +Tested-by: anthony s. knowles +Link: https://lore.kernel.org/r/20240325183755.776-1-bp@alien8.de + +Acked-by: Nikolay Borisov +--- + drivers/ras/debugfs.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/ras/debugfs.h b/drivers/ras/debugfs.h +index 4749ccdeeba1..5a2f48439258 100644 +--- a/drivers/ras/debugfs.h ++++ b/drivers/ras/debugfs.h +@@ -4,6 +4,10 @@ + + #include + ++#if IS_ENABLED(CONFIG_DEBUG_FS) + struct dentry *ras_get_debugfs_root(void); ++#else ++static inline struct dentry *ras_get_debugfs_root(void) { return NULL; } ++#endif /* DEBUG_FS */ + + #endif /* __RAS_DEBUGFS_H__ */ + diff --git a/patches.suse/tty-n_gsm-require-CAP_NET_ADMIN-to-attach-N_GSM0710-.patch b/patches.suse/tty-n_gsm-require-CAP_NET_ADMIN-to-attach-N_GSM0710-.patch new file mode 100644 index 0000000..453b5cd --- /dev/null +++ b/patches.suse/tty-n_gsm-require-CAP_NET_ADMIN-to-attach-N_GSM0710-.patch @@ -0,0 +1,32 @@ +From: Thadeu Lima de Souza Cascardo +Date: Mon, 31 Jul 2023 15:59:42 -0300 +Subject: tty: n_gsm: require CAP_NET_ADMIN to attach N_GSM0710 ldisc +Git-commit: 67c37756898a5a6b2941a13ae7260c89b54e0d88 +Patch-mainline: 6.6-rc1 +References: bsc#1222619 + +Any unprivileged user can attach N_GSM0710 ldisc, but it requires +CAP_NET_ADMIN to create a GSM network anyway. + +Require initial namespace CAP_NET_ADMIN to do that. + +Signed-off-by: Thadeu Lima de Souza Cascardo +Link: https://lore.kernel.org/r/20230731185942.279611-1-cascardo@canonical.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Jiri Slaby +--- + drivers/tty/n_gsm.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/drivers/tty/n_gsm.c ++++ b/drivers/tty/n_gsm.c +@@ -2933,6 +2933,9 @@ static int gsmld_open(struct tty_struct + { + struct gsm_mux *gsm; + ++ if (!capable(CAP_NET_ADMIN)) ++ return -EPERM; ++ + if (tty->ops->write == NULL) + return -EINVAL; + diff --git a/series.conf b/series.conf index feda2b7..eb835ba 100644 --- a/series.conf +++ b/series.conf @@ -43712,6 +43712,7 @@ patches.suse/USB-serial-option-add-FOXCONN-T99W368-T99W373-produc.patch patches.suse/serial-sprd-Assign-sprd_port-after-initialized-to-av.patch patches.suse/serial-sprd-Fix-DMA-buffer-leak-issue.patch + patches.suse/tty-n_gsm-require-CAP_NET_ADMIN-to-attach-N_GSM0710-.patch patches.suse/serial-tegra-handle-clk-prepare-error-in-tegra_uart_.patch patches.suse/serial-sc16is7xx-fix-broken-port-0-uart-init.patch patches.suse/serial-sc16is7xx-fix-bug-when-first-setting-GPIO-dir.patch @@ -46016,6 +46017,7 @@ patches.suse/usb-typec-Return-size-of-buffer-if-pd_set-operation-.patch patches.suse/usb-typec-ucsi-Clear-EVENT_PENDING-under-PPM-lock.patch patches.suse/usb-typec-ucsi-Check-for-notifications-after-init.patch + patches.suse/RAS-Avoid-build-errors-when-CONFIG_DEBUG_FS-n.patch patches.suse/vboxsf-Avoid-an-spurious-warning-if-load_nls_xxx-fai.patch patches.suse/msft-hv-2971-net-mana-Fix-Rx-DMA-datasize-and-skb_over_panic.patch patches.suse/drm-panfrost-fix-power-transition-timeout-warnings.patch