Skip to content

Commit f8d6b30

Browse files
khusikakhusika
committed
Merge tag 'v6.1.118' into orange-pi-6.1-rk35xx
This is the 6.1.118 stable release * tag 'v6.1.118' of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux: Linux 6.1.118 9p: fix slab cache name creation for real fs/ntfs3: Fix general protection fault in run_is_mapped_full platform/x86: x86-android-tablets: Fix use after free on platform_device_register() errors mm: krealloc: Fix MTE false alarm in __do_krealloc Bluetooth: L2CAP: Fix uaf in l2cap_connect ext4: fix timer use-after-free on failed mount drm/amdkfd: amdkfd_free_gtt_mem clear the correct pointer uprobe: avoid out-of-bounds memory access of fetching args uprobes: encapsulate preparation of uprobe args buffer io_uring: fix possible deadlock in io_register_iowq_max_workers() md/raid10: improve code of mrdev in raid10_sync_request net: usb: qmi_wwan: add Fibocom FG132 0x0112 composition LoongArch: Use "Exception return address" to comment ERA HID: lenovo: Add support for Thinkpad X1 Tablet Gen 3 keyboard HID: multitouch: Add quirk for Logitech Bolt receiver w/ Casa touchpad fs: Fix uninitialized value issue in from_kuid and from_kgid bpf: Fix mismatched RCU unlock flavour in bpf_out_neigh_v6 vDPA/ifcvf: Fix pci_read_config_byte() return code handling nvme: make keep-alive synchronous operation powerpc/powernv: Free name on error in opal_event_init() nvme-multipath: defer partition scanning drm/vmwgfx: Limit display layout ioctl array size to VMWGFX_NUM_DISPLAY_UNITS sound: Make CONFIG_SND depend on INDIRECT_IOMEM instead of UML crypto: marvell/cesa - Disable hash algorithms crypto: api - Fix liveliness check in crypto_alg_tested bpf: use kvzmalloc to allocate BPF verifier environment nvme: disable CC.CRIME (NVME_CC_CRIME) HID: multitouch: Add quirk for HONOR MagicBook Art 14 touchpad HID: multitouch: Add support for B2402FVA track point block: Fix elevator_get_default() checking for NULL q->tag_set nvme: tcp: avoid race between queue_lock lock and destroy irqchip/ocelot: Fix trigger register address 9p: Avoid creating multiple slab caches with the same name Revert "Bluetooth: hci_conn: Consolidate code for aborting connections" Revert "Bluetooth: hci_core: Fix possible buffer overflow" Revert "Bluetooth: af_bluetooth: Fix deadlock" Revert "Bluetooth: hci_sync: Fix overwriting request callback" Revert "Bluetooth: fix use-after-free in accessing skb after sending it" Signed-off-by: Khusika Dhamar Gusti <[email protected]>
2 parents cbfb477 + b67dc5c commit f8d6b30

Some content is hidden

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

47 files changed

+393
-238
lines changed

‎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 = 117
4+
SUBLEVEL = 118
55
EXTRAVERSION =
66
NAME = Curry Ramen
77

‎arch/loongarch/include/asm/loongarch.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ static __always_inline void iocsr_write64(u64 val, u32 reg)
325325
#define CSR_ESTAT_IS_WIDTH 15
326326
#define CSR_ESTAT_IS (_ULCAST_(0x7fff) << CSR_ESTAT_IS_SHIFT)
327327

328-
#define LOONGARCH_CSR_ERA 0x6 /* ERA */
328+
#define LOONGARCH_CSR_ERA 0x6 /* Exception return address */
329329

330330
#define LOONGARCH_CSR_BADV 0x7 /* Bad virtual address */
331331

‎arch/powerpc/platforms/powernv/opal-irqchip.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,7 @@ int __init opal_event_init(void)
282282
name, NULL);
283283
if (rc) {
284284
pr_warn("Error %d requesting OPAL irq %d\n", rc, (int)r->start);
285+
kfree(name);
285286
continue;
286287
}
287288
}

‎block/elevator.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ static int elevator_switch_mq(struct request_queue *q,
624624
static inline bool elv_support_iosched(struct request_queue *q)
625625
{
626626
if (!queue_is_mq(q) ||
627-
(q->tag_set && (q->tag_set->flags & BLK_MQ_F_NO_SCHED)))
627+
(q->tag_set->flags & BLK_MQ_F_NO_SCHED))
628628
return false;
629629
return true;
630630
}
@@ -635,7 +635,7 @@ static inline bool elv_support_iosched(struct request_queue *q)
635635
*/
636636
static struct elevator_type *elevator_get_default(struct request_queue *q)
637637
{
638-
if (q->tag_set && q->tag_set->flags & BLK_MQ_F_NO_SCHED_BY_DEFAULT)
638+
if (q->tag_set->flags & BLK_MQ_F_NO_SCHED_BY_DEFAULT)
639639
return NULL;
640640

641641
if (q->nr_hw_queues != 1 &&

‎crypto/algapi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ void crypto_alg_tested(const char *name, int err)
341341
q->cra_flags |= CRYPTO_ALG_DEAD;
342342
alg = test->adult;
343343

344-
if (list_empty(&alg->cra_list))
344+
if (crypto_is_dead(alg))
345345
goto complete;
346346

347347
if (err == -ECANCELED)

‎drivers/crypto/marvell/cesa/hash.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -947,7 +947,7 @@ struct ahash_alg mv_md5_alg = {
947947
.base = {
948948
.cra_name = "md5",
949949
.cra_driver_name = "mv-md5",
950-
.cra_priority = 300,
950+
.cra_priority = 0,
951951
.cra_flags = CRYPTO_ALG_ASYNC |
952952
CRYPTO_ALG_ALLOCATES_MEMORY |
953953
CRYPTO_ALG_KERN_DRIVER_ONLY,
@@ -1018,7 +1018,7 @@ struct ahash_alg mv_sha1_alg = {
10181018
.base = {
10191019
.cra_name = "sha1",
10201020
.cra_driver_name = "mv-sha1",
1021-
.cra_priority = 300,
1021+
.cra_priority = 0,
10221022
.cra_flags = CRYPTO_ALG_ASYNC |
10231023
CRYPTO_ALG_ALLOCATES_MEMORY |
10241024
CRYPTO_ALG_KERN_DRIVER_ONLY,
@@ -1092,7 +1092,7 @@ struct ahash_alg mv_sha256_alg = {
10921092
.base = {
10931093
.cra_name = "sha256",
10941094
.cra_driver_name = "mv-sha256",
1095-
.cra_priority = 300,
1095+
.cra_priority = 0,
10961096
.cra_flags = CRYPTO_ALG_ASYNC |
10971097
CRYPTO_ALG_ALLOCATES_MEMORY |
10981098
CRYPTO_ALG_KERN_DRIVER_ONLY,
@@ -1327,7 +1327,7 @@ struct ahash_alg mv_ahmac_md5_alg = {
13271327
.base = {
13281328
.cra_name = "hmac(md5)",
13291329
.cra_driver_name = "mv-hmac-md5",
1330-
.cra_priority = 300,
1330+
.cra_priority = 0,
13311331
.cra_flags = CRYPTO_ALG_ASYNC |
13321332
CRYPTO_ALG_ALLOCATES_MEMORY |
13331333
CRYPTO_ALG_KERN_DRIVER_ONLY,
@@ -1398,7 +1398,7 @@ struct ahash_alg mv_ahmac_sha1_alg = {
13981398
.base = {
13991399
.cra_name = "hmac(sha1)",
14001400
.cra_driver_name = "mv-hmac-sha1",
1401-
.cra_priority = 300,
1401+
.cra_priority = 0,
14021402
.cra_flags = CRYPTO_ALG_ASYNC |
14031403
CRYPTO_ALG_ALLOCATES_MEMORY |
14041404
CRYPTO_ALG_KERN_DRIVER_ONLY,
@@ -1469,7 +1469,7 @@ struct ahash_alg mv_ahmac_sha256_alg = {
14691469
.base = {
14701470
.cra_name = "hmac(sha256)",
14711471
.cra_driver_name = "mv-hmac-sha256",
1472-
.cra_priority = 300,
1472+
.cra_priority = 0,
14731473
.cra_flags = CRYPTO_ALG_ASYNC |
14741474
CRYPTO_ALG_ALLOCATES_MEMORY |
14751475
CRYPTO_ALG_KERN_DRIVER_ONLY,

‎drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -344,15 +344,15 @@ int amdgpu_amdkfd_alloc_gtt_mem(struct amdgpu_device *adev, size_t size,
344344
return r;
345345
}
346346

347-
void amdgpu_amdkfd_free_gtt_mem(struct amdgpu_device *adev, void *mem_obj)
347+
void amdgpu_amdkfd_free_gtt_mem(struct amdgpu_device *adev, void **mem_obj)
348348
{
349-
struct amdgpu_bo *bo = (struct amdgpu_bo *) mem_obj;
349+
struct amdgpu_bo **bo = (struct amdgpu_bo **) mem_obj;
350350

351-
amdgpu_bo_reserve(bo, true);
352-
amdgpu_bo_kunmap(bo);
353-
amdgpu_bo_unpin(bo);
354-
amdgpu_bo_unreserve(bo);
355-
amdgpu_bo_unref(&(bo));
351+
amdgpu_bo_reserve(*bo, true);
352+
amdgpu_bo_kunmap(*bo);
353+
amdgpu_bo_unpin(*bo);
354+
amdgpu_bo_unreserve(*bo);
355+
amdgpu_bo_unref(bo);
356356
}
357357

358358
int amdgpu_amdkfd_alloc_gws(struct amdgpu_device *adev, size_t size,

‎drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ int amdgpu_amdkfd_evict_userptr(struct kgd_mem *mem, struct mm_struct *mm)
210210
int amdgpu_amdkfd_alloc_gtt_mem(struct amdgpu_device *adev, size_t size,
211211
void **mem_obj, uint64_t *gpu_addr,
212212
void **cpu_ptr, bool mqd_gfx9);
213-
void amdgpu_amdkfd_free_gtt_mem(struct amdgpu_device *adev, void *mem_obj);
213+
void amdgpu_amdkfd_free_gtt_mem(struct amdgpu_device *adev, void **mem_obj);
214214
int amdgpu_amdkfd_alloc_gws(struct amdgpu_device *adev, size_t size,
215215
void **mem_obj);
216216
void amdgpu_amdkfd_free_gws(struct amdgpu_device *adev, void *mem_obj);

‎drivers/gpu/drm/amd/amdkfd/kfd_chardev.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ static int kfd_ioctl_create_queue(struct file *filep, struct kfd_process *p,
408408

409409
err_create_queue:
410410
if (wptr_bo)
411-
amdgpu_amdkfd_free_gtt_mem(dev->adev, wptr_bo);
411+
amdgpu_amdkfd_free_gtt_mem(dev->adev, (void **)&wptr_bo);
412412
err_wptr_map_gart:
413413
err_alloc_doorbells:
414414
err_bind_process:

‎drivers/gpu/drm/amd/amdkfd/kfd_device.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd,
673673
kfd_doorbell_error:
674674
kfd_gtt_sa_fini(kfd);
675675
kfd_gtt_sa_init_error:
676-
amdgpu_amdkfd_free_gtt_mem(kfd->adev, kfd->gtt_mem);
676+
amdgpu_amdkfd_free_gtt_mem(kfd->adev, &kfd->gtt_mem);
677677
alloc_gtt_mem_failure:
678678
if (kfd->gws)
679679
amdgpu_amdkfd_free_gws(kfd->adev, kfd->gws);
@@ -693,7 +693,7 @@ void kgd2kfd_device_exit(struct kfd_dev *kfd)
693693
kfd_doorbell_fini(kfd);
694694
ida_destroy(&kfd->doorbell_ida);
695695
kfd_gtt_sa_fini(kfd);
696-
amdgpu_amdkfd_free_gtt_mem(kfd->adev, kfd->gtt_mem);
696+
amdgpu_amdkfd_free_gtt_mem(kfd->adev, &kfd->gtt_mem);
697697
if (kfd->gws)
698698
amdgpu_amdkfd_free_gws(kfd->adev, kfd->gws);
699699
}

0 commit comments

Comments
 (0)