CHROMIUM: Merge 'v6.1.118' into chromeos-6.1
Merge of v6.1.118 into chromeos-6.1
Conflicts:
drivers/gpu/drm/amd/amdkfd/kfd_device.c
net/bluetooth/hci_core.c
net/bluetooth/hci_sync.c
Changelog:
----------------------------------------------------------------
Alessandro Zanni (1):
fs: Fix uninitialized value issue in from_kuid and from_kgid
Andrii Nakryiko (1):
uprobes: encapsulate preparation of uprobe args buffer
Divya Chauhan (1):
Merge remote-tracking branch 'cros/stable-merge/linux/v6.1.118' into merge/chromeos-6.1-v6.1.118
Greg Joyce (1):
nvme: disable CC.CRIME (NVME_CC_CRIME)
Greg Kroah-Hartman (6):
Revert "Bluetooth: fix use-after-free in accessing skb after sending it"
Revert "Bluetooth: hci_sync: Fix overwriting request callback"
Revert "Bluetooth: af_bluetooth: Fix deadlock"
Revert "Bluetooth: hci_core: Fix possible buffer overflow"
Revert "Bluetooth: hci_conn: Consolidate code for aborting connections"
Linux 6.1.118
Hagar Hemdan (1):
io_uring: fix possible deadlock in io_register_iowq_max_workers()
Hannes Reinecke (1):
nvme: tcp: avoid race between queue_lock lock and destroy
Hans de Goede (2):
HID: lenovo: Add support for Thinkpad X1 Tablet Gen 3 keyboard
platform/x86: x86-android-tablets: Fix use after free on platform_device_register() errors
Herbert Xu (2):
crypto: api - Fix liveliness check in crypto_alg_tested
crypto: marvell/cesa - Disable hash algorithms
Ian Forbes (1):
drm/vmwgfx: Limit display layout ioctl array size to VMWGFX_NUM_DISPLAY_UNITS
Jiawei Ye (1):
bpf: Fix mismatched RCU unlock flavour in bpf_out_neigh_v6
Julian Vetter (1):
sound: Make CONFIG_SND depend on INDIRECT_IOMEM instead of UML
Keith Busch (1):
nvme-multipath: defer partition scanning
Kenneth Albanowski (1):
HID: multitouch: Add quirk for Logitech Bolt receiver w/ Casa touchpad
Konstantin Komarov (1):
fs/ntfs3: Fix general protection fault in run_is_mapped_full
Li Nan (1):
md/raid10: improve code of mrdev in raid10_sync_request
Linus Torvalds (1):
9p: fix slab cache name creation for real
Luiz Augusto von Dentz (1):
Bluetooth: L2CAP: Fix uaf in l2cap_connect
Michael Ellerman (1):
powerpc/powernv: Free name on error in opal_event_init()
Nilay Shroff (1):
nvme: make keep-alive synchronous operation
Pedro Falcato (1):
9p: Avoid creating multiple slab caches with the same name
Philip Yang (1):
drm/amdkfd: amdkfd_free_gtt_mem clear the correct pointer
Qiao Ma (1):
uprobe: avoid out-of-bounds memory access of fetching args
Qun-Wei Lin (1):
mm: krealloc: Fix MTE false alarm in __do_krealloc
Reinhard Speyerer (1):
net: usb: qmi_wwan: add Fibocom FG132 0x0112 composition
Rik van Riel (1):
bpf: use kvzmalloc to allocate BPF verifier environment
Sergey Matsievskiy (1):
irqchip/ocelot: Fix trigger register address
Stefan Blum (1):
HID: multitouch: Add support for B2402FVA track point
SurajSonawane2415 (1):
block: Fix elevator_get_default() checking for NULL q->tag_set
WangYuli (1):
HID: multitouch: Add quirk for HONOR MagicBook Art 14 touchpad
Xiaxi Shen (1):
ext4: fix timer use-after-free on failed mount
Yanteng Si (1):
LoongArch: Use "Exception return address" to comment ERA
Yuan Can (1):
vDPA/ifcvf: Fix pci_read_config_byte() return code handling
Makefile | 2 +-
arch/loongarch/include/asm/loongarch.h | 2 +-
arch/powerpc/platforms/powernv/opal-irqchip.c | 1 +
block/elevator.c | 4 +-
crypto/algapi.c | 2 +-
drivers/crypto/marvell/cesa/hash.c | 12 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 14 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 2 +-
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 2 +-
drivers/gpu/drm/amd/amdkfd/kfd_device.c | 4 +-
.../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 2 +-
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 2 +-
drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2 +-
.../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 4 +-
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 4 +-
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 4 +-
drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 3 -
drivers/hid/hid-ids.h | 1 +
drivers/hid/hid-lenovo.c | 8 ++
drivers/hid/hid-multitouch.c | 13 ++
drivers/irqchip/irq-mscc-ocelot.c | 4 +-
drivers/md/raid10.c | 23 +--
drivers/net/usb/qmi_wwan.c | 1 +
drivers/nvme/host/core.c | 31 ++---
drivers/nvme/host/multipath.c | 33 +++++
drivers/nvme/host/nvme.h | 1 +
drivers/nvme/host/tcp.c | 7 +-
drivers/platform/x86/x86-android-tablets.c | 3 +-
drivers/vdpa/ifcvf/ifcvf_base.c | 2 +-
fs/ext4/super.c | 2 +-
fs/ntfs3/inode.c | 9 ++
fs/ocfs2/file.c | 9 +-
include/net/bluetooth/hci_core.h | 3 +-
io_uring/io_uring.c | 5 +
kernel/bpf/verifier.c | 4 +-
kernel/trace/trace_uprobe.c | 86 ++++++------
mm/slab_common.c | 2 +-
net/9p/client.c | 12 +-
net/bluetooth/af_bluetooth.c | 10 +-
net/bluetooth/hci_conn.c | 154 +++++++++++++++++----
net/bluetooth/hci_core.c | 50 +++----
net/bluetooth/hci_event.c | 20 +--
net/bluetooth/hci_sync.c | 40 ++----
net/bluetooth/l2cap_core.c | 9 --
net/bluetooth/mgmt.c | 15 +-
net/core/filter.c | 2 +-
sound/Kconfig | 2 +-
47 files changed, 392 insertions(+), 235 deletions(-)
BUG=b:379520362
TEST=Build and test on various affected systems
Change-Id: I4325b64b3b81d7977d35802bd198c19a5cbaff9b
Disallow-Recycled-Builds: test-failures
Signed-off-by: Divya Chauhan <chauhandivya@google.com>
