Skip to content

Commit 8b2451f

Browse files
khusikakhusika
committed
Merge tag 'v6.1.144' into orange-pi-6.1-rk35xx
This is the 6.1.144 stable release * tag 'v6.1.144' of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux: Linux 6.1.144 x86/process: Move the buffer clearing before MONITOR KVM: SVM: Advertise TSA CPUID bits to guests x86/bugs: Add a Transient Scheduler Attacks mitigation x86/bugs: Rename MDS machinery to something more generic usb: typec: displayport: Fix potential deadlock platform/x86: think-lmi: Fix kobject cleanup platform/x86: think-lmi: Create ksets consecutively Logitech C-270 even more broken i2c/designware: Fix an initialization issue dma-buf: fix timeout handling in dma_resv_wait_timeout v2 usb: cdnsp: do not disable slot for disabled slot xhci: Disable stream for xHC controller with XHCI_BROKEN_STREAMS xhci: dbc: Flush queued requests before stopping dbc xhci: dbctty: disable ECHO flag by default net: usb: lan78xx: fix WARN in __netif_napi_del_locked on disconnect platform/x86: dell-wmi-sysman: Fix class device unregistration platform/x86: think-lmi: Fix class device unregistration dpaa2-eth: fix xdp_rxq_info leak btrfs: use btrfs_record_snapshot_destroy() during rmdir NFSv4/flexfiles: Fix handling of NFS level errors in I/O drm/v3d: Disable interrupts before resetting the GPU virtio-net: ensure the received length does not exceed allocated size rcu: Return early if callback is not specified mtd: spinand: fix memory leak of ECC engine conf ACPICA: Refuse to evaluate a method if arguments are missing wifi: ath6kl: remove WARN on bad firmware input wifi: mac80211: drop invalid source address OCB frames aoe: defer rexmit timer downdev work to workqueue scsi: target: Fix NULL pointer dereference in core_scsi3_decode_spec_i_port() ASoC: amd: yc: update quirk data for HP Victus powerpc: Fix struct termio related ioctl macros ata: pata_cs5536: fix build on 32-bit UML ata: libata-acpi: Do not assume 40 wire cable if no devices are enabled ALSA: sb: Force to disable DMAs once when DMA mode is changed ALSA: sb: Don't allow changing the DMA mode during operations drm/msm: Fix another leak in the submit error path drm/msm: Fix a fence leak in submit error path smb: client: fix race condition in negotiate timeout by using more precise timing net/sched: Always pass notifications when child class becomes empty nui: Fix dma_mapping_error() check rose: fix dangling neighbour pointers in rose_rt_device_down() enic: fix incorrect MTU comparison in enic_change_mtu() amd-xgbe: align CL37 AN sequence as per databook lib: test_objagg: Set error message in check_expect_hints_stats() igc: disable L1.2 PCI-E link substate to avoid performance issue drm/i915/gsc: mei interrupt top half should be in irq disabled context drm/i915/gt: Fix timeline left held on VMA alloc error platform/mellanox: mlxreg-lc: Fix logic error in power state check platform/x86: dell-wmi-sysman: Fix WMI data block retrieval in sysfs callbacks drm/i915/selftests: Change mock_request() to return error pointers spi: spi-fsl-dspi: Clear completion counter before initiating transfer drm/exynos: fimd: Guard display clock control with runtime PM calls ethernet: atl1: Add missing DMA mapping error checks and count errors btrfs: fix iteration of extrefs during log replay btrfs: fix missing error handling when searching for inode refs during log replay Bluetooth: Prevent unintended pause by checking if advertising is active platform/mellanox: nvsw-sn2201: Fix bus number in adapter error message RDMA/mlx5: Fix CC counters query for MPV scsi: ufs: core: Fix spelling of a sysfs attribute name scsi: qla4xxx: Fix missing DMA mapping error in qla4xxx_alloc_pdu() scsi: qla2xxx: Fix DMA mapping test in qla24xx_get_port_database() NFSv4/pNFS: Fix a race to wake on NFS_LAYOUT_DRAIN nfs: Clean up /proc/net/rpc/nfs when nfs_fs_proc_net_init() fails. RDMA/mlx5: Initialize obj_event->obj_sub_list before xa_insert platform/mellanox: mlxbf-tmfifo: fix vring_desc.len assignment arm64: dts: apple: t8103: Fix PCIe BCM4377 nodename mtk-sd: reset host->mrq on prepare_data() error mtk-sd: Prevent memory corruption from DMA map failure mtk-sd: Fix a pagefault in dma_unmap_sg() for not prepared data usb: typec: altmodes/displayport: do not index invalid pin_assignments regulator: gpio: Fix the out-of-bounds access to drvdata::gpiods Bluetooth: MGMT: mesh_send: check instances prior disabling advertising Bluetooth: MGMT: set_mesh: update LE scan interval and window Bluetooth: hci_sync: revert some mesh modifications mmc: core: sd: Apply BROKEN_SD_DISCARD quirk earlier Revert "mmc: sdhci: Disable SD card clock before changing parameters" mmc: sdhci: Add a helper function for dump register in dynamic debug mode vsock/vmci: Clear the vmci transport packet properly when initializing it s390/pci: Do not try re-enabling load/store if device is disabled rtc: cmos: use spin_lock_irqsave in cmos_interrupt Signed-off-by: Khusika Dhamar Gusti <[email protected]>
2 parents 7a6695f + dfc486e commit 8b2451f

File tree

105 files changed

+970
-303
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+970
-303
lines changed

‎Documentation/ABI/testing/sysfs-devices-system-cpu

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -526,6 +526,7 @@ What: /sys/devices/system/cpu/vulnerabilities
526526
/sys/devices/system/cpu/vulnerabilities/spectre_v1
527527
/sys/devices/system/cpu/vulnerabilities/spectre_v2
528528
/sys/devices/system/cpu/vulnerabilities/srbds
529+
/sys/devices/system/cpu/vulnerabilities/tsa
529530
/sys/devices/system/cpu/vulnerabilities/tsx_async_abort
530531
Date: January 2018
531532
Contact: Linux kernel mailing list <[email protected]>

‎Documentation/ABI/testing/sysfs-driver-ufs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,7 @@ Description: This file shows the thin provisioning type. This is one of
711711

712712
The file is read only.
713713

714-
What: /sys/class/scsi_device/*/device/unit_descriptor/physical_memory_resourse_count
714+
What: /sys/class/scsi_device/*/device/unit_descriptor/physical_memory_resource_count
715715
Date: February 2018
716716
Contact: Stanislav Nijnikov <[email protected]>
717717
Description: This file shows the total physical memory resources. This is

‎Documentation/admin-guide/hw-vuln/processor_mmio_stale_data.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,7 @@ This is achieved by using the otherwise unused and obsolete VERW instruction in
157157
combination with a microcode update. The microcode clears the affected CPU
158158
buffers when the VERW instruction is executed.
159159

160-
Kernel reuses the MDS function to invoke the buffer clearing:
161-
162-
mds_clear_cpu_buffers()
160+
Kernel does the buffer clearing with x86_clear_cpu_buffers().
163161

164162
On MDS affected CPUs, the kernel already invokes CPU buffer clear on
165163
kernel/userspace, hypervisor/guest and C-state (idle) transitions. No

‎Documentation/admin-guide/kernel-parameters.txt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6400,6 +6400,19 @@
64006400
If not specified, "default" is used. In this case,
64016401
the RNG's choice is left to each individual trust source.
64026402

6403+
tsa= [X86] Control mitigation for Transient Scheduler
6404+
Attacks on AMD CPUs. Search the following in your
6405+
favourite search engine for more details:
6406+
6407+
"Technical guidance for mitigating transient scheduler
6408+
attacks".
6409+
6410+
off - disable the mitigation
6411+
on - enable the mitigation (default)
6412+
user - mitigate only user/kernel transitions
6413+
vm - mitigate only guest/host transitions
6414+
6415+
64036416
tsc= Disable clocksource stability checks for TSC.
64046417
Format: <string>
64056418
[x86] reliable: mark tsc clocksource as reliable, this

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 6
33
PATCHLEVEL = 1
4-
SUBLEVEL = 143
4+
SUBLEVEL = 144
55
EXTRAVERSION =
66
NAME = Curry Ramen
77

‎arch/arm64/boot/dts/apple/t8103-jxxx.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
*/
7171
&port00 {
7272
bus-range = <1 1>;
73-
wifi0: network@0,0 {
73+
wifi0: wifi@0,0 {
7474
compatible = "pci14e4,4425";
7575
reg = <0x10000 0x0 0x0 0x0 0x0>;
7676
/* To be filled by the loader */

‎arch/powerpc/include/uapi/asm/ioctls.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
#define TCSETSW _IOW('t', 21, struct termios)
2424
#define TCSETSF _IOW('t', 22, struct termios)
2525

26-
#define TCGETA _IOR('t', 23, struct termio)
27-
#define TCSETA _IOW('t', 24, struct termio)
28-
#define TCSETAW _IOW('t', 25, struct termio)
29-
#define TCSETAF _IOW('t', 28, struct termio)
26+
#define TCGETA 0x40147417 /* _IOR('t', 23, struct termio) */
27+
#define TCSETA 0x80147418 /* _IOW('t', 24, struct termio) */
28+
#define TCSETAW 0x80147419 /* _IOW('t', 25, struct termio) */
29+
#define TCSETAF 0x8014741c /* _IOW('t', 28, struct termio) */
3030

3131
#define TCSBRK _IO('t', 29)
3232
#define TCXONC _IO('t', 30)

‎arch/s390/pci/pci_event.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@ static pci_ers_result_t zpci_event_do_error_state_clear(struct pci_dev *pdev,
9898
struct zpci_dev *zdev = to_zpci(pdev);
9999
int rc;
100100

101+
/* The underlying device may have been disabled by the event */
102+
if (!zdev_enabled(zdev))
103+
return PCI_ERS_RESULT_NEED_RESET;
104+
101105
pr_info("%s: Unblocking device access for examination\n", pci_name(pdev));
102106
rc = zpci_reset_load_store_blocked(zdev);
103107
if (rc) {

‎arch/x86/Kconfig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2586,6 +2586,15 @@ config MITIGATION_ITS
25862586
disabled, mitigation cannot be enabled via cmdline.
25872587
See <file:Documentation/admin-guide/hw-vuln/indirect-target-selection.rst>
25882588

2589+
config MITIGATION_TSA
2590+
bool "Mitigate Transient Scheduler Attacks"
2591+
depends on CPU_SUP_AMD
2592+
default y
2593+
help
2594+
Enable mitigation for Transient Scheduler Attacks. TSA is a hardware
2595+
security vulnerability on AMD CPUs which can lead to forwarding of
2596+
invalid info to subsequent instructions and thus can affect their
2597+
timing and thereby cause a leakage.
25892598
endif
25902599

25912600
config ARCH_HAS_ADD_PAGES

‎arch/x86/entry/entry.S

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,20 @@ EXPORT_SYMBOL_GPL(entry_ibpb);
3131

3232
/*
3333
* Define the VERW operand that is disguised as entry code so that
34-
* it can be referenced with KPTI enabled. This ensure VERW can be
34+
* it can be referenced with KPTI enabled. This ensures VERW can be
3535
* used late in exit-to-user path after page tables are switched.
3636
*/
3737
.pushsection .entry.text, "ax"
3838

3939
.align L1_CACHE_BYTES, 0xcc
40-
SYM_CODE_START_NOALIGN(mds_verw_sel)
40+
SYM_CODE_START_NOALIGN(x86_verw_sel)
4141
UNWIND_HINT_EMPTY
4242
ANNOTATE_NOENDBR
4343
.word __KERNEL_DS
4444
.align L1_CACHE_BYTES, 0xcc
45-
SYM_CODE_END(mds_verw_sel);
45+
SYM_CODE_END(x86_verw_sel);
4646
/* For KVM */
47-
EXPORT_SYMBOL_GPL(mds_verw_sel);
47+
EXPORT_SYMBOL_GPL(x86_verw_sel);
4848

4949
.popsection
5050

0 commit comments

Comments
 (0)