6.18.52-rc1 review
Greg Kroah-Hartman
maintainerPATCH 491/1518 ACPI: EC: Avoid _REG disconnect on GPIO IRQ defer
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhu Ling <[email protected]>
[ Upstream commit e71bdbce27dcaa7f467a3a198cbe723924f05569 ]
EC event delivery uses either a GPE or, on ACPI reduced hardware platforms, a GpioInt resource. The GPE path does not have a provider lookup that can defer, but acpi_dev_gpio_irq_get() can return -EPROBE_DEFER for the GpioInt path.
ec_install_handlers() currently installs the EC address space handler and executes _REG before looking up the GPIO IRQ. If the GPIO lookup then defers, acpi_ec_setup() tears the handlers down again. Removing the EC address space handler causes ACPICA to execute _REG for disconnect, so firmware may observe an EC OpRegion connected -> disconnected transition during one failed probe attempt.
This is observable when the namespace EC reuses a boot EC that has already installed the EC address space handler. A deferred namespace EC probe can disconnect the already usable boot EC OpRegion until a later reprobe connects it again. AML that gates EC field accesses on _REG state can then return fallback values to other drivers during that window.
Prepare the GPIOInt IRQ before publishing EC OpRegion availability to AML. This leaves the GPE path unchanged, keeps non-deferred GPIO lookup errors non-fatal as before, and still lets the existing acpi_ec_setup() error path clean up real handler installation failures.
--- drivers/acpi/ec.c | 40 ++++++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 14 deletions(-)
drivers/acpi/ec.c +26 -14
@@ -1512,6 +1512,24 @@ static bool install_gpio_irq_event_handler(struct acpi_ec *ec) IRQF_SHARED | IRQF_ONESHOT, "ACPI EC", ec) >= 0; } +static int ec_prepare_gpio_irq (struct acpi_ec *ec,struct acpi_device *device) +{ +int irq; + +if (!device || ec->gpe >=0 || ec->irq >=0 ) +return 0 ; + +/* ACPI reduced hardware platforms use a GpioInt from _CRS. */ + irq =acpi_dev_gpio_irq_get (device,0 ); +if (irq == -EPROBE_DEFER ) +return irq; + +if (irq >=0 ) + ec->irq = irq; + +return 0 ; +} +/** * ec_install_handlers - Install service callbacks and register query methods. * @ec: Target EC.
@@ -1526,7 +1544,6 @@ static bool install_gpio_irq_event_handler(struct acpi_ec *ec)* Return: * -ENODEV if the address space handler cannot be installed, which means * "unable to handle transactions", -* -EPROBE_DEFER if GPIO IRQ acquisition needs to be deferred, * or 0 (success) otherwise. */ static int ec_install_handlers(struct acpi_ec *ec, struct acpi_device *device,
@@ -1559,19 +1576,6 @@ static int ec_install_handlers(struct acpi_ec *ec, struct acpi_device *device,if (!device)return 0 ; -if (ec->gpe <0 ) { -/* ACPI reduced hardware platforms use a GpioInt from _CRS. */ -int irq =acpi_dev_gpio_irq_get (device,0 ); -/* -* Bail out right away for deferred probing or complete the -* initialization regardless of any other errors. -*/ -if (irq == -EPROBE_DEFER ) -return -EPROBE_DEFER ; -else if (irq >=0 ) - ec->irq = irq; - } -if (!test_bit (EC_FLAGS_QUERY_METHODS_INSTALLED , &ec->flags)) {/* Find and register all query methods */ acpi_walk_namespace(ACPI_TYPE_METHOD, ec->handle, 1,
@@ -1649,6 +1653,14 @@ static int acpi_ec_setup(struct acpi_ec *ec, struct acpi_device *device, bool ca {int ret; +/* +* GPIO IRQ lookup can defer. Do it before publishing the EC +* OpRegion to AML to avoid a spurious _REG(disconnect). +*/ + ret =ec_prepare_gpio_irq (ec, device); +if (ret) +return ret; +/* First EC capable of handling transactions */ if (!first_ec) first_ec = ec;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 492/1518 ACPI: processor: validate MADT IOAPIC entry bounds
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pengpeng Hou <[email protected]>
[ Upstream commit 2c50ffdc73f3a70d745d249f509fc290754121e6 ]
The IOAPIC hotplug lookup parses both MADT and _MAT records directly. The MADT walk previously used a subtable's declared length to advance the cursor after only locating a generic header. The _MAT path likewise passed a generic header to the IOAPIC helper.
Validate that a current record has a complete generic header, that its declared length is contained in the available record range, and that a typed IOAPIC record contains the full fixed IOAPIC body before reading its fields. Use the same relation for both MADT and _MAT provider paths.
--- drivers/acpi/processor_core.c | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-)
drivers/acpi/processor_core.c +25 -6
@@ -336,11 +336,26 @@ int acpi_get_cpuid(acpi_handle handle, int type, u32 acpi_id)EXPORT_SYMBOL_GPL (acpi_get_cpuid);#ifdef CONFIG_ACPI_HOTPLUG_IOAPIC -static int get_ioapic_id (struct acpi_subtable_header *entry,u32 gsi_base, +static bool madt_entry_is_valid (struct acpi_subtable_header *entry, +unsigned long end) +{ +unsigned long start = (unsigned long )entry; + +if (start >= end || end - start <sizeof (*entry)) +return false; + +return entry->length >=sizeof (*entry) && entry->length <= end - start; +} + +static int get_ioapic_id (struct acpi_subtable_header *entry, +const unsigned long end,u32 gsi_base,u64 *phys_addr,int *ioapic_id) {struct acpi_madt_io_apic *ioapic = (struct acpi_madt_io_apic *)entry; +if (!madt_entry_is_valid (entry, end) ||BAD_MADT_ENTRY (ioapic, end)) +return 0 ; +if (ioapic->global_irq_base != gsi_base)return 0 ;
@@ -361,17 +376,19 @@ static int parse_madt_ioapic_entry(u32 gsi_base, u64 *phys_addr)return apic_id; entry = (unsigned long )madt; +if (madt->header.length <sizeof (*madt)) +return apic_id; madt_end = entry + madt->header.length;/* Parse all entries looking for a match. */ entry +=sizeof (struct acpi_table_madt ); -while (entry +sizeof (struct acpi_subtable_header ) < madt_end) { +while (madt_entry_is_valid ((struct acpi_subtable_header *)entry, + madt_end)) { hdr = (struct acpi_subtable_header *)entry;if (hdr->type ==ACPI_MADT_TYPE_IO_APIC && -get_ioapic_id (hdr, gsi_base, phys_addr, &apic_id)) +get_ioapic_id (hdr, madt_end, gsi_base, phys_addr, &apic_id))break ; -else - entry += hdr->length; + entry += hdr->length; }return apic_id;
@@ -398,7 +415,9 @@ static int parse_mat_ioapic_entry(acpi_handle handle, u32 gsi_base, header = (struct acpi_subtable_header *)obj->buffer.pointer;if (header->type ==ACPI_MADT_TYPE_IO_APIC ) -get_ioapic_id (header, gsi_base, phys_addr, &apic_id); +get_ioapic_id (header, + (unsigned long )header + obj->buffer.length, + gsi_base, phys_addr, &apic_id); exit:kfree (buffer.pointer);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 493/1518 ACPI: PCI: Clear driver_data on all paths that free the acpi_pci_root
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chen Pei <[email protected]>
[ Upstream commit 8a742141f7ab84975aa758b775567ef4740ef0cf ]
acpi_pci_root_add() assigns the freshly allocated root to device->driver_data before dmar_device_add() and pci_acpi_scan_root(). Both failure paths reach the end: label where root is kfree()'d, but only the pci_acpi_scan_root() path clears driver_data first.
When dmar_device_add() fails during a hot-add, root is freed while device->driver_data still points at it. The ACPI core does not clear driver_data on attach failure, so a later acpi_pci_find_root() call may dereference this dangling pointer.
acpi_pci_root_remove() has the same problem: it frees root without clearing device->driver_data, leaving a dangling pointer behind after the root bridge is removed.
Move the NULL assignment to the shared end: label so every error path in acpi_pci_root_add() clears driver_data before freeing root, and clear it in acpi_pci_root_remove() as well, so the object is never left reachable through driver_data after being freed.
--- drivers/acpi/pci_root.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/acpi/pci_root.c +2 -1
@@ -730,7 +730,6 @@ static int acpi_pci_root_add(struct acpi_device *device,dev_err (&device->dev,"Bus %04x:%02x not present in PCI namespace\n" , root->segment, (unsigned int )root->secondary.start); - device->driver_data =NULL ; result = -ENODEV ; goto remove_dmar; }
@@ -766,6 +765,7 @@ static int acpi_pci_root_add(struct acpi_device *device,if (hotadd)dmar_device_remove (handle); end: + device->driver_data =NULL ;kfree (root);return result; }
@@ -789,6 +789,7 @@ static void acpi_pci_root_remove(struct acpi_device *device)pci_unlock_rescan_remove (); + device->driver_data =NULL ;kfree (root); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 494/1518 ext4: fix circular lock dependency in ext4_ext_migrate
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yun Zhou <[email protected]>
[ Upstream commit a897682793eba5de51ee6f3152760374afa629cf ]
Move iput(tmp_inode) after ext4_writepages_up_write() to avoid a circular lock dependency between s_writepages_rwsem and sb_internal (freeze protection).
The deadlock scenario:
CPU0 (EXT4_IOC_MIGRATE) CPU1 (orphan cleanup during mount)
---- ----
ext4_ext_migrate()
ext4_writepages_down_write()
s_writepages_rwsem (write)
ext4_evict_inode()
sb_start_intwrite() [sb_internal]
...
ext4_writepages()
s_writepages_rwsem (read) [BLOCKED]
iput(tmp_inode)
ext4_evict_inode()
sb_start_intwrite() [BLOCKED]The tmp_inode is a temporary inode with nlink=0 created solely for building the extent tree. Its eviction does not require s_writepages_rwsem protection, so deferring iput() until after releasing the rwsem is safe.
--- fs/ext4/migrate.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/ext4/migrate.c +2 -1
@@ -458,6 +458,7 @@ int ext4_ext_migrate(struct inode *inode)if (IS_ERR (tmp_inode)) { retval =PTR_ERR (tmp_inode);ext4_journal_stop (handle); + tmp_inode =NULL ; goto out_unlock; }/*
@@ -585,9 +586,9 @@ int ext4_ext_migrate(struct inode *inode)ext4_journal_stop (handle); out_tmp_inode:unlock_new_inode (tmp_inode); -iput (tmp_inode); out_unlock:ext4_writepages_up_write (inode->i_sb, alloc_ctx); +iput (tmp_inode);return retval; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 495/1518 ext4: fix out-of-bounds read in ext4_read_inline_dir()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xiang Mei <[email protected]>
[ Upstream commit 9333cc809f0a89e001b814155a6cb8903a6274df ]
ext4_read_inline_dir() can read a dirent header past the end of its inline buffer, triggering a slab-out-of-bounds read during getdents64():
BUG: KASAN: slab-out-of-bounds in __ext4_check_dir_entry Read of size 2 at addr ffff88800f3dd23c by task exploit/148 ... __ext4_check_dir_entry ext4_read_inline_dir iterate_dir
The dirent payload lives in a buffer of exactly inline_size bytes:
dir_buf = kmalloc(inline_size, GFP_NOFS);
but iteration runs in a position space extra_offset bytes larger (extra_size = extra_offset + inline_size) so the synthetic "." and ".." land at their block-dir offsets. A dirent is formed at "dir_buf + pos - extra_offset", yet the ext4_check_dir_entry() length argument uses the larger extra_size. A position whose dirent header would extend past extra_size is therefore accepted, and the rescan loop's rec_len probe and ext4_check_dir_entry() dereference de->rec_len before the entry is rejected.
Reject a position whose minimum-size dirent header would not fit within extra_size before forming de, in both the rescan and main loops, and pass inline_size rather than extra_size to ext4_check_dir_entry() so the length check matches the physical buffer.
--- fs/ext4/inline.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
fs/ext4/inline.c +10 -1
@@ -1454,6 +1454,8 @@ int ext4_read_inline_dir(struct file *file,/* for other entry, the real offset in * the buf has to be tuned accordingly. */ +if (i +ext4_dir_rec_len (1 ,NULL ) > extra_size) +break ; de = (struct ext4_dir_entry_2 *) (dir_buf + i - extra_offset);/* It's too expensive to do a full
@@ -1488,10 +1490,17 @@ int ext4_read_inline_dir(struct file *file,continue ; } +/* +* de lives at dir_buf + ctx->pos - extra_offset, within the +* kmalloc(inline_size) buffer. Make sure its header fits before +* ext4_check_dir_entry() dereferences de->rec_len. +*/ +if (ctx->pos +ext4_dir_rec_len (1 ,NULL ) > extra_size) + goto out; de = (struct ext4_dir_entry_2 *) (dir_buf + ctx->pos - extra_offset);if (ext4_check_dir_entry (inode, file, de, iloc.bh, dir_buf, - extra_size, ctx->pos)) + inline_size, ctx->pos)) goto out; if (le32_to_cpu(de->inode)) { if (!dir_emit(ctx, de->name, de->name_len,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 496/1518 ext4: skip extra isize expansion during mount to prevent deadlock
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yun Zhou <[email protected]>
[ Upstream commit 7461c60b9c6a839b13ad4c3490681a0cf5aa0637 ]
ext4_try_to_expand_extra_isize() is called from __ext4_mark_inode_dirty() while holding an active jbd2 handle. During mount (!SB_ACTIVE), the expand path may move xattrs to external blocks and release ea_inodes via iput(). When !SB_ACTIVE, iput() calls write_inode_now() which acquires s_writepages_rwsem, creating a circular lock dependency:
s_writepages_rwsem --> jbd2_handle --> xattr_sem --> s_writepages_rwsem
This can be triggered via:
ext4_process_orphan() -> ext4_truncate() -> ext4_mark_inode_dirty()
-> ext4_try_to_expand_extra_isize()
or:
ext4_evict_inode() -> ext4_mark_inode_dirty()
-> ext4_try_to_expand_extra_isize()
Skip expansion when !SB_ACTIVE. This is a minor loss of functionality (extra isize won't grow for these inodes during mount), which e2fsck can resolve later if needed.
--- fs/ext4/inode.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
fs/ext4/inode.c +10 -0
@@ -6434,6 +6434,16 @@ static int ext4_try_to_expand_extra_isize(struct inode *inode,if (ext4_test_inode_state (inode,EXT4_STATE_NO_EXPAND ))return -EOVERFLOW ; +/* +* Skip expansion during mount (!SB_ACTIVE). Expanding extra isize +* may move xattrs to external blocks and release ea_inodes via iput. +* When !SB_ACTIVE, iput triggers write_inode_now() which acquires +* s_writepages_rwsem, causing a deadlock with the caller's active +* jbd2 handle (lock order: s_writepages_rwsem -> jbd2_handle). +*/ +if (unlikely (!(inode->i_sb->s_flags &SB_ACTIVE ))) +return -EBUSY ; +/* * In nojournal mode, we can immediately attempt to expand * the inode. When journaled, we first need to obtain extra
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 497/1518 platform/x86: acer-wmi: reject missing gaming WMI results
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yousef Alhouseen <[email protected]>
[ Upstream commit caf8342512c3056005f475d350eeca089c3c6623 ]
WMI_gaming_execute_u32_u64() returns success when firmware supplies no output object, leaving the caller output untouched. Gaming getters then inspect an uninitialized result value.
When the caller requests an output value, return -ENOMSG if firmware supplies no object. Preserve a NULL output pointer as the supported way for callers to ignore the result.
--- drivers/platform/x86/acer-wmi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/platform/x86/acer-wmi.c +3 -1
@@ -1530,7 +1530,9 @@ static int WMI_gaming_execute_u32_u64(u32 method_id, u32 in, u64 *out)return -EIO ; obj = result.pointer; -if (obj && out) { +if (!obj && out) { + ret = -ENOMSG ; + }else if (obj && out) {switch (obj->type) {case ACPI_TYPE_INTEGER : *out = obj->integer.value;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 498/1518 bpf: Zero queue and stack outputs on lock failure
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kumar Kartikeya Dwivedi <[email protected]>
[ Upstream commit 7ac6e1ae41a09f1dd4baeeff1d028ae49ee01232 ]
Queue and stack pop/peek helpers accept an uninitialized output buffer because the verifier expects the helper to initialize it. The empty-map error path clears the buffer, but a failed lock acquisition returns -EBUSY without writing it.
Clear the output before returning -EBUSY so BPF programs cannot observe uninitialized stack contents after a failed helper call.
--- kernel/bpf/queue_stack_maps.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
kernel/bpf/queue_stack_maps.c +6 -2
@@ -99,8 +99,10 @@ static long __queue_map_get(struct bpf_map *map, void *value, bool delete)int err =0 ;void *ptr; -if (raw_res_spin_lock_irqsave (&qs->lock, flags)) +if (raw_res_spin_lock_irqsave (&qs->lock, flags)) { +memset (value,0 , qs->map.value_size);return -EBUSY ; + }if (queue_stack_map_is_empty (qs)) {memset (value,0 , qs->map.value_size);
@@ -130,8 +132,10 @@ static long __stack_map_get(struct bpf_map *map, void *value, bool delete)void *ptr;u32 index; -if (raw_res_spin_lock_irqsave (&qs->lock, flags)) +if (raw_res_spin_lock_irqsave (&qs->lock, flags)) { +memset (value,0 , qs->map.value_size);return -EBUSY ; + }if (queue_stack_map_is_empty (qs)) {memset (value,0 , qs->map.value_size);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 499/1518 libbpf: Search /lib64 and /lib in resolve_full_path()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ricardo B. Marlière <[email protected]>
[ Upstream commit 7b5ae0481efdac040cea72b4fabd1398109f975b ]
attach_probe/uprobe-lib and uprobe_autoattach selftests fail with "failed to resolve full path for libc.so.6" on older non-usrmerged distros, where libc.so.6 lives under a top-level /lib64 or /lib rather than /usr/lib64 or /usr/lib. Add /lib64:/lib to the search paths, alongside the existing /usr/lib64:/usr/lib and Debian multiarch entries.
--- tools/lib/bpf/libbpf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/lib/bpf/libbpf.c +2 -1
@@ -12148,13 +12148,14 @@ static const char *arch_specific_lib_paths(void)/* Get full path to program/shared library. */ static int resolve_full_path (const char *file,char *result,size_t result_sz) { -const char *search_paths[3 ] = {}; +const char *search_paths[4 ] = {};int i, perm;if (str_has_sfx (file,".so" ) ||strstr (file,".so." )) { search_paths[0 ] =getenv ("LD_LIBRARY_PATH" ); search_paths[1 ] ="/usr/lib64:/usr/lib" ; search_paths[2 ] =arch_specific_lib_paths (); + search_paths[3 ] ="/lib64:/lib" ; perm =R_OK ; }else { search_paths[0 ] =getenv ("PATH" );
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 500/1518 riscv, bpf: Fix memory leak in bpf_jit_free
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pu Lehui <[email protected]>
[ Upstream commit 369e4635d04801f394d5bd42556f21029e95ff93 ]
When bpf_int_jit_compile() is called for subprograms, it returns early during the first pass (!prog->is_func || extra_pass is false), keeping ctx->offset alive for the subsequent extra pass.
If JIT compilation fails for a later subprogram, the BPF core aborts and calls bpf_jit_free() to clean up the first subprogram. However, bpf_jit_free() fails to free jit_data->ctx.offset, which causes a memory leak of the JIT context offsets array.
Fix this by adding the missing kfree(jit_data->ctx.offset) in bpf_jit_free().
--- arch/riscv/net/bpf_jit_core.c | 1 + 1 file changed, 1 insertion(+)
arch/riscv/net/bpf_jit_core.c +1 -0
@@ -251,6 +251,7 @@ void bpf_jit_free(struct bpf_prog *prog)*/ if (jit_data) {bpf_jit_binary_pack_finalize (jit_data->ro_header, jit_data->header); +kfree (jit_data->ctx.offset);kfree (jit_data); } hdr =bpf_jit_binary_pack_hdr (prog);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 501/1518 riscv, bpf: Fix kernel stack corruption in tailcall with CFI
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pu Lehui <[email protected]>
[ Upstream commit 52fb1756ea1d2759dfef2d86245be00b05dac3a2 ]
When CONFIG_CFI_CLANG is enabled, prog->bpf_func already skips the kcfi instruction during setup. Including it again in the tailcall jump offset causes it to jump over an extra 4 bytes, skipping the stack pointer adjustment, which will result in kernel stack corruption.
--- arch/riscv/net/bpf_jit_comp64.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
arch/riscv/net/bpf_jit_comp64.c +4 -3
@@ -18,7 +18,6 @@#define RV_MAX_REG_ARGS 8#define RV_FENTRY_NINSNS 2#define RV_FENTRY_NBYTES (RV_FENTRY_NINSNS * 4) -#define RV_KCFI_NINSNS (IS_ENABLED(CONFIG_CFI) ? 1 : 0)/* imm that allows emit_imm to emit max count insns */ #define RV_MAX_COUNT_IMM 0x7FFF7FF7FF7FF7FF
@@ -272,8 +271,8 @@ static void __build_epilogue(bool is_tail_call, struct rv_jit_context *ctx)if (!is_tail_call)emit_addiw (RV_REG_A0 ,RV_REG_A5 ,0 , ctx);emit_jalr (RV_REG_ZERO , is_tail_call ?RV_REG_T3 :RV_REG_RA , -/* kcfi, fentry and TCC init insns will be skipped on tailcall */ - is_tail_call ? (RV_KCFI_NINSNS +RV_FENTRY_NINSNS +1 ) *4 :0 , +/* fentry and TCC init insns will be skipped on tailcall */ + is_tail_call ? (RV_FENTRY_NINSNS +1 ) *4 :0 , ctx); }
@@ -1973,6 +1972,8 @@ void bpf_jit_build_prologue(struct rv_jit_context *ctx, bool is_subprog)/* emit kcfi type preamble immediately before the first insn */ emit_kcfi (is_subprog ? cfi_bpf_subprog_hash : cfi_bpf_hash, ctx); +/* bpf prog starts here as kcfi skipped during prog->bpf_func setup */ +/* nops reserved for auipc+jalr pair */ for (i =0 ; i <RV_FENTRY_NINSNS ; i++)emit (rv_nop (), ctx);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 502/1518 bpf, riscv: Fix extable handling for arena load_acquire
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Feng Jiang <[email protected]>
[ Upstream commit 5eb8921371c6fd117d4a328b6053dfda38707df8 ]
emit_atomic_ld_st() returns 1 to have build_body() skip the zext after a sub-word load_acquire. The caller does "ret = ret ?:add_exception_handler(...)", which skips add_exception_handler() on any non-zero ret, so the extable entry is missing and a faulting PROBE_ATOMIC load_acquire oopses.
REG_DONT_CLEAR_MARKER leaves rd stale on fault, and the verifier still thinks the load overwrote it, so a program can leak it through a map.
Check ret >= 0 before calling add_exception_handler(), and pass rd for LOAD_ACQ so the fault zeroes rd like a PROBE_MEM load. Return ret unchanged for the zext skip.
--- arch/riscv/net/bpf_jit_comp64.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/riscv/net/bpf_jit_comp64.c +6 -1
@@ -1925,7 +1925,12 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,else ret =emit_atomic_rmw (rd, rs, insn, ctx); - ret = ret ?:add_exception_handler (insn,REG_DONT_CLEAR_MARKER , ctx); +/* ret can be 1 (skip-zext); extable entry still needs to be added */ +if (ret >=0 ) + ret =add_exception_handler (insn, + insn->imm ==BPF_LOAD_ACQ ? rd :REG_DONT_CLEAR_MARKER , + ctx) ?: ret; +if (ret)return ret;break ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 503/1518 ACPI: battery: Adjust charging status validation check
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rafael J. Wysocki <[email protected]>
[ Upstream commit 77ce4be0d8d53c528d1663ab62a14d93d5853f11 ]
Commit bb1256e0ddc7 ("ACPI: battery: fix incorrect charging status when current is zero") added a charge rate check to validate the "charging" status of the battery, but that check is reported to cause some systems to misbehave [1]. Namely, it causes the "not charging" status to be reported on them while the battery is in fact charging (and they were correctly reporting the "charging" status in that case previously).
To address that, check if the battery is full in addition to checking the charge rate when the "charging" status is reported by the platform firmware and only change it to "not charging" if the battery is full and its charge rate is zero or it is unknown.
--- drivers/acpi/battery.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-)
drivers/acpi/battery.c +19 -17
@@ -151,27 +151,28 @@ static int acpi_battery_technology(struct acpi_battery *battery)static int acpi_battery_get_state (struct acpi_battery *battery); -static int acpi_battery_is_charged (struct acpi_battery *battery) +static bool acpi_battery_is_full (struct acpi_battery *battery) { -/* charging, discharging, critical low or charge limited */ -if (battery->state !=0 ) -return 0 ; -/* battery not reporting charge */ if (battery->capacity_now ==ACPI_BATTERY_VALUE_UNKNOWN || battery->capacity_now ==0 ) -return 0 ; +return false;/* good batteries update full_charge as the batteries degrade */ if (battery->full_charge_capacity == battery->capacity_now) -return 1 ; +return true;/* fallback to using design values for broken batteries */ -if (battery->design_capacity <= battery->capacity_now) -return 1 ; +return battery->design_capacity <= battery->capacity_now; +} -/* we don't do any sort of metric based on percentages */ -return 0 ; +static int acpi_battery_is_charged (struct acpi_battery *battery) +{ +/* charging, discharging, critical low or charge limited */ +if (battery->state !=0 ) +return 0 ; + +return acpi_battery_is_full (battery); }static bool acpi_battery_is_degraded (struct acpi_battery *battery)
@@ -212,13 +213,14 @@ static int acpi_battery_get_property(struct power_supply *psy,if (battery->state &ACPI_BATTERY_STATE_DISCHARGING ) val->intval =acpi_battery_handle_discharging (battery);else if (battery->state &ACPI_BATTERY_STATE_CHARGING ) -/* Validate the status by checking the current. */ -if (battery->rate_now !=ACPI_BATTERY_VALUE_UNKNOWN && - battery->rate_now ==0 ) { -/* On charge but no current (0W/0mA). */ - val->intval =POWER_SUPPLY_STATUS_NOT_CHARGING ; - }else { +/* Check the rate and capacity to validate the status. */ +if (!acpi_battery_is_full (battery) || + (battery->rate_now !=ACPI_BATTERY_VALUE_UNKNOWN && + battery->rate_now >0 )) { val->intval =POWER_SUPPLY_STATUS_CHARGING ; + }else { +/* Full and zero rate. */ + val->intval =POWER_SUPPLY_STATUS_NOT_CHARGING ; }else if (battery->state &ACPI_BATTERY_STATE_CHARGE_LIMITING ) val->intval =POWER_SUPPLY_STATUS_NOT_CHARGING ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 504/1518 virt: arm-cca-guest: use migrate_disable() for attestation token requests
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kohei Enju <[email protected]>
[ Upstream commit 24f55f511b9e1c19dc48d11bfe0dc60c86bdb376 ]
The RSI attestation token init and continue calls must be issued from the same CPU. arm_cca_report_new() currently snapshots the CPU number and uses smp_call_function_single() to issue those calls on that CPU.
With CONFIG_DEBUG_PREEMPT=y, the smp_processor_id() call used for the snapshot triggers a debug splat [0] because it runs in preemptible context. The snapshot does not pin the task to that CPU; it is only used to choose the target CPU for smp_call_function_single(), which can fail if that CPU is no longer available.
Use migrate_disable() and issue the token init and continue operations directly, without the smp_call_function_single() callbacks. This keeps the token request sequence on the same CPU while preserving a sleepable context for the GFP_KERNEL allocations needed after the init call.
[0]
BUG: using smp_processor_id() in preemptible [00000000] code: cca-workload-at/264 caller is debug_smp_processor_id+0x20/0x30 CPU: 0 UID: 0 PID: 264 Comm: cca-workload-at Not tainted 7.1.0-rc1-00044-g55542ab273f2 #80 PREEMPT(lazy) Hardware name: linux,dummy-virt (DT) Call trace: [...] check_preemption_disabled+0xd8/0xf8 debug_smp_processor_id+0x20/0x30 arm_cca_report_new+0x48/0x278 tsm_report_read+0x154/0x1f8 tsm_report_outblob_read+0x20/0x38 configfs_bin_read_iter+0x118/0x208 vfs_read+0x220/0x318 [...]
--- .../virt/coco/arm-cca-guest/arm-cca-guest.c | 97 +++++++------------ 1 file changed, 36 insertions(+), 61 deletions(-)
drivers/virt/coco/arm-cca-guest/arm-cca-guest.c +36 -61
@@ -16,54 +16,38 @@/** * struct arm_cca_token_info - a descriptor for the token buffer. -* @challenge: Pointer to the challenge data -* @challenge_size: Size of the challenge data * @granule: PA of the granule to which the token will be written * @offset: Offset within granule to start of buffer in bytes -* @result: result of rsi_attestation_token_continue operation */ struct arm_cca_token_info { -void *challenge; -unsigned long challenge_size;phys_addr_t granule;unsigned long offset; -unsigned long result; }; -static void arm_cca_attestation_init (void *param) -{ -struct arm_cca_token_info *info; - - info = (struct arm_cca_token_info *)param; - - info->result =rsi_attestation_token_init (info->challenge, - info->challenge_size); -} -/** * arm_cca_attestation_continue - Retrieve the attestation token data. * -* @param: pointer to the arm_cca_token_info +* @info: pointer to the arm_cca_token_info * * Attestation token generation is a long running operation and therefore * the token data may not be retrieved in a single call. Moreover, the * token retrieval operation must be requested on the same CPU on which the * attestation token generation was initialised. -* This helper function is therefore scheduled on the same CPU multiple +* This helper function must therefore be executed on the same CPU multiple * times until the entire token data is retrieved. */ -static void arm_cca_attestation_continue (void *param) +static unsigned long +arm_cca_attestation_continue (struct arm_cca_token_info *info) { +unsigned long ret;unsigned long len;unsigned long size; -struct arm_cca_token_info *info; - - info = (struct arm_cca_token_info *)param; size =RSI_GRANULE_SIZE - info->offset; - info->result =rsi_attestation_token_continue (info->granule, - info->offset, size, &len); + ret =rsi_attestation_token_continue (info->granule, info->offset, size, + &len); info->offset += len; +return ret; }/**
@@ -74,8 +58,8 @@ static void arm_cca_attestation_continue(void *param)* * Initialise the attestation token generation using the challenge data * passed in the TSM descriptor. Allocate memory for the attestation token -* and schedule calls to retrieve the attestation token on the same CPU -* on which the attestation token generation was initialised. +* and retrieve the attestation token on the same CPU on which the +* attestation token generation was initialised. * * The challenge data must be at least 32 bytes and no more than 64 bytes. If * less than 64 bytes are provided it will be zero padded to 64 bytes.
@@ -85,12 +69,11 @@ static void arm_cca_attestation_continue(void *param)* * %-EINVAL - A parameter was not valid. * * %-ENOMEM - Out of memory. * * %-EFAULT - Failed to get IPA for memory page(s). -* * A negative status code as returned by smp_call_function_single(). */ static int arm_cca_report_new (struct tsm_report *report,void *data) { -int ret; -int cpu; +int ret =0 ; +unsigned long rsi_result;long max_size;unsigned long token_size =0 ;struct arm_cca_token_info info;
@@ -103,37 +86,33 @@ static int arm_cca_report_new(struct tsm_report *report, void *data)/* * The attestation token 'init' and 'continue' calls must be -* performed on the same CPU. smp_call_function_single() is used -* instead of simply calling get_cpu() because of the need to -* allocate outblob based on the returned value from the 'init' -* call and that cannot be done in an atomic context. +* performed on the same CPU, so disable CPU migration around +* those operations. */ - cpu =smp_processor_id (); +migrate_disable (); - info.challenge = desc->inblob; - info.challenge_size = desc->inblob_len; - - ret =smp_call_function_single (cpu, arm_cca_attestation_init, - &info, true); -if (ret) -return ret; - max_size = info.result; - -if (max_size <=0 ) -return -EINVAL ; + max_size =rsi_attestation_token_init (desc->inblob, desc->inblob_len); +if (max_size <=0 ) { + ret = -EINVAL ; + goto exit_migrate_enable; + }/* Allocate outblob */ token =kvzalloc (max_size,GFP_KERNEL ); -if (!token) -return -ENOMEM ; +if (!token) { + ret = -ENOMEM ; + goto exit_migrate_enable; + }/* * Since the outblob may not be physically contiguous, use a page * to bounce the buffer from RMM. */ buf =alloc_pages_exact (RSI_GRANULE_SIZE ,GFP_KERNEL ); -if (!buf) -return -ENOMEM ; +if (!buf) { + ret = -ENOMEM ; + goto exit_migrate_enable; + }/* Get the PA of the memory page(s) that were allocated */ info.granule = (unsigned long )virt_to_phys (buf);
@@ -144,21 +123,15 @@ static int arm_cca_report_new(struct tsm_report *report, void *data) info.offset =0 ;do {/* -* Schedule a call to retrieve a sub-granule chunk -* of data per loop iteration. +* Retrieve a sub-granule chunk of data per loop +* iteration. */ - ret =smp_call_function_single (cpu, - arm_cca_attestation_continue, - (void *)&info, true); -if (ret !=0 ) { - token_size =0 ; - goto exit_free_granule_page; - } - }while (info.result ==RSI_INCOMPLETE && + rsi_result =arm_cca_attestation_continue (&info); + }while (rsi_result ==RSI_INCOMPLETE && info.offset <RSI_GRANULE_SIZE );/* Break out in case of failure */ -if (info.result !=RSI_SUCCESS && info.result !=RSI_INCOMPLETE ) { +if (rsi_result !=RSI_SUCCESS && rsi_result !=RSI_INCOMPLETE ) { ret = -ENXIO ; token_size =0 ; goto exit_free_granule_page;
@@ -173,12 +146,14 @@ static int arm_cca_report_new(struct tsm_report *report, void *data)break ;memcpy (&token[token_size], buf, info.offset); token_size += info.offset; - }while (info.result ==RSI_INCOMPLETE ); + }while (rsi_result ==RSI_INCOMPLETE ); report->outblob =no_free_ptr (token); exit_free_granule_page: report->outblob_len = token_size;free_pages_exact (buf,RSI_GRANULE_SIZE ); +exit_migrate_enable: +migrate_enable ();return ret; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 505/1518 bpf: Fix offset warn check for bpf_res_spin_lock
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kumar Kartikeya Dwivedi <[email protected]>
[ Upstream commit 04e19012efaec2bfd8c3b37fd8a6c3f1fe731ffc ]
Sashiko pointed out correctly that the case statement for BPF_RES_SPIN_LOCK incorrectly checks offset for BPF_SPIN_LOCK. Fix it by checking res_spin_lock_off instead.
--- kernel/bpf/btf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/bpf/btf.c +1 -1
@@ -4003,7 +4003,7 @@ struct btf_record *btf_parse_fields(const struct btf *btf, const struct btf_type rec->spin_lock_off = rec->fields[i].offset;break ;case BPF_RES_SPIN_LOCK : -WARN_ON_ONCE (rec->spin_lock_off >=0 ); +WARN_ON_ONCE (rec->res_spin_lock_off >=0 );/* Cache offset for faster lookup at runtime */ rec->res_spin_lock_off = rec->fields[i].offset;break ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 506/1518 bpf: Preserve unique-field state across nested structs
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kumar Kartikeya Dwivedi <[email protected]>
[ Upstream commit f08619f060468076e4acbdc10e0713af20d60e65 ]
btf_find_struct_field() initializes a fresh seen mask for every recursive descent. Unique special fields in different levels of the same aggregate therefore do not see one another. The duplicate fields can reach btf_parse_fields(), where they trigger an invariant WARN_ON_ONCE(). A crafted user BTF can consequently trigger the warning before map creation checks capabilities.
Initialize the seen mask once in btf_find_field() and pass the same pointer through struct, datasec, and nested-struct walks. This gives the entire field traversal one shared uniqueness state.
--- kernel/bpf/btf.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-)
kernel/bpf/btf.c +14 -12
@@ -3586,7 +3586,7 @@ static int btf_repeat_fields(struct btf_field_info *info, int info_cnt,static int btf_find_struct_field (const struct btf *btf,const struct btf_type *t,u32 field_mask,struct btf_field_info *info,int info_cnt, -u32 level); +u32 level,u32 *seen_mask);/* Find special fields in the struct type of a field. *
@@ -3597,7 +3597,7 @@ static int btf_find_struct_field(const struct btf *btf,static int btf_find_nested_struct (const struct btf *btf,const struct btf_type *t,u32 off,u32 nelems,u32 field_mask,struct btf_field_info *info, -int info_cnt,u32 level) +int info_cnt,u32 level,u32 *seen_mask) {int ret, err, i;
@@ -3605,7 +3605,7 @@ static int btf_find_nested_struct(const struct btf *btf, const struct btf_type *if (level >=MAX_RESOLVE_DEPTH )return -E2BIG ; - ret =btf_find_struct_field (btf, t, field_mask, info, info_cnt, level); + ret =btf_find_struct_field (btf, t, field_mask, info, info_cnt, level, seen_mask);if (ret <=0 )return ret;
@@ -3662,7 +3662,7 @@ static int btf_find_field_one(const struct btf *btf,if (expected_size && expected_size != sz * nelems)return 0 ; ret =btf_find_nested_struct (btf, var_type, off, nelems, field_mask, - &info[0 ], info_cnt, level); + &info[0 ], info_cnt, level, seen_mask);return ret; }
@@ -3727,11 +3727,11 @@ static int btf_find_field_one(const struct btf *btf,static int btf_find_struct_field (const struct btf *btf,const struct btf_type *t,u32 field_mask,struct btf_field_info *info,int info_cnt, -u32 level) +u32 level,u32 *seen_mask) {int ret, idx =0 ;const struct btf_member *member; -u32 i, off, seen_mask =0 ; +u32 i, off;for_each_member (i, t, member) { const struct btf_type *member_type = btf_type_by_id(btf,
@@ -3745,7 +3745,7 @@ static int btf_find_struct_field(const struct btf *btf, ret =btf_find_field_one (btf, t, member_type, i, off,0 , - field_mask, &seen_mask, + field_mask, seen_mask, &info[idx], info_cnt - idx, level);if (ret <0 )return ret;
@@ -3756,11 +3756,11 @@ static int btf_find_struct_field(const struct btf *btf,static int btf_find_datasec_var (const struct btf *btf,const struct btf_type *t,u32 field_mask,struct btf_field_info *info, -int info_cnt,u32 level) +int info_cnt,u32 level,u32 *seen_mask) {int ret, idx =0 ;const struct btf_var_secinfo *vsi; -u32 i, off, seen_mask =0 ; +u32 i, off;for_each_vsi (i, t, vsi) {const struct btf_type *var =btf_type_by_id (btf, vsi->type);
@@ -3768,7 +3768,7 @@ static int btf_find_datasec_var(const struct btf *btf, const struct btf_type *t, off = vsi->offset; ret =btf_find_field_one (btf, var, var_type,-1 , off, vsi->size, - field_mask, &seen_mask, + field_mask, seen_mask, &info[idx], info_cnt - idx, level);if (ret <0 )
@@ -3782,10 +3782,12 @@ static int btf_find_field(const struct btf *btf, const struct btf_type *t, u32 field_mask, struct btf_field_info *info, int info_cnt) { + u32 seen_mask = 0; +if (__btf_type_is_struct (t)) - return btf_find_struct_field(btf, t, field_mask, info, info_cnt, 0); +return btf_find_struct_field (btf, t, field_mask, info, info_cnt,0 , &seen_mask);else if (btf_type_is_datasec (t)) - return btf_find_datasec_var(btf, t, field_mask, info, info_cnt, 0); +return btf_find_datasec_var (btf, t, field_mask, info, info_cnt,0 , &seen_mask);return -EINVAL ; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 507/1518 bpf: Mark bpf_refcount field as unique
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kumar Kartikeya Dwivedi <[email protected]>
[ Upstream commit 61e655391cb19c31f94ecd4354f624c81ce4cf75 ]
BPF_REFCOUNT is not marked as a unique field, while it should be. Fix this oversight.
--- kernel/bpf/btf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/bpf/btf.c +1 -1
@@ -3504,7 +3504,7 @@ static int btf_get_field_type(const struct btf *btf, const struct btf_type *var_ { BPF_LIST_NODE, "bpf_list_node", false }, { BPF_RB_ROOT, "bpf_rb_root", false }, { BPF_RB_NODE, "bpf_rb_node", false }, - { BPF_REFCOUNT, "bpf_refcount", false }, + { BPF_REFCOUNT, "bpf_refcount", true }, };int type =0 , i;const char *name =__btf_name_by_offset (btf, var_type->name_off);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 508/1518 RDMA/srpt: Pass the mapped task attribute to target_init_cmd()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leon Romanovsky <[email protected]>
[ Upstream commit ef63cc441703412628a517dda354f3e51fe2dc92 ]
srpt_handle_cmd() maps the initiator-supplied srp_cmd->task_attr into cmd->sam_task_attr, but then hands a hardcoded TCM_SIMPLE_TAG to target_init_cmd().
Pass the already mapped cmd->sam_task_attr instead, so target core sees the attribute the initiator requested.
--- drivers/infiniband/ulp/srpt/ib_srpt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/ulp/srpt/ib_srpt.c +1 -1
@@ -1603,7 +1603,7 @@ static void srpt_handle_cmd(struct srpt_rdma_ch *ch, rc =target_init_cmd (cmd, ch->sess, &send_ioctx->sense_data[0 ],scsilun_to_int (&srp_cmd->lun), data_len, -TCM_SIMPLE_TAG , dir,TARGET_SCF_ACK_KREF ); + cmd->sam_task_attr, dir,TARGET_SCF_ACK_KREF );if (rc !=0 ) {pr_debug ("target_submit_cmd() returned %d for tag %#llx\n" , rc, srp_cmd->tag);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 509/1518 PCI: j721e: Fix incorrect max_lanes for J7200
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takuma Fujiwara <[email protected]>
[ Upstream commit 7147a7bfce47acd48c3738130bf0bd692bfd80de ]
The PCIe Controller in the J7200 SoC supports a 4-lane configuration. However, j7200_pcie_rc_data and j7200_pcie_ep_data incorrectly set .max_lanes = 2, limiting operation to fewer lanes than the hardware supports.
Set .max_lanes = 4 for both j7200_pcie_rc_data and j7200_pcie_ep_data to match the hardware capability.
See J7200 Technical Reference Manual (SPRUIU1D), section 12.2.3.1.1 for further details: https://www.ti.com/lit/pdf/spruiu1d
--- drivers/pci/controller/cadence/pci-j721e.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pci/controller/cadence/pci-j721e.c +2 -2
@@ -381,7 +381,7 @@ static const struct j721e_pcie_data j7200_pcie_rc_data = { .quirk_detect_quiet_flag = true, .linkdown_irq_regfield = J7200_LINK_DOWN, .byte_access_allowed = true, - .max_lanes = 2, + .max_lanes = 4, };static const struct j721e_pcie_data j7200_pcie_ep_data = {
@@ -389,7 +389,7 @@ static const struct j721e_pcie_data j7200_pcie_ep_data = { .quirk_detect_quiet_flag = true, .linkdown_irq_regfield = J7200_LINK_DOWN, .quirk_disable_flr = true, - .max_lanes = 2, + .max_lanes = 4, };static const struct j721e_pcie_data am64_pcie_rc_data = {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 510/1518 RDMA/erdma: Fix CEQ tasklet use-after-free on removal
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Myeonghun Pak <[email protected]>
[ Upstream commit 0ca79979384f031d710c4b3bae065dcb5d95aca3 ]
Each CEQ interrupt handler only schedules eqc->tasklet. The tasklet calls erdma_ceq_completion_handler(), which reads the DMA-coherent EQ ring through get_next_valid_eqe() and updates eq->dbrec through notify_eq().
erdma_ceqs_uninit() frees each CEQ IRQ and then destroys its EQ. free_irq() prevents another hard IRQ and waits for an in-flight handler, but it does not drain a tasklet that the handler already scheduled. The tasklet can therefore access eq->qbuf or eq->dbrec after erdma_eq_destroy() frees them.
Clearing ceq_cb->ready does not synchronize with a tasklet that already passed the check at the start of erdma_ceq_completion_handler().
Kill the tasklet after free_irq(), when no handler can schedule it again, and before erdma_ceq_uninit_one() releases the EQ buffers.
--- drivers/infiniband/hw/erdma/erdma_eq.c | 1 + 1 file changed, 1 insertion(+)
drivers/infiniband/hw/erdma/erdma_eq.c +1 -0
@@ -219,6 +219,7 @@ static void erdma_free_ceq_irq(struct erdma_dev *dev, u16 ceqn)irq_set_affinity_hint (eqc->irq.msix_vector,NULL );free_irq (eqc->irq.msix_vector, eqc); +tasklet_kill (&eqc->tasklet); }static int create_eq_cmd (struct erdma_dev *dev,u32 eqn,struct erdma_eq *eq)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 511/1518 RDMA/mana_ib: drain QP references after partial table insertion
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leon Romanovsky <[email protected]>
[ Upstream commit 97f7c2262c28ebcae64fc957ee978646684a5ed9 ]
mana_table_store_ud_qp() publishes a QP at its send-queue id before inserting the receive-queue id, dropping the XArray lock between the two xa_insert_irq() calls. A concurrent completion handler can look up the QP and take a transient reference. When the second insertion fails, the rollback erased only the send-queue entry and returned, leaving both the initial table reference and the transient reference outstanding while RDMA core frees the QP, causing a use-after-free.
Drain the reference as normal destruction does: drop the initial reference and wait for qp->free, releasing the QP only after every concurrent lookup returns its reference.
--- drivers/infiniband/hw/mana/qp.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/infiniband/hw/mana/qp.c +8 -2
@@ -459,6 +459,12 @@ static void mana_table_remove_rc_qp(struct mana_ib_dev *mdev, struct mana_ib_qpxa_erase_irq (&mdev->qp_table_wq, qp->ibqp.qp_num); } +static void mana_table_drain_qp_ref (struct mana_ib_qp *qp) +{ +mana_put_qp_ref (qp); +wait_for_completion (&qp->free); +} +static int mana_table_store_ud_qp (struct mana_ib_dev *mdev,struct mana_ib_qp *qp) {u32 qids = qp->ud_qp.queues[MANA_UD_SEND_QUEUE ].id |MANA_SENDQ_MASK ;
@@ -477,6 +483,7 @@ static int mana_table_store_ud_qp(struct mana_ib_dev *mdev, struct mana_ib_qp *q remove_sq:xa_erase_irq (&mdev->qp_table_wq, qids); +mana_table_drain_qp_ref (qp);return err; }
@@ -524,8 +531,7 @@ static void mana_table_remove_qp(struct mana_ib_dev *mdev, qp->ibqp.qp_type);return ; } -mana_put_qp_ref (qp); -wait_for_completion (&qp->free); +mana_table_drain_qp_ref (qp); } static int mana_ib_create_rc_qp(struct ib_qp *ibqp, struct ib_pd *ibpd,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 512/1518 RDMA/restrack: Fix typos in the comments
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kalesh AP <[email protected]>
[ Upstream commit d43358cda7c4696e08880aaa58a7df82e471fa7c ]
Fix couple of occurrences of the misspelled word "reource" in the comments with the correct spelling "resource".
Stable-dep-of: 709ba0e5311b ("RDMA/core: Fix use after free in ib_query_qp()")
--- drivers/infiniband/core/restrack.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/infiniband/core/restrack.c +2 -2
@@ -175,7 +175,7 @@ void rdma_restrack_new(struct rdma_restrack_entry *res,EXPORT_SYMBOL (rdma_restrack_new);/** -* rdma_restrack_add() - add object to the reource tracking database +* rdma_restrack_add() - add object to the resource tracking database * @res: resource entry */ void rdma_restrack_add (struct rdma_restrack_entry *res)
@@ -277,7 +277,7 @@ int rdma_restrack_put(struct rdma_restrack_entry *res)EXPORT_SYMBOL (rdma_restrack_put);/** -* rdma_restrack_del() - delete object from the reource tracking database +* rdma_restrack_del() - delete object from the resource tracking database * @res: resource entry */ void rdma_restrack_del (struct rdma_restrack_entry *res)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 513/1518 RDMA/nldev: Fix locking when accessing mr->pd
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason Gunthorpe <[email protected]>
[ Upstream commit 50d5c02ab8e62325548bd3a6e6b758a9dcd6e7c3 ]
Sashiko points out that, due to rereg_mr, the PD is actually variable and all the touches in nldev are racy.
Use mr->device instead of mr->pd->device.
Getting the PD restrack ID is more tricky. To avoid disturbing all the happy paths, add an rdma_restrack_sync() operation which is sort of like flush_workqueue() or synchronize_irq(): after it returns, all the old nldev touches to the mr are gone and everything sees the new PD. This makes it safe to reach into the PD pointer.
Stable-dep-of: 709ba0e5311b ("RDMA/core: Fix use after free in ib_query_qp()")
--- drivers/infiniband/core/nldev.c | 15 +++++---- drivers/infiniband/core/restrack.c | 49 ++++++++++++++++++++++++++++ drivers/infiniband/core/restrack.h | 1 + drivers/infiniband/core/uverbs_cmd.c | 10 ++++-- include/rdma/ib_verbs.h | 5 +++ 5 files changed, 72 insertions(+), 8 deletions(-)
drivers/infiniband/core/nldev.c +9 -6
@@ -679,7 +679,7 @@ static int fill_res_mr_entry(struct sk_buff *msg, bool has_cap_net_admin, struct rdma_restrack_entry *res, uint32_t port) { struct ib_mr *mr = container_of(res, struct ib_mr, res); -struct ib_device *dev = mr->pd->device; +struct ib_device *dev = mr->device;if (has_cap_net_admin) {if (nla_put_u32 (msg,RDMA_NLDEV_ATTR_RES_RKEY , mr->rkey))
@@ -695,9 +695,12 @@ static int fill_res_mr_entry(struct sk_buff *msg, bool has_cap_net_admin,if (nla_put_u32 (msg,RDMA_NLDEV_ATTR_RES_MRN , res->id))return -EMSGSIZE ; -if (!rdma_is_kernel_res (res) && -nla_put_u32 (msg,RDMA_NLDEV_ATTR_RES_PDN , mr->pd->res.id)) -return -EMSGSIZE ; +if (!rdma_is_kernel_res (res)) { +struct ib_pd *pd =READ_ONCE (mr->pd); + +if (nla_put_u32 (msg,RDMA_NLDEV_ATTR_RES_PDN , pd->res.id)) +return -EMSGSIZE ; + }if (fill_res_name_pid (msg, res))return -EMSGSIZE ;
@@ -711,7 +714,7 @@ static int fill_res_mr_raw_entry(struct sk_buff *msg, bool has_cap_net_admin, struct rdma_restrack_entry *res, uint32_t port) { struct ib_mr *mr = container_of(res, struct ib_mr, res); -struct ib_device *dev = mr->pd->device; +struct ib_device *dev = mr->device;if (!dev->ops.fill_res_mr_entry_raw)return -EINVAL ;
@@ -1001,7 +1004,7 @@ static int fill_stat_mr_entry(struct sk_buff *msg, bool has_cap_net_admin, struct rdma_restrack_entry *res, uint32_t port) { struct ib_mr *mr = container_of(res, struct ib_mr, res); -struct ib_device *dev = mr->pd->device; +struct ib_device *dev = mr->device;if (nla_put_u32 (msg,RDMA_NLDEV_ATTR_RES_MRN , res->id)) goto err;
drivers/infiniband/core/restrack.c +49 -0
61 lines not on this page · raw message
drivers/infiniband/core/restrack.h +1 -0
@@ -27,6 +27,7 @@ int rdma_restrack_init(struct ib_device *dev);void rdma_restrack_clean (struct ib_device *dev);void rdma_restrack_add (struct rdma_restrack_entry *res);void rdma_restrack_del (struct rdma_restrack_entry *res); +void rdma_restrack_sync (struct rdma_restrack_entry *res);void rdma_restrack_new (struct rdma_restrack_entry *res,enum rdma_restrack_type type); void rdma_restrack_set_name(struct rdma_restrack_entry *res,
drivers/infiniband/core/uverbs_cmd.c +8 -2
@@ -47,6 +47,7 @@#include "uverbs.h" #include "core_priv.h" +#include "restrack.h" /* * Copy a response to userspace. If the provided 'resp' is larger than the
@@ -830,6 +831,10 @@ static int ib_uverbs_rereg_mr(struct uverbs_attr_bundle *attrs) ret =PTR_ERR (new_pd); goto put_uobjs; } +if (new_pd == orig_pd) { +uobj_put_obj_read (new_pd); + cmd.flags &= ~IB_MR_REREG_PD ; + } }else { new_pd = mr->pd; }
@@ -875,9 +880,10 @@ static int ib_uverbs_rereg_mr(struct uverbs_attr_bundle *attrs) mr = new_mr; }else {if (cmd.flags &IB_MR_REREG_PD ) { -atomic_dec (&orig_pd->usecnt); - mr->pd = new_pd;atomic_inc (&new_pd->usecnt); +WRITE_ONCE (mr->pd, new_pd); +rdma_restrack_sync (&mr->res); +atomic_dec (&orig_pd->usecnt); }if (cmd.flags &IB_MR_REREG_TRANS ) { mr->iova = cmd.hca_va;
include/rdma/ib_verbs.h +5 -0
@@ -1870,6 +1870,11 @@ struct ib_dmah {struct ib_mr {struct ib_device *device; +/* +* Due to IB_MR_REREG_PD pd is not a fixed pointer and can change. For a +* user MR, this value should only be read from a system call that holds +* the uobject lock, or the driver should disable in-place REREG_PD. +*/ struct ib_pd *pd;u32 lkey;u32 rkey;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 514/1518 RDMA/core: Add rdma_restrack_begin/abort/commit_del() operations
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Patrisious Haddad <[email protected]>
[ Upstream commit 8d186210677c0322db886973bcec9aa4d21b51cd ]
Add rdma_restrack_abort_del(), rdma_restrack_begin_del() and rdma_restrack_commit_del() functions to allow deleting a resource from the xarray to effectively prevent future access to it and wait for all current users to finish while preserving its index in the xarray to allow to re-insert it if needed with guaranteed success.
This is a preparatory change for subsequent patches in the series which will use these functions to fix the cleanup flow.
Stable-dep-of: 709ba0e5311b ("RDMA/core: Fix use after free in ib_query_qp()")
--- drivers/infiniband/core/restrack.c | 165 +++++++++++++++++++++++------ drivers/infiniband/core/restrack.h | 3 + 2 files changed, 135 insertions(+), 33 deletions(-)
drivers/infiniband/core/restrack.c +132 -33
@@ -129,6 +129,46 @@ static void rdma_restrack_attach_task(struct rdma_restrack_entry *res, res->user = true; } +static struct rdma_restrack_root *res_to_rt (struct rdma_restrack_entry *res) +{ +struct ib_device *dev =res_to_dev (res); + +if (WARN_ON (!dev)) +return NULL ; + +return &dev->res[res->type]; +} + +static void restrack_drain_res (struct rdma_restrack_root *rt, +struct rdma_restrack_entry *res) +{ +if (rt) { +struct rdma_restrack_entry *old; + + old =xa_cmpxchg (&rt->xa, res->id, res,XA_ZERO_ENTRY , +GFP_KERNEL ); +WARN_ON (old != res); + } + +rdma_restrack_put (res); +wait_for_completion (&res->comp); +} + +static void restrack_restore_res (struct rdma_restrack_root *rt, +struct rdma_restrack_entry *res) +{ +reinit_completion (&res->comp); +kref_init (&res->kref); + +if (rt) { +struct rdma_restrack_entry *old; + + old =xa_cmpxchg (&rt->xa, res->id,XA_ZERO_ENTRY , res, +GFP_KERNEL ); +WARN_ON (old); + } +} +/** * rdma_restrack_set_name() - set the task for this resource * @res: resource entry
@@ -177,22 +217,23 @@ void rdma_restrack_new(struct rdma_restrack_entry *res,EXPORT_SYMBOL (rdma_restrack_new);/** -* rdma_restrack_add() - add object to the resource tracking database +* rdma_restrack_add() - add object to the resource tracking database. +* If this resource reuses an ID of a resource that was already destroyed +* after calling rdma_restrack_begin() but didn't yet call +* rdma_restrack_commit_del() it can result in an untracked QP. * @res: resource entry */ void rdma_restrack_add (struct rdma_restrack_entry *res) { -struct ib_device *dev =res_to_dev (res);struct rdma_restrack_root *rt;int ret =0 ; -if (!dev) -return ; -if (res->no_track) goto out; - rt = &dev->res[res->type]; + rt =res_to_rt (res); +if (!rt) +return ;if (res->type ==RDMA_RESTRACK_QP ) {/* Special case to ensure that LQPN points to right QP */
@@ -229,6 +270,28 @@ void rdma_restrack_add(struct rdma_restrack_entry *res) }EXPORT_SYMBOL (rdma_restrack_add); +/** +* rdma_restrack_abort_del() - re-add object to the resource tracking database +* it can only be used after rdma_restrack_begin_del(). +* @res: resource entry +*/ +void rdma_restrack_abort_del (struct rdma_restrack_entry *res) +{ +struct rdma_restrack_root *rt =NULL ; + +if (!res->valid) +return ; + +if (!res->no_track) { + rt =res_to_rt (res); +if (!rt) +return ; + } + +restrack_restore_res (rt, res); +} +EXPORT_SYMBOL (rdma_restrack_abort_del); +int __must_check rdma_restrack_get (struct rdma_restrack_entry *res) {return kref_get_unless_zero (&res->kref);
@@ -265,7 +328,7 @@ static void restrack_release(struct kref *kref)struct rdma_restrack_entry *res; res = container_of(kref, struct rdma_restrack_entry, kref); -if (res->task) { +if (res->task && !res->valid) {put_task_struct (res->task); res->task =NULL ; }
@@ -291,37 +354,20 @@ EXPORT_SYMBOL(rdma_restrack_put);*/ void rdma_restrack_sync (struct rdma_restrack_entry *res) { -struct rdma_restrack_entry *old;struct rdma_restrack_root *rt; -struct task_struct *task; -struct ib_device *dev;if (!res->valid || res->no_track)return ; - dev =res_to_dev (res); -if (WARN_ON (!dev)) + rt =res_to_rt (res); +if (!rt)return ; - rt = &dev->res[res->type];if (WARN_ON (xa_get_mark (&rt->xa, res->id,RESTRACK_DD )))return ; - old =xa_cmpxchg (&rt->xa, res->id, res,XA_ZERO_ENTRY ,GFP_KERNEL ); -if (WARN_ON (old != res)) -return ; - - task = res->task; -if (task) -get_task_struct (task); -rdma_restrack_put (res); -wait_for_completion (&res->comp); -reinit_completion (&res->comp); -if (task) - res->task = task; -kref_init (&res->kref); - -xa_cmpxchg (&rt->xa, res->id,XA_ZERO_ENTRY , res,GFP_KERNEL ); +restrack_drain_res (rt, res); +restrack_restore_res (rt, res); }EXPORT_SYMBOL (rdma_restrack_sync);
@@ -333,7 +379,6 @@ void rdma_restrack_del(struct rdma_restrack_entry *res) {struct rdma_restrack_entry *old;struct rdma_restrack_root *rt; -struct ib_device *dev;if (!res->valid) {if (res->task) {
@@ -346,12 +391,10 @@ void rdma_restrack_del(struct rdma_restrack_entry *res)if (res->no_track) goto out; - dev =res_to_dev (res); -if (WARN_ON (!dev)) + rt =res_to_rt (res); +if (!rt)return ; - rt = &dev->res[res->type]; - old =xa_erase (&rt->xa, res->id);WARN_ON (old != res);
@@ -359,5 +402,61 @@ void rdma_restrack_del(struct rdma_restrack_entry *res) res->valid = false;rdma_restrack_put (res);wait_for_completion (&res->comp); +if (res->task) { +put_task_struct (res->task); + res->task =NULL ; + } }EXPORT_SYMBOL (rdma_restrack_del); + +/** +* rdma_restrack_begin_del() - invalidate the object from the resource tracking +* database but preserve its index in the array. +* Since this preserves the index in the array until rdma_restrack_commit_del() +* is called, if rdma_restrack_add() is called in between with an old QP ID it +* can result in an untracked QP. +* @res: resource entry +*/ +void rdma_restrack_begin_del (struct rdma_restrack_entry *res) +{ +struct rdma_restrack_root *rt =NULL ; + +if (!res->valid) +return ; + +if (!res->no_track) { + rt =res_to_rt (res); +if (!rt) +return ; + } + +restrack_drain_res (rt, res); +} +EXPORT_SYMBOL (rdma_restrack_begin_del); + +/** +* rdma_restrack_commit_del() - delete object from the resource tracking +* database and free the task. +* @res: resource entry +*/ +void rdma_restrack_commit_del (struct rdma_restrack_entry *res) +{ +struct rdma_restrack_root *rt; + +if (!res->valid || res->no_track) + goto out; + + rt =res_to_rt (res); +if (!rt) +return ; + +xa_erase (&rt->xa, res->id); + +out: + res->valid = false; +if (res->task) { +put_task_struct (res->task); + res->task =NULL ; + } +} +EXPORT_SYMBOL (rdma_restrack_commit_del);
drivers/infiniband/core/restrack.h +3 -0
@@ -26,8 +26,11 @@ struct rdma_restrack_root {int rdma_restrack_init (struct ib_device *dev);void rdma_restrack_clean (struct ib_device *dev);void rdma_restrack_add (struct rdma_restrack_entry *res); +void rdma_restrack_abort_del (struct rdma_restrack_entry *res);void rdma_restrack_del (struct rdma_restrack_entry *res);void rdma_restrack_sync (struct rdma_restrack_entry *res); +void rdma_restrack_begin_del (struct rdma_restrack_entry *res); +void rdma_restrack_commit_del (struct rdma_restrack_entry *res);void rdma_restrack_new (struct rdma_restrack_entry *res,enum rdma_restrack_type type); void rdma_restrack_set_name(struct rdma_restrack_entry *res,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 515/1518 RDMA/core: Fix use after free in ib_query_qp()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Patrisious Haddad <[email protected]>
[ Upstream commit 709ba0e5311bd034eb4d9c1c00cc4e1109d6dc3e ]
When querying a QP via the netlink flow the only synchronization mechanism for the said QP is rdma_restrack_get(), meanwhile during the QP destroy path rdma_restrack_del() is called at the end of the ib_destroy_qp_user() function which is too late, since by then the vendor specific resources for said QP would already be destroyed, and till the rdma_restrack_del() is called this QP can still be accessed, which could cause the use after free below.
Fix this by moving the rdma_restrack_begin_del() to the start of the ib_destroy_qp_user(), which in turn waits for all usages of the QP to be done then removes it from the database to prevent access to it while it is being destroyed.
RIP: 0010:ib_query_qp+0x15/0x50 [ib_core] Code: 48 83 05 5d 8e b9 ff 01 eb b5 66 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 48 c7 46 40 00 00 00 00 48 c7 46 78 00 00 00 00 <48> 8b 07 48 8b 80 88 01 00 00 48 85 c0 74 1a 48 83 05 54 91 b9 ff RSP: 0018:ff11000108a8f2f0 EFLAGS: 00010202 RAX: 0000000000000000 RBX: ff11000108a8f370 RCX: ff11000108a8f370 RDX: 0000000000000000 RSI: ff11000108a8f3d8 RDI: 0000000000000000 RBP: ff1100010de5a000 R08: 0000000000000e80 R09: 0000000000000004 R10: ff110001057a604c R11: 0000000000000000 R12: ff11000108a8f370 R13: ff110001090e8000 R14: 0000000000000000 R15: ff110001057a602c FS: 00007f2ffd8db6c0(0000) GS:ff110008dc90b000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000000 CR3: 000000010b9a7004 CR4: 0000000000373eb0 Call Trace: <TASK> mlx5_ib_gsi_query_qp+0x21/0x50 [mlx5_ib] mlx5_ib_query_qp+0x689/0x9d0 [mlx5_ib] ib_query_qp+0x35/0x50 [ib_core] fill_res_qp_entry_query.isra.0+0x47/0x280 [ib_core] ? __wake_up+0x40/0x50 ? netlink_broadcast_filtered+0x15a/0x550 ? kobject_uevent_env+0x562/0x710 ? ep_poll_callback+0x242/0x270 ? __nla_put+0xc/0x20 ? nla_put+0x28/0x40 ? nla_put_string+0x2e/0x40 [ib_core] fill_res_qp_entry+0x138/0x190 [ib_core] res_get_common_dumpit+0x4a5/0x800 [ib_core] ? fill_res_qp_entry_query.isra.0+0x280/0x280 [ib_core] nldev_res_get_qp_dumpit+0x1e/0x30 [ib_core] netlink_dump+0x16f/0x450 __netlink_dump_start+0x1ce/0x2e0 rdma_nl_rcv_msg+0x1d3/0x330 [ib_core] ? nldev_res_get_qp_raw_dumpit+0x30/0x30 [ib_core] rdma_nl_rcv_skb.constprop.0.isra.0+0x108/0x180 [ib_core] rdma_nl_rcv+0x12/0x20 [ib_core] netlink_unicast+0x255/0x380 ? __alloc_skb+0xfa/0x1e0 netlink_sendmsg+0x1f3/0x420 __sock_sendmsg+0x38/0x60 ____sys_sendmsg+0x1e8/0x230 ? copy_msghdr_from_user+0xea/0x170 ___sys_sendmsg+0x7c/0xb0 ? __futex_wait+0x95/0xf0 ? __futex_wake_mark+0x40/0x40 ? futex_wait+0x67/0x100 ? futex_wake+0xac/0x1b0 __sys_sendmsg+0x5f/0xb0 do_syscall_64+0x55/0xb90 entry_SYSCALL_64_after_hwframe+0x4b/0x53
--- drivers/infiniband/core/verbs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/infiniband/core/verbs.c +4 -1
@@ -2098,6 +2098,8 @@ int ib_destroy_qp_user(struct ib_qp *qp, struct ib_udata *udata)if (qp->real_qp != qp)return __ib_destroy_shared_qp (qp); +rdma_restrack_begin_del (&qp->res); + sec = qp->qp_sec;if (sec)ib_destroy_qp_security_begin (sec);
@@ -2110,6 +2112,7 @@ int ib_destroy_qp_user(struct ib_qp *qp, struct ib_udata *udata)if (ret) {if (sec)ib_destroy_qp_security_abort (sec); +rdma_restrack_abort_del (&qp->res);return ret; }
@@ -2122,7 +2125,7 @@ int ib_destroy_qp_user(struct ib_qp *qp, struct ib_udata *udata)if (sec)ib_destroy_qp_security_end (sec); -rdma_restrack_del (&qp->res); +rdma_restrack_commit_del (&qp->res);kfree (qp);return ret; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 516/1518 RDMA/core: Fix potential use after free in ib_destroy_cq_user()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Patrisious Haddad <[email protected]>
[ Upstream commit 3481bec4dfc4aee24ffea5a547ee95b70b67d9d5 ]
When accessing a CQ via the netlink path the only synchronization mechanism for the said CQ is rdma_restrack_get(). Currently, rdma_restrack_del() is invoked at the end of ib_destroy_cq_user(), which is too late, since by that point vendor-specific resources associated with the CQ might already be freed. This can leave a short window where the CQ remains accessible through restrack, leading to a potential use-after-free.
Fix this by moving the rdma_restrack_begin_del() call to the start of ib_destroy_cq_user(), ensuring that the CQ is removed from restrack before its internal resources are released. This guarantees that no new users hold references to a CQ that is in the process of destruction.
In addition, this change preserves the intended inverted order between create and destroy routines: resources are added to restrack at the end of successful creation, and hence shall be removed from the restrack first thing during the destruction flow, which keeps the lifecycle management consistent and predictable.
--- drivers/infiniband/core/verbs.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/infiniband/core/verbs.c +6 -2
@@ -2190,11 +2190,15 @@ int ib_destroy_cq_user(struct ib_cq *cq, struct ib_udata *udata)if (atomic_read (&cq->usecnt))return -EBUSY ; +rdma_restrack_begin_del (&cq->res); + ret = cq->device->ops.destroy_cq (cq, udata); -if (ret) +if (ret) { +rdma_restrack_abort_del (&cq->res);return ret; + } -rdma_restrack_del (&cq->res); +rdma_restrack_commit_del (&cq->res);kfree (cq);return ret; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 517/1518 RDMA/core: Fix potential use after free in ib_destroy_srq_user()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Patrisious Haddad <[email protected]>
[ Upstream commit 88244ecc71cc0b3ed200f5ef7ddea6686adfd730 ]
When accessing a SRQ via the netlink path the only synchronization mechanism for the said SRQ is rdma_restrack_get(). Currently, rdma_restrack_del() is invoked at the end of ib_destroy_srq_user(), which is too late, since by that point vendor-specific resources associated with the SRQ might already be freed. This can leave a short window where the SRQ remains accessible through restrack, leading to a potential use-after-free.
Fix this by moving the rdma_restrack_begin_del() call to the start of ib_destroy_srq_user(), ensuring that the SRQ is removed from restrack before its internal resources are released. This guarantees that no new users hold references to a SRQ that is in the process of destruction.
In addition, this change preserves the intended inverted order between create and destroy routines: resources are added to restrack at the end of successful creation, and hence shall be removed from the restrack first thing during the destruction flow, which keeps the lifecycle management consistent and predictable.
--- drivers/infiniband/core/verbs.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/infiniband/core/verbs.c +6 -2
@@ -1083,16 +1083,20 @@ int ib_destroy_srq_user(struct ib_srq *srq, struct ib_udata *udata)if (atomic_read (&srq->usecnt))return -EBUSY ; +rdma_restrack_begin_del (&srq->res); + ret = srq->device->ops.destroy_srq (srq, udata); -if (ret) +if (ret) { +rdma_restrack_abort_del (&srq->res);return ret; + }atomic_dec (&srq->pd->usecnt);if (srq->srq_type ==IB_SRQT_XRC && srq->ext.xrc.xrcd)atomic_dec (&srq->ext.xrc.xrcd->usecnt);if (ib_srq_has_cq (srq->srq_type))atomic_dec (&srq->ext.cq->usecnt); -rdma_restrack_del (&srq->res); +rdma_restrack_commit_del (&srq->res);kfree (srq);return ret;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 518/1518 RDMA/core: Fix potential use after free in counter_release()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Patrisious Haddad <[email protected]>
[ Upstream commit 235ef2d0e750885c29340b0fc40620a7a4f52e12 ]
When accessing a counter via the netlink path the only synchronization mechanism for the said counter is rdma_restrack_get(). Currently, rdma_restrack_del() is invoked at the end of counter_release(), which is too late, since by that point vendor-specific resources associated with the counter might already be freed. This can leave a short window where the counter remains accessible through restrack, leading to a potential use-after-free.
Fix this by moving the rdma_restrack_del() call to be before the freeing of the vendor-specific resources, ensuring that the counter is removed from restrack before its internal resources are released. This guarantees that no new users hold references to a counter that is in the process of destruction.
--- drivers/infiniband/core/counters.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/infiniband/core/counters.c +3 -2
@@ -226,7 +226,6 @@ static void rdma_counter_free(struct rdma_counter *counter)mutex_unlock (&port_counter->lock); -rdma_restrack_del (&counter->res);rdma_free_hw_stats_struct (counter->stats);kfree (counter); }
@@ -321,6 +320,7 @@ static void counter_release(struct kref *kref) counter = container_of(kref, struct rdma_counter, kref);counter_history_stat_update (counter); +rdma_restrack_del (&counter->res); counter->device->ops.counter_dealloc (counter);rdma_counter_free (counter); }
@@ -482,7 +482,8 @@ static struct rdma_counter *rdma_get_counter_by_id(struct ib_device *dev,return NULL ; counter = container_of(res, struct rdma_counter, res); -kref_get (&counter->kref); +if (!kref_get_unless_zero (&counter->kref)) + counter =NULL ;rdma_restrack_put (res);return counter;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 519/1518 RDMA/core: Fix potential use after free in ib_free_cq()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Patrisious Haddad <[email protected]>
[ Upstream commit 29dc2f8e1c97372c2871a70088707933515fbd5b ]
When accessing a CQ via the netlink path the only synchronization mechanism for the said CQ is rdma_restrack_get(). Currently, rdma_restrack_del() is invoked at the end of ib_free_cq(), which is too late, since by that point vendor-specific resources associated with the CQ might already be freed. This can leave a short window where the CQ remains accessible through restrack, leading to a potential use-after-free.
Fix this by moving the rdma_restrack_del() call to be before the freeing of the vendor-specific resources ensuring that the CQ is removed from restrack before its internal resources are released.
This guarantees that no new users hold references to a CQ that is in the process of destruction.
--- drivers/infiniband/core/cq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/core/cq.c +1 -1
@@ -324,6 +324,7 @@ void ib_free_cq(struct ib_cq *cq)if (WARN_ON_ONCE (cq->cqe_used))return ; +rdma_restrack_del (&cq->res);if (cq->device->ops.pre_destroy_cq) { ret = cq->device->ops.pre_destroy_cq (cq);WARN_ONCE (ret,"Disable of kernel CQ shouldn't fail" );
@@ -350,7 +351,6 @@ void ib_free_cq(struct ib_cq *cq)else ret = cq->device->ops.destroy_cq (cq,NULL );WARN_ONCE (ret,"Destroy of kernel CQ shouldn't fail" ); -rdma_restrack_del (&cq->res);kfree (cq->wc);kfree (cq); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 520/1518 RDMA/core: Fix potential use after free in uverbs_free_dmah()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Patrisious Haddad <[email protected]>
[ Upstream commit 2696626a0be5877f445fb647c25ef43930c777e6 ]
When accessing a dmah via the netlink path the only synchronization mechanism for the said dmah is rdma_restrack_get(). Currently, rdma_restrack_del() is invoked at the end of uverbs_free_dmah(), which is too late, since by that point vendor-specific resources associated with the dmah might already be freed. This can leave a short window where the dmah remains accessible through restrack, leading to a potential use-after-free.
Fix this by moving the rdma_restrack_begin_del() call to the start of uverbs_free_dmah(), ensuring that the dmah is removed from restrack before its internal resources are released. This guarantees that no new users hold references to a dmah that is in the process of destruction.
In addition, this change preserves the intended inverted order between create and destroy routines: resources are added to restrack at the end of successful creation, and hence shall be removed from the restrack first thing during the destruction flow, which keeps the lifecycle management consistent and predictable.
--- drivers/infiniband/core/uverbs_std_types_dmah.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/infiniband/core/uverbs_std_types_dmah.c +5 -2
@@ -18,11 +18,14 @@ static int uverbs_free_dmah(struct ib_uobject *uobject,if (atomic_read (&dmah->usecnt))return -EBUSY ; +rdma_restrack_begin_del (&dmah->res); ret = dmah->device->ops.dealloc_dmah (dmah, attrs); -if (ret) +if (ret) { +rdma_restrack_abort_del (&dmah->res);return ret; + } -rdma_restrack_del (&dmah->res); +rdma_restrack_commit_del (&dmah->res);kfree (dmah);return 0 ; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 521/1518 RDMA/core: Fix potential use after free in ib_dealloc_pd_user()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Patrisious Haddad <[email protected]>
[ Upstream commit 8b90e701342275f414e36e7421c502237df241ad ]
When accessing a PD via the netlink path the only synchronization mechanism for the said PD is rdma_restrack_get(). Currently, rdma_restrack_del() is invoked at the end of ib_dealloc_pd_user(), which is too late, since by that point vendor-specific resources associated with the PD might already be freed. This can leave a short window where the PD remains accessible through restrack, leading to a potential use-after-free.
Fix this by moving the rdma_restrack_begin_del() call to the start of ib_dealloc_pd_user(), ensuring that the PD is removed from restrack before its internal resources are released. This guarantees that no new users hold references to a PD that is in the process of destruction.
In addition, this change preserves the intended inverted order between create and destroy routines: resources are added to restrack at the end of successful creation, and hence shall be removed from the restrack first thing during the destruction flow, which keeps the lifecycle management consistent and predictable.
--- drivers/infiniband/core/verbs.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/infiniband/core/verbs.c +5 -2
@@ -335,6 +335,7 @@ int ib_dealloc_pd_user(struct ib_pd *pd, struct ib_udata *udata) {int ret; +rdma_restrack_begin_del (&pd->res);if (pd->__internal_mr) { ret = pd->device->ops.dereg_mr (pd->__internal_mr,NULL );WARN_ON (ret);
@@ -342,10 +343,12 @@ int ib_dealloc_pd_user(struct ib_pd *pd, struct ib_udata *udata) } ret = pd->device->ops.dealloc_pd (pd, udata); -if (ret) +if (ret) { +rdma_restrack_abort_del (&pd->res);return ret; + } -rdma_restrack_del (&pd->res); +rdma_restrack_commit_del (&pd->res);kfree (pd);return ret; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 522/1518 firmware: arm_scmi: Fix requested device removal race
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sudeep Holla <[email protected]>
[ Upstream commit 2c4097e6c4aed276c5e9ec2ab331ab397ea780bf ]
scmi_protocol_device_unrequest() drops scmi_requested_devices_mtx while notifying listeners but continues to retain the per-protocol list head. When two SCMI drivers for the same protocol unregister concurrently, one thread can remove the final request and free the list head while the other is running its notifier. The latter then dereferences the freed list head after reacquiring the mutex and can free it a second time.
Complete the list and IDR updates, including freeing an empty list head, before dropping the mutex. Keep the blocking notifier outside the critical section and retain only the detached request across the callback.
--- drivers/firmware/arm_scmi/bus.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
drivers/firmware/arm_scmi/bus.c +13 -13
@@ -159,6 +159,7 @@ static int scmi_protocol_table_register(const struct scmi_device_id *id_table)*/ static void scmi_protocol_device_unrequest (const struct scmi_device_id *id_table) { +struct scmi_requested_dev *rdev, *victim =NULL ;struct list_head *phead; pr_debug("Unrequesting SCMI device (%s) for protocol %x\n",
@@ -167,29 +168,28 @@ static void scmi_protocol_device_unrequest(const struct scmi_device_id *id_tablemutex_lock (&scmi_requested_devices_mtx); phead =idr_find (&scmi_requested_devices, id_table->protocol_id);if (phead) { -struct scmi_requested_dev *victim, *tmp; - -list_for_each_entry_safe (victim, tmp, phead, node) { -if (!strcmp (victim->id_table->name, id_table->name)) { -list_del (&victim->node); - -mutex_unlock (&scmi_requested_devices_mtx); -blocking_notifier_call_chain (&scmi_requested_devices_nh, -SCMI_BUS_NOTIFY_DEVICE_UNREQUEST , - (void *)victim->id_table); -kfree (victim); -mutex_lock (&scmi_requested_devices_mtx); +list_for_each_entry (rdev, phead, node) { +if (!strcmp (rdev->id_table->name, id_table->name)) { + victim = rdev; +list_del (&rdev->node);break ; } } -if (list_empty (phead)) { +if (victim &&list_empty (phead)) {idr_remove (&scmi_requested_devices, id_table->protocol_id);kfree (phead); } }mutex_unlock (&scmi_requested_devices_mtx); + +if (victim) { +blocking_notifier_call_chain (&scmi_requested_devices_nh, +SCMI_BUS_NOTIFY_DEVICE_UNREQUEST , + (void *)victim->id_table); +kfree (victim); + } } static void
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 523/1518 iommu/amd: Fix undefined behavior in devid_write debugfs function
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Li RongQing <[email protected]>
[ Upstream commit 843e149989665f8309ad2efe6048dc76591e1f94 ]
When for_each_pci_segment() loop completes without finding a matching segment, the pci_seg pointer is not NULL but points to an invalid memory location (the list head). Accessing pci_seg->id after the loop causes undefined behavior.
Fix this by handling the successful case inside the loop and returning -EINVAL after the loop if no matching segment is found.
--- drivers/iommu/amd/debugfs.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)
drivers/iommu/amd/debugfs.c +3 -9
@@ -176,19 +176,13 @@ static ssize_t devid_write(struct file *filp, const char __user *ubuf,kfree (srcid_ptr);return -ENODEV ; } -break ; - } - -if (pci_seg->id != seg) { + sbdf =PCI_SEG_DEVID_TO_SBDF (seg, devid);kfree (srcid_ptr); -return -EINVAL ; +return cnt; } - sbdf =PCI_SEG_DEVID_TO_SBDF (seg, devid); -kfree (srcid_ptr); - -return cnt; +return -EINVAL ; }static int devid_show (struct seq_file *m,void *unused)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 524/1518 iommu/qcom: Remove sysfs device on probe failure path
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Haoxiang Li <[email protected]>
[ Upstream commit c579f18e79599c16168925cb149e1db3f29eea5f ]
In qcom_iommu_device_probe(), if iommu_device_register() fails, the sysfs device created by iommu_device_sysfs_add() is not released. Add a goto label to do the cleanup.
--- drivers/iommu/arm/arm-smmu/qcom_iommu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/iommu/arm/arm-smmu/qcom_iommu.c +3 -1
@@ -858,7 +858,7 @@ static int qcom_iommu_device_probe(struct platform_device *pdev) ret =iommu_device_register (&qcom_iommu->iommu, &qcom_iommu_ops, dev);if (ret) {dev_err (dev,"Failed to register iommu\n" ); - goto err_pm_disable; + goto err_sysfs_remove; }if (qcom_iommu->local_base) {
@@ -869,6 +869,8 @@ static int qcom_iommu_device_probe(struct platform_device *pdev)return 0 ; +err_sysfs_remove: +iommu_device_sysfs_remove (&qcom_iommu->iommu); err_pm_disable:pm_runtime_disable (dev);return ret;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 525/1518 iommu/qcom: Fix inverted fault report check in qcom_iommu_fault()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mukesh Ojha <[email protected]>
[ Upstream commit 1f33b8208a1978b0c0d6ad60a47fe4bb7a235e58 ]
report_iommu_fault() returns 0 when a fault handler successfully handles the fault, and -ENOSYS when no handler is installed. The condition '!report_iommu_fault()' evaluates to true (printing "Unhandled context fault") precisely when the fault *was* handled, and stays silent when no handler is present — the opposite of what is intended.
Remove the '!' so the driver logs unhandled faults correctly.
--- drivers/iommu/arm/arm-smmu/qcom_iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/arm/arm-smmu/qcom_iommu.c +1 -1
@@ -200,7 +200,7 @@ static irqreturn_t qcom_iommu_fault(int irq, void *dev) fsynr =iommu_readl (ctx,ARM_SMMU_CB_FSYNR0 ); iova =iommu_readq (ctx,ARM_SMMU_CB_FAR ); -if (!report_iommu_fault (ctx->domain, ctx->dev, iova,0 )) { +if (report_iommu_fault (ctx->domain, ctx->dev, iova,0 )) { dev_err_ratelimited(ctx->dev, "Unhandled context fault: fsr=0x%x, " "iova=0x%016llx, fsynr=0x%x, cb=%d\n",
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 526/1518 iommu/arm-smmu-v3: Declare eats_s1chk and eats_trans as host-endian u64
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicolin Chen <[email protected]>
[ Upstream commit 4455286274474e95f223c68c215d32c864404889 ]
arm_smmu_get_ste_update_safe() declares the eats_s1chk and eats_trans locals as __le64, but initializes them from FIELD_PREP(), which returns a host-endian value, and passes them through cpu_to_le64() at the use sites.
Sparse reports the following warnings:
Quoted 1 line
Quoted 1 line
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c:1122:38: sparse: sparse: cast from restricted__le64
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c:1124:33: sparse: sparse: cast from restricted __le64
Declare both locals as u64 so the type matches FIELD_PREP() and the existing cpu_to_le64() at the use sites performs the host-to-little-endian conversion. No functional change.
--- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +2 -2
@@ -1097,9 +1097,9 @@ VISIBLE_IF_KUNITvoid arm_smmu_get_ste_update_safe (const __le64 *cur,const __le64 *target,__le64 *safe_bits) { -const __le64 eats_s1chk = +const u64 eats_s1chk =FIELD_PREP (STRTAB_STE_1_EATS ,STRTAB_STE_1_EATS_S1CHK ); -const __le64 eats_trans = +const u64 eats_trans =FIELD_PREP (STRTAB_STE_1_EATS ,STRTAB_STE_1_EATS_TRANS );/*
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 527/1518 thermal: intel: int3400: clean up ODVP on probe failures
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pengpeng Hou <[email protected]>
[ Upstream commit d83dc9ce57a746a6dca28439bcc0575d26fa6986 ]
evaluate_odvp() creates per-ODVP sysfs files before the thermal zone and later probe resources are registered. The current unwind path only calls cleanup_odvp() from the late sysfs failure path, so failures after evaluate_odvp() but before that label, including thermal_tripless_zone_device_register() failures, leave the ODVP files and storage behind.
Move the ODVP cleanup to the common ART/TRT unwind path so every failure after evaluate_odvp() releases the ODVP state. Also clear the cached ODVP pointers in cleanup_odvp(), because evaluate_odvp() can already call it for partial setup failures while probe continues.
--- drivers/thermal/intel/int340x_thermal/int3400_thermal.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +3 -1
@@ -354,8 +354,10 @@ static void cleanup_odvp(struct int3400_thermal_priv *priv)kfree (priv->odvp_attrs[i].attr.attr.name); }kfree (priv->odvp_attrs); + priv->odvp_attrs =NULL ; }kfree (priv->odvp); + priv->odvp =NULL ; priv->odvp_count =0 ; }
@@ -635,7 +637,6 @@ static int int3400_thermal_probe(struct platform_device *pdev)acpi_remove_notify_handler (priv->adev->handle,ACPI_DEVICE_NOTIFY , int3400_notify); free_sysfs: -cleanup_odvp (priv);if (!ZERO_OR_NULL_PTR (priv->data_vault)) {device_remove_bin_file (&pdev->dev, &bin_attr_data_vault);kfree (priv->data_vault);
@@ -649,6 +650,7 @@ static int int3400_thermal_probe(struct platform_device *pdev)acpi_thermal_rel_misc_device_remove (priv->adev->handle);thermal_zone_device_unregister (priv->thermal); free_art_trt: +cleanup_odvp (priv);kfree (priv->trts);kfree (priv->arts); free_priv:
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 528/1518 ext4: clear stale xarray tags on folios skipped during writeback
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gerald Yang <[email protected]>
[ Upstream commit ec524aae479b4b2078c47492b90ec21200bce434 ]
In data=journal mode, the writeback thread can hit the WARN_ON_ONCE(sb_rdonly(sb)) in ext4_journal_check_start() while the superblock is being remounted read-only during reboot:
Workqueue: writeback wb_workfn (flush-253:0) RIP: 0010:ext4_journal_check_start+0x8b/0xd0 Call Trace: __ext4_journal_start_sb+0x3c/0x1e0 mpage_prepare_extent_to_map+0x4af/0x580 ext4_do_writepages+0x3c0/0x1080 ext4_writepages+0xc8/0x1a0 do_writepages+0xc4/0x180 __writeback_single_inode+0x45/0x2f0 writeback_sb_inodes+0x26b/0x5d0 __writeback_inodes_wb+0x54/0x100 wb_writeback+0x1ac/0x320 wb_workfn+0x394/0x470
And followed by the warning:
EXT4-fs warning (device vda1): ext4_evict_inode:195: inode #6263:
comm (sd-umount): data will be lost
This issue is not reproduced every time, but frequently.
The reproduction step is to create a VM with 8 CPUs, 16G memory and setup data=journal:
sudo tune2fs -o journal_data /dev/vda1
Run fio:
rm -f fiotest
fio --name=fiotest --rw=randwrite --bs=4k --runtime=6 --ioengine=libaio --iodepth=256 --numjobs=8 --filename=fiotest --filesize=30G --group_reporting
Reboot the VM, and check the console output from:
virsh console testvm
But there is no dirty inode, folio_clear_dirty_for_io clears PG_dirty but leaves tags PAGECACHE_TAG_DIRTY and PAGECACHE_TAG_TOWRITE set which are only cleared by __folio_start_writeback.
In data=journal mode, jbd2 checkpoints the journalled data to its final location and clears its own dirty flag without touching folio PG_dirty or xarray dirty flags.
The commit f4a2b42e7891 ("ext4: fix stale xarray tags after writeback") fixes when PG_dirty is still set but there is no dirty page. Another case is PG_dirty is cleared, but PAGECACHE_TAG_DIRTY and PAGECACHE_TAG_TOWRITE is still set. In this case, writeback thread checks clean folio and skips it in mpage_prepare_extent_to_map:
if (!folio_test_dirty(folio) ||
...
folio_unlcok(folio);
continueAnd never reaches ext4_bio_write_folio where the commit f4a2b42e7891 clears the stale xarray tags. Print debug logs after the filesystem is remounted read-only:
writepages RDONLY nrpages=2048 dirtytag=1 wbtag=0 towrite=1 sync=0 And all folios are actually clean:
folio idx=3 dirty=0 wb=0 checked=0 dirtybuf=0 jbddirty=0 mapped=1
...
We need to clear the xarray stale tags for such clean folios by cycling them through writeback in the skip path, the same way f4a2b42e7891 does in ext4_bio_write_folio.
--- fs/ext4/inode.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
fs/ext4/inode.c +15 -3
@@ -2687,13 +2687,25 @@ static int mpage_prepare_extent_to_map(struct mpage_da_data *mpd)* page is already under writeback and we are not doing * a data integrity writeback, skip the page */ -if (!folio_test_dirty (folio) || - (folio_test_writeback (folio) && - (mpd->wbc->sync_mode ==WB_SYNC_NONE )) || +if ((folio_test_writeback (folio) && + mpd->wbc->sync_mode ==WB_SYNC_NONE ) ||unlikely (folio->mapping != mapping)) {folio_unlock (folio);continue ; } +/* +* If the folio is clean, skip writing it back. +* Cycle the folio through the writeback state +* though, to clear stale xarray tags. +*/ +if (!folio_test_dirty (folio)) { +if (!folio_test_writeback (folio)) { +__folio_start_writeback (folio, false); +folio_end_writeback (folio); + } +folio_unlock (folio); +continue ; + }folio_wait_writeback (folio);BUG_ON (folio_test_writeback (folio));
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 529/1518 ext4: drain in-flight DIO before buffered write fallback
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baokun Li <[email protected]>
[ Upstream commit 15cdefd0c0522f9d5e12d947fa04f4c11649b699 ]
generic/746 started failing intermittently on ext3 (no-extent inodes). The test triggers 'Page cache invalidation failure on direct I/O' warnings and subsequent fsync returns -EIO. Adding a 50ms delay between ext4_buffered_write_iter() and filemap_write_and_wait_range() in ext4_dio_write_iter() makes the race almost always reproducible.
On no-extent inodes, DIO writes to holes cannot use unwritten extents, so ext4_iomap_alloc() leaves m_flags=0 and ext4_map_blocks() returns 0. The iomap layer then returns -ENOTBLK, causing fallback to buffered I/O.
The fallback path in ext4_dio_write_iter() calls ext4_buffered_write_iter() which dirties pages, then does flush and invalidate. However, there's an unprotected window between ext4_buffered_write_iter() returning (with inode lock released) and the subsequent flush+invalidate.
Concurrent async DIO completions from other threads can run kiocb_invalidate_post_direct_write() during this window. If pages have been re-dirtied, post-invalidation finds dirty pages and triggers the warning, setting -EIO in the error sequence.
Consider a file with two 4k extents: [hole][written]. Thread A does DIO to the written extent, while thread B does DIO spanning both:
kworker A (4k DIO, allocated block) kworker B (8k DIO, fallback)
----------------------------------- ----------------------------
inode_lock_shared() inode_lock_shared()
iomap_dio_rw(): iomap_dio_rw():
kiocb_invalidate_pages -> clean iomap_begin -> -ENOTBLK
submit_bio (async) dio->size = 0 inode_unlock_shared() inode_unlock_shared()
[bio pending in block layer] /* fallback: lock released */
ext4_buffered_write_iter()
inode_lock(exclusive)
generic_perform_write()
-> dirty pages [0, 8k]
inode_unlock(exclusive)
/* pages dirty, no lock */
[bio completes] filemap_write_and_wait_range()
iomap_dio_complete() -> flush dirty pages
kiocb_invalidate_post_direct_write() invalidate_mapping_pages()
invalidate_inode_pages2_range()
-> finds dirty page!
-> dio_warn_stale_pagecache()
-> errseq_set(-EIO)This issue can be triggered through normal I/O paths, not just intentionally overlapping DIO writes from userspace. For example, generic/746 uses a loop device where multiple kworkers issue concurrent I/O to the backing file. Additionally, when block_size < folio_size, non-overlapping DIO writes that share a large folio can also trigger the race.
Add inode_dio_wait() in ext4_buffered_write_iter() before ext4_write_checks() to drain all in-flight DIO. This ensures that all DIO clears existing pages before submitting IO (via kiocb_invalidate_pages()), all BIO waits for all DIO to complete (via inode_dio_wait()), and ext4_write_checks() observes the inode size after all completed DIO so that ext4_block_zero_eof() does not race with in-flight DIO, thus eliminating the race.
--- fs/ext4/file.c | 7 +++++++ 1 file changed, 7 insertions(+)
fs/ext4/file.c +7 -0
@@ -292,6 +292,13 @@ static ssize_t ext4_buffered_write_iter(struct kiocb *iocb,return -EOPNOTSUPP ;inode_lock (inode); + +/* +* Prevent concurrent direct I/O and buffered I/O to the same file +* range. Wait for in-flight DIO to finish before dirtying pages. +*/ +inode_dio_wait (inode); + ret =ext4_write_checks (iocb, from);if (ret <=0 ) goto out;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 530/1518 ext4: use fsdata to track inline data write state and fix race
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aditya Prakash Srivastava <[email protected]>
[ Upstream commit 7edbb323bab2b2a609016014caafdb651c898249 ]
Instead of checking the live inode state (ext4_has_inline_data(inode) and ext4_test_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA)) in the write_end handlers, use the fsdata parameter of the address space operations to explicitly pass down the state in which write_begin prepared the write.
A concurrent thread (such as ext4_page_mkwrite()) can convert the inline data to an extent between write_begin and write_end. If this happens, the write_end handlers would previously miss the inline write_end path and fall through to extent-based write_end logic. However, since block buffers were never allocated in write_begin, this resulted in NULL pointer dereferences or data loss because folio_buffers(folio) was NULL.
Define EXT4_WRITE_DATA_INLINE (4) as a bit flag (Bit 2), treating fsdata as bitwise flags rather than mutually exclusive enums to keep states of the write path independent. Communicate this state via fsdata:
1) ext4_write_begin() and ext4_da_write_begin() set the EXT4_WRITE_DATA_INLINE bit in *fsdata via bitwise OR when an inline write is successfully prepared.
2) On entry, ext4_write_begin() clears the EXT4_WRITE_DATA_INLINE bit to safely handle VFS retries (where generic_perform_write() bypasses the fsdata initialization on its retry jump).
3) The write_end handlers perform a bitwise AND to check if the EXT4_WRITE_DATA_INLINE bit is set and invoke the inline write_end helper accordingly.
Furthermore, during a buffered write, ext4_write_inline_data_end() acquires the xattr lock after preparing the write. If a concurrent page fault (ext4_page_mkwrite()) converts the inline data to an extent after the write_end handlers check the state but before ext4_write_inline_data_end() acquires the xattr write lock, the subsequent check will trigger a kernel panic via BUG_ON(!ext4_has_inline_data(inode)).
To keep git history working and bisectability clean, replace the BUG_ON check in ext4_write_inline_data_end() with a graceful error- handling retry path in this same commit. If the inline data is cleared after locking the xattr, we safely release all resources (releasing iloc.bh, unlocking/putting the folio, stopping the active journal transaction handle) and return 0 (VFS retry) to let the generic write path retry the operation safely.
--- fs/ext4/ext4.h | 1 + fs/ext4/inline.c | 14 +++++++++++++- fs/ext4/inode.c | 24 +++++++++++++----------- 3 files changed, 27 insertions(+), 12 deletions(-)
fs/ext4/ext4.h +1 -0
@@ -3074,6 +3074,7 @@ int do_journal_get_write_access(handle_t *handle, struct inode *inode,void ext4_set_inode_mapping_order (struct inode *inode);#define FALL_BACK_TO_NONDELALLOC 1#define CONVERT_INLINE_DATA 2 +#define EXT4_WRITE_DATA_INLINE 4 typedef enum { EXT4_IGET_NORMAL = 0,
fs/ext4/inline.c +13 -1
@@ -812,7 +812,19 @@ int ext4_write_inline_data_end(struct inode *inode, loff_t pos, unsigned len, goto out; }ext4_write_lock_xattr (inode, &no_expand); -BUG_ON (!ext4_has_inline_data (inode)); +/* +* We could have raced with ext4_page_mkwrite() converting +* the inode and clearing the inline data flag, so we just +* release resources and retry the whole write. +*/ +if (unlikely (!ext4_has_inline_data (inode))) { +ext4_write_unlock_xattr (inode, &no_expand); +brelse (iloc.bh); +folio_unlock (folio); +folio_put (folio); +ext4_journal_stop (handle); +return 0 ; + }/* * ei->i_inline_off may have changed since
fs/ext4/inode.c +13 -11
@@ -1300,6 +1300,8 @@ static int ext4_write_begin(const struct kiocb *iocb,if (unlikely (ret))return ret; + *fsdata = (void *)((unsigned long )*fsdata & ~EXT4_WRITE_DATA_INLINE ); +trace_ext4_write_begin (inode, pos, len);/* * Reserve one block more for addition to orphan list in case
@@ -1314,8 +1316,10 @@ static int ext4_write_begin(const struct kiocb *iocb, foliop);if (ret <0 )return ret; -if (ret ==1 ) +if (ret ==1 ) { + *fsdata = (void *)((unsigned long )*fsdata |EXT4_WRITE_DATA_INLINE );return 0 ; + } }/*
@@ -1451,8 +1455,7 @@ static int ext4_write_end(const struct kiocb *iocb,trace_ext4_write_end (inode, pos, len, copied); -if (ext4_has_inline_data (inode) && -ext4_test_inode_state (inode,EXT4_STATE_MAY_INLINE_DATA )) +if ((unsigned long )fsdata &EXT4_WRITE_DATA_INLINE )return ext4_write_inline_data_end (inode, pos, len, copied, folio);
@@ -1562,8 +1565,7 @@ static int ext4_journalled_write_end(const struct kiocb *iocb,BUG_ON (!ext4_handle_valid (handle)); -if (ext4_has_inline_data (inode) && -ext4_test_inode_state (inode,EXT4_STATE_MAY_INLINE_DATA )) +if ((unsigned long )fsdata &EXT4_WRITE_DATA_INLINE )return ext4_write_inline_data_end (inode, pos, len, copied, folio);
@@ -3161,8 +3163,10 @@ static int ext4_da_write_begin(const struct kiocb *iocb, foliop, fsdata, true);if (ret <0 )return ret; -if (ret ==1 ) +if (ret ==1 ) { + *fsdata = (void *)((unsigned long )*fsdata |EXT4_WRITE_DATA_INLINE );return 0 ; + } } retry:
@@ -3295,17 +3299,15 @@ static int ext4_da_write_end(const struct kiocb *iocb, struct folio *folio, void *fsdata) { struct inode *inode = mapping->host; -int write_mode = (int )(unsigned long )fsdata; +unsigned long write_mode = (unsigned long )fsdata; -if (write_mode ==FALL_BACK_TO_NONDELALLOC ) +if (write_mode &FALL_BACK_TO_NONDELALLOC )return ext4_write_end (iocb, mapping, pos, len, copied, folio, fsdata);trace_ext4_da_write_end (inode, pos, len, copied); -if (write_mode !=CONVERT_INLINE_DATA && -ext4_test_inode_state (inode,EXT4_STATE_MAY_INLINE_DATA ) && -ext4_has_inline_data (inode)) +if (write_mode &EXT4_WRITE_DATA_INLINE )return ext4_write_inline_data_end (inode, pos, len, copied, folio);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 531/1518 ext4: validate readdir offset before accessing dirent
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yao Kai <[email protected]>
[ Upstream commit bc4b7b0414c33b2c8898eb04386df0d21a13dad8 ]
A corrupted directory can trigger the following KASAN report when ext4_readdir() resumes from an invalid position:
BUG: KASAN: use-after-free in __ext4_check_dir_entry+0x5ef/0x820 Read of size 2 at addr ffff88810a646000 by task repro_linear/509 Call Trace: <TASK> dump_stack_lvl+0x53/0x70 print_report+0xd0/0x630 kasan_report+0xce/0x100 __ext4_check_dir_entry+0x5ef/0x820 ext4_readdir+0xcde/0x2b70 iterate_dir+0x1a1/0x520 __x64_sys_getdents64+0x12b/0x220 do_syscall_64+0xf9/0x540 entry_SYSCALL_64_after_hwframe+0x77/0x7f </TASK>
KASAN reports use-after-free because the out-of-bounds access lands in an adjacent freed page. The directory buffer itself is still referenced.
ext4_dir_llseek() invalidates the directory cookie so that ext4_readdir() rescans directory entries from the start of the block. The rescan checks only the lower bound of rec_len before advancing. A corrupted rec_len can therefore place the offset where the block has insufficient space for a complete directory entry. The rescan itself may dereference that truncated entry, or the main loop may pass it to __ext4_check_dir_entry(). The latter reads de->rec_len before validating the range. For example:
block offset 0 4092 4096
|---- de1.rec_len = 4092 -----|----|
de2.inode
| de2.rec_len
^ OOB, reported as UAFde2 starts at offset 4092 in this 4 KiB block. Its four-byte inode fits in the block, but its rec_len starts at offset 4096 and crosses the boundary.
The minimum safe length is inode-dependent. Encrypted and casefolded directory entries need eight additional hash bytes, while a valid metadata checksum tail is only 12 bytes.
Cache the metadata checksum feature state and derive the minimum directory entry length from the on-disk format. Use it to bound both the rescan and the offset passed to the main loop. Report an offset in a truncated block tail and skip the remainder of the block, while continuing to accept an offset exactly at the block boundary.
--- fs/ext4/dir.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)
fs/ext4/dir.c +18 -2
@@ -137,6 +137,7 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx)struct buffer_head *bh =NULL ;struct fscrypt_str fstr =FSTR_INIT (NULL ,0 );struct dir_private_info *info = file->private_data; +bool has_csum =ext4_has_feature_metadata_csum (sb); err =fscrypt_prepare_readdir (inode);if (err)
@@ -148,7 +149,7 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx)return err;/* Can we just clear INDEX flag to ignore htree information? */ -if (!ext4_has_feature_metadata_csum (sb)) { +if (!has_csum) {/* * We don't set the inode dirty flag since it's not * critical that it gets flushed back to the disk.
@@ -234,7 +235,10 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx)* dirent right now. Scan from the start of the block * to make sure. */ if (!inode_eq_iversion (inode, info->cookie)) { -for (i =0 ; i < sb->s_blocksize && i < offset; ) { +for (i =0 ; + i <= sb->s_blocksize - +ext4_dir_rec_len (1 , has_csum ?NULL : inode) && + i < offset;) { de = (struct ext4_dir_entry_2 *) (bh->b_data + i);/* It's too expensive to do a full
@@ -256,6 +260,17 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx) info->cookie =inode_query_iversion (inode); } +if (unlikely (offset < sb->s_blocksize && + offset > sb->s_blocksize - +ext4_dir_rec_len (1 , has_csum ?NULL : inode))) { +EXT4_ERROR_FILE (file, bh->b_blocknr, +"bad entry in directory: %s - offset=%u, size=%lu" , +"directory entry too close to block end" , + offset, sb->s_blocksize); + ctx->pos =round_up (ctx->pos, sb->s_blocksize); + goto next_block; + } +while (ctx->pos < inode->i_size && offset < sb->s_blocksize) { de = (struct ext4_dir_entry_2 *) (bh->b_data + offset);
@@ -311,6 +326,7 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx) ctx->pos +=ext4_rec_len_from_disk (de->rec_len, sb->s_blocksize); } +next_block:if ((ctx->pos < inode->i_size) && !dir_relax_shared (inode)) goto done;brelse (bh);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 532/1518 wifi: ath6kl: avoid buffer overreads in WMI event handlers
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jeff Johnson <[email protected]>
[ Upstream commit f57314aade9d74d30f3360ec5ef85a83654748be ]
The following WMI event handlers currently read from the event buffer without first verifying that the message was large enough to hold the expected event:ath6kl_wmi_scan_complete_rx() ath6kl_wmi_addba_req_event_rx() ath6kl_wmi_delba_req_event_rx()
Add length checks to prevent overread.
--- drivers/net/wireless/ath/ath6kl/wmi.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath6kl/wmi.c +15 -2
@@ -1296,6 +1296,9 @@ static int ath6kl_wmi_scan_complete_rx(struct wmi *wmi, u8 *datap, int len, {struct wmi_scan_complete_event *ev; +if (len <sizeof (*ev)) +return -EINVAL ; + ev = (struct wmi_scan_complete_event *) datap;ath6kl_scan_complete_evt (vif,a_sle32_to_cpu (ev->status));
@@ -3372,7 +3375,12 @@ static int ath6kl_wmi_get_pmkid_list_event_rx(struct wmi *wmi, u8 *datap,static int ath6kl_wmi_addba_req_event_rx (struct wmi *wmi,u8 *datap,int len,struct ath6kl_vif *vif) { -struct wmi_addba_req_event *cmd = (struct wmi_addba_req_event *) datap; +struct wmi_addba_req_event *cmd; + +if (len <sizeof (*cmd)) +return -EINVAL ; + + cmd = (struct wmi_addba_req_event *)datap;aggr_recv_addba_req_evt (vif, cmd->tid,le16_to_cpu (cmd->st_seq_no), cmd->win_sz);
@@ -3383,7 +3391,12 @@ static int ath6kl_wmi_addba_req_event_rx(struct wmi *wmi, u8 *datap, int len,static int ath6kl_wmi_delba_req_event_rx (struct wmi *wmi,u8 *datap,int len,struct ath6kl_vif *vif) { -struct wmi_delba_event *cmd = (struct wmi_delba_event *) datap; +struct wmi_delba_event *cmd; + +if (len <sizeof (*cmd)) +return -EINVAL ; + + cmd = (struct wmi_delba_event *)datap;aggr_recv_delba_req_evt (vif, cmd->tid);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 533/1518 wifi: ath12k: switch to name-based reserved memory lookup
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aaradhana Sahu <[email protected]>
[ Upstream commit 3fe59edd1901c040e5b8e9d2428bf9ec6b4ce630 ]
The driver currently retrieves reserved memory regions using index-based lookup, which depends on the ordering of reserved-memory nodes in the device tree. Since different platforms define these regions in varying orders and combinations, this approach is not compatible and can result in incorrect memory region access.
Switch to looking up memory regions by name instead of index so it does not depend on node order.
Use names already defined in qcom,ipq5332-wifi.yaml, so there are no backward compatibility issues.
Tested-on: IPQ5332 hw1.0 AHB WLAN.WBE.1.6-01275-QCAHKSWPL_SILICONZ-1
Stable-dep-of: 42399be44b13 ("wifi: ath12k: allocate HOST_DDR and BDF regions after Q6 RO region")
--- drivers/net/wireless/ath/ath12k/ahb.c | 18 ++++++------ drivers/net/wireless/ath/ath12k/core.c | 25 ----------------- drivers/net/wireless/ath/ath12k/core.h | 2 -- drivers/net/wireless/ath/ath12k/qmi.c | 38 +++++++++++++------------- 4 files changed, 29 insertions(+), 54 deletions(-)
drivers/net/wireless/ath/ath12k/ahb.c +10 -8
@@ -12,6 +12,7 @@#include <linux/remoteproc.h> #include <linux/soc/qcom/mdt_loader.h> #include <linux/soc/qcom/smem_state.h> +#include <linux/of_reserved_mem.h> #include "ahb.h" #include "debug.h" #include "hif.h"
@@ -345,24 +346,25 @@ static int ath12k_ahb_power_up(struct ath12k_base *ab)char fw2_name[ATH12K_USERPD_FW_NAME_LEN ];struct device *dev = ab->dev;const struct firmware *fw, *fw2; -struct reserved_mem *rmem =NULL ;unsigned long time_left;phys_addr_t mem_phys; +struct resource res;void *mem_region;size_t mem_size;u32 pasid;int ret; - rmem =ath12k_core_get_reserved_mem (ab,0 ); -if (!rmem) -return -ENODEV ; + ret =of_reserved_mem_region_to_resource_byname (dev->of_node,"q6-region" , + &res); +if (ret) +return ret; - mem_phys = rmem->base; - mem_size = rmem->size; + mem_phys = res.start; + mem_size =resource_size (&res); mem_region =devm_memremap (dev, mem_phys, mem_size,MEMREMAP_WC );if (IS_ERR (mem_region)) { -ath12k_err (ab,"unable to map memory region: %pa+%pa\n" , - &rmem->base, &rmem->size); +ath12k_err (ab,"unable to map memory region: %pa+%zx\n" , + &res.start, mem_size);return PTR_ERR (mem_region); }
drivers/net/wireless/ath/ath12k/core.c +0 -25
@@ -633,31 +633,6 @@ u32 ath12k_core_get_max_peers_per_radio(struct ath12k_base *ab)return ath12k_core_get_max_station_per_radio (ab) +TARGET_NUM_VDEVS (ab); } -struct reserved_mem *ath12k_core_get_reserved_mem (struct ath12k_base *ab, -int index) -{ -struct device *dev = ab->dev; -struct reserved_mem *rmem; -struct device_node *node; - - node =of_parse_phandle (dev->of_node,"memory-region" , index); -if (!node) { -ath12k_dbg (ab,ATH12K_DBG_BOOT , -"failed to parse memory-region for index %d\n" , index); -return NULL ; - } - - rmem =of_reserved_mem_lookup (node); -of_node_put (node); -if (!rmem) { -ath12k_dbg (ab,ATH12K_DBG_BOOT , -"unable to get memory-region for index %d\n" , index); -return NULL ; - } - -return rmem; -} -static inline void ath12k_core_to_group_ref_get (struct ath12k_base *ab) {
drivers/net/wireless/ath/ath12k/core.h +0 -2
@@ -1369,8 +1369,6 @@ void ath12k_fw_stats_init(struct ath12k *ar);void ath12k_fw_stats_bcn_free (struct list_head *head);void ath12k_fw_stats_free (struct ath12k_fw_stats *stats);void ath12k_fw_stats_reset (struct ath12k *ar); -struct reserved_mem *ath12k_core_get_reserved_mem (struct ath12k_base *ab, -int index);enum ath12k_qmi_mem_mode ath12k_core_get_memory_mode (struct ath12k_base *ab);static inline const char *ath12k_scan_state_str (enum ath12k_scan_state state)
drivers/net/wireless/ath/ath12k/qmi.c +19 -19
@@ -13,6 +13,7 @@#include <linux/firmware.h> #include <linux/of_address.h> #include <linux/ioport.h> +#include <linux/of_reserved_mem.h> #define SLEEP_CLOCK_SELECT_INTERNAL_BIT 0x02#define HOST_CSTATE_BIT 0x04
@@ -2685,20 +2686,20 @@ static int ath12k_qmi_alloc_target_mem_chunk(struct ath12k_base *ab)static int ath12k_qmi_assign_target_mem_chunk (struct ath12k_base *ab) { -struct reserved_mem *rmem; +struct device_node *np = ab->dev->of_node;size_t avail_rmem_size; +struct resource res;int i, idx, ret;for (i =0 , idx =0 ; i < ab->qmi.mem_seg_count; i++) {switch (ab->qmi.target_mem[i].type) {case HOST_DDR_REGION_TYPE : - rmem =ath12k_core_get_reserved_mem (ab,0 ); -if (!rmem) { - ret = -ENODEV ; + ret =of_reserved_mem_region_to_resource_byname (np,"q6-region" , + &res); +if (ret) goto out; - } - avail_rmem_size = rmem->size; + avail_rmem_size =resource_size (&res);if (avail_rmem_size < ab->qmi.target_mem[i].size) { ath12k_dbg(ab, ATH12K_DBG_QMI, "failed to assign mem type %u req size %u avail size %zu\n",
@@ -2709,7 +2710,7 @@ static int ath12k_qmi_assign_target_mem_chunk(struct ath12k_base *ab) goto out; } - ab->qmi.target_mem[idx].paddr = rmem->base; + ab->qmi.target_mem[idx].paddr = res.start; ab->qmi.target_mem[idx].v.ioaddr =ioremap (ab->qmi.target_mem[idx].paddr, ab->qmi.target_mem[i].size);
@@ -2722,13 +2723,13 @@ static int ath12k_qmi_assign_target_mem_chunk(struct ath12k_base *ab) idx++;break ;case BDF_MEM_REGION_TYPE : - rmem =ath12k_core_get_reserved_mem (ab,0 ); -if (!rmem) { - ret = -ENODEV ; + ret =of_reserved_mem_region_to_resource_byname (np,"q6-region" , + &res); +if (ret) goto out; - } - avail_rmem_size = rmem->size - ab->hw_params->bdf_addr_offset; + avail_rmem_size =resource_size (&res) - + ab->hw_params->bdf_addr_offset;if (avail_rmem_size < ab->qmi.target_mem[i].size) { ath12k_dbg(ab, ATH12K_DBG_QMI, "failed to assign mem type %u req size %u avail size %zu\n",
@@ -2739,7 +2740,7 @@ static int ath12k_qmi_assign_target_mem_chunk(struct ath12k_base *ab) goto out; } ab->qmi.target_mem[idx].paddr = - rmem->base + ab->hw_params->bdf_addr_offset; + res.start + ab->hw_params->bdf_addr_offset; ab->qmi.target_mem[idx].v.ioaddr =ioremap (ab->qmi.target_mem[idx].paddr, ab->qmi.target_mem[i].size);
@@ -2764,13 +2765,12 @@ static int ath12k_qmi_assign_target_mem_chunk(struct ath12k_base *ab) idx++;break ;case M3_DUMP_REGION_TYPE : - rmem =ath12k_core_get_reserved_mem (ab,1 ); -if (!rmem) { - ret = -EINVAL ; + ret =of_reserved_mem_region_to_resource_byname (np,"m3-dump" , + &res); +if (ret) goto out; - } - avail_rmem_size = rmem->size; + avail_rmem_size =resource_size (&res);if (avail_rmem_size < ab->qmi.target_mem[i].size) { ath12k_dbg(ab, ATH12K_DBG_QMI, "failed to assign mem type %u req size %u avail size %zu\n",
@@ -2781,7 +2781,7 @@ static int ath12k_qmi_assign_target_mem_chunk(struct ath12k_base *ab) goto out; } - ab->qmi.target_mem[idx].paddr = rmem->base; + ab->qmi.target_mem[idx].paddr = res.start; ab->qmi.target_mem[idx].v.ioaddr =ioremap (ab->qmi.target_mem[idx].paddr, ab->qmi.target_mem[i].size);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 534/1518 wifi: ath12k: refactor QMI memory assignment
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aaradhana Sahu <[email protected]>
[ Upstream commit ecb517f97e629d3b8c360cbb5db3fed4d599ea2e ]
ath12k_qmi_assign_target_mem_chunk() uses a large switch-case to handle both memory region identification and allocation for each memory request type, leading to redundant allocation logic.
Refactor this by introducing ath12k_qmi_get_mem_reg_name() to map memory request types to their corresponding reserved memory region names.
Tested-on: IPQ5332 hw1.0 AHB WLAN.WBE.1.6-01275-QCAHKSWPL_SILICONZ-1
Stable-dep-of: 42399be44b13 ("wifi: ath12k: allocate HOST_DDR and BDF regions after Q6 RO region")
--- drivers/net/wireless/ath/ath12k/qmi.c | 157 ++++++++++---------------- 1 file changed, 61 insertions(+), 96 deletions(-)
drivers/net/wireless/ath/ath12k/qmi.c +61 -96
@@ -2684,120 +2684,85 @@ static int ath12k_qmi_alloc_target_mem_chunk(struct ath12k_base *ab)return ret; } +static const char *ath12k_qmi_get_mem_reg_name (int mem_type) +{ +switch (mem_type) { +case HOST_DDR_REGION_TYPE : +case BDF_MEM_REGION_TYPE : +return "q6-region" ; +case M3_DUMP_REGION_TYPE : +return "m3-dump" ; +case CALDB_MEM_REGION_TYPE : +return "q6-caldb" ; +case MLO_GLOBAL_MEM_REGION_TYPE : +return "mlo-global-mem" ; +default : +return NULL ; + } +} +static int ath12k_qmi_assign_target_mem_chunk (struct ath12k_base *ab) {struct device_node *np = ab->dev->of_node; +struct target_mem_chunk *chunk;size_t avail_rmem_size;struct resource res; +const char *rname;int i, idx, ret;for (i =0 , idx =0 ; i < ab->qmi.mem_seg_count; i++) { -switch (ab->qmi.target_mem[i].type) { -case HOST_DDR_REGION_TYPE : - ret =of_reserved_mem_region_to_resource_byname (np,"q6-region" , - &res); -if (ret) - goto out; - - avail_rmem_size =resource_size (&res); -if (avail_rmem_size < ab->qmi.target_mem[i].size) { -ath12k_dbg (ab,ATH12K_DBG_QMI , -"failed to assign mem type %u req size %u avail size %zu\n" , - ab->qmi.target_mem[i].type, - ab->qmi.target_mem[i].size, - avail_rmem_size); - ret = -EINVAL ; - goto out; - } - - ab->qmi.target_mem[idx].paddr = res.start; - ab->qmi.target_mem[idx].v.ioaddr = -ioremap (ab->qmi.target_mem[idx].paddr, - ab->qmi.target_mem[i].size); -if (!ab->qmi.target_mem[idx].v.ioaddr) { - ret = -EIO ; - goto out; - } - ab->qmi.target_mem[idx].size = ab->qmi.target_mem[i].size; - ab->qmi.target_mem[idx].type = ab->qmi.target_mem[i].type; - idx++; -break ; -case BDF_MEM_REGION_TYPE : - ret =of_reserved_mem_region_to_resource_byname (np,"q6-region" , - &res); -if (ret) - goto out; - - avail_rmem_size =resource_size (&res) - - ab->hw_params->bdf_addr_offset; -if (avail_rmem_size < ab->qmi.target_mem[i].size) { -ath12k_dbg (ab,ATH12K_DBG_QMI , -"failed to assign mem type %u req size %u avail size %zu\n" , - ab->qmi.target_mem[i].type, - ab->qmi.target_mem[i].size, - avail_rmem_size); - ret = -EINVAL ; - goto out; - } - ab->qmi.target_mem[idx].paddr = - res.start + ab->hw_params->bdf_addr_offset; - ab->qmi.target_mem[idx].v.ioaddr = -ioremap (ab->qmi.target_mem[idx].paddr, - ab->qmi.target_mem[i].size); -if (!ab->qmi.target_mem[idx].v.ioaddr) { - ret = -EIO ; - goto out; - } - ab->qmi.target_mem[idx].size = ab->qmi.target_mem[i].size; - ab->qmi.target_mem[idx].type = ab->qmi.target_mem[i].type; - idx++; -break ; -case CALDB_MEM_REGION_TYPE : -/* Cold boot calibration is not enabled in Ath12k. Hence, + chunk = &ab->qmi.target_mem[i]; +if (chunk->type ==CALDB_MEM_REGION_TYPE ) { +/* +* Cold boot calibration is not enabled in Ath12k. Hence, * assign paddr = 0. * Once cold boot calibration is enabled add support to * assign reserved memory from DT. */ ab->qmi.target_mem[idx].paddr =0 ; ab->qmi.target_mem[idx].v.ioaddr =NULL ; - ab->qmi.target_mem[idx].size = ab->qmi.target_mem[i].size; - ab->qmi.target_mem[idx].type = ab->qmi.target_mem[i].type; + ab->qmi.target_mem[idx].size = chunk->size; + ab->qmi.target_mem[idx].type = chunk->type; idx++; -break ; -case M3_DUMP_REGION_TYPE : - ret =of_reserved_mem_region_to_resource_byname (np,"m3-dump" , - &res); -if (ret) - goto out; - - avail_rmem_size =resource_size (&res); -if (avail_rmem_size < ab->qmi.target_mem[i].size) { -ath12k_dbg (ab,ATH12K_DBG_QMI , -"failed to assign mem type %u req size %u avail size %zu\n" , - ab->qmi.target_mem[i].type, - ab->qmi.target_mem[i].size, - avail_rmem_size); - ret = -EINVAL ; - goto out; - } +continue ; + } - ab->qmi.target_mem[idx].paddr = res.start; - ab->qmi.target_mem[idx].v.ioaddr = -ioremap (ab->qmi.target_mem[idx].paddr, - ab->qmi.target_mem[i].size); -if (!ab->qmi.target_mem[idx].v.ioaddr) { - ret = -EIO ; - goto out; - } - ab->qmi.target_mem[idx].size = ab->qmi.target_mem[i].size; - ab->qmi.target_mem[idx].type = ab->qmi.target_mem[i].type; - idx++; -break ; -default : + rname =ath12k_qmi_get_mem_reg_name (chunk->type); +if (!rname) {ath12k_warn (ab,"qmi ignore invalid mem req type %u\n" , - ab->qmi.target_mem[i].type); -break ; + chunk->type); +continue ; + } + + ret =of_reserved_mem_region_to_resource_byname (np, rname, &res); +if (ret) + goto out; + + avail_rmem_size =resource_size (&res); +if (chunk->type ==BDF_MEM_REGION_TYPE ) { + avail_rmem_size -= ab->hw_params->bdf_addr_offset; + res.start += ab->hw_params->bdf_addr_offset; } + +if (avail_rmem_size < chunk->size) { +ath12k_dbg (ab,ATH12K_DBG_QMI , +"failed to assign mem type %u req size %u avail size %zu\n" , + chunk->type, chunk->size, avail_rmem_size); + ret = -EINVAL ; + goto out; + } + + ab->qmi.target_mem[idx].paddr = res.start; + ab->qmi.target_mem[idx].v.ioaddr =ioremap (ab->qmi.target_mem[idx].paddr, + chunk->size); +if (!ab->qmi.target_mem[idx].v.ioaddr) { + ret = -EIO ; + goto out; + } + + ab->qmi.target_mem[idx].size = chunk->size; + ab->qmi.target_mem[idx].type = chunk->type; + idx++; } ab->qmi.mem_seg_count = idx;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 535/1518 wifi: ath12k: allocate HOST_DDR and BDF regions after Q6 RO region
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aaradhana Sahu <[email protected]>
[ Upstream commit 42399be44b13eafb45c56b1c7d7c92107e50c289 ]
Currently, the Q6 region contains a read-only firmware region along with the BDF_MEM_REGION_TYPE and HOST_DDR_REGION_TYPE memory areas. The firmware expects these writable memory regions to be assigned after the Q6 read-only section.
However, the ath12k driver currently allocates the HOST_DDR_REGION_TYPE starting from the base of the Q6 region, which includes the read-only firmware area. As a result, the allocated memory regions overlap with the read-only section, causing the firmware to assert during QMI memory allocation. The Q6 memory region layout is as follows:
Q6 Reserved Memory
+--------------------------------------+
| |
| Read-only Firmware Region |
| (Q6 RO Region) |
| |
+--------------------------------------+ <--- bdf_addr_offset
| Writable Memory Region |
| (BDF + HOST_DDR allocations) |
| |
+--------------------------------------+
Fix this by allocating the required memory regions only after the end of the read-only region in the Q6 address space. The bdf_addr_offset parameter indicates where the writable region starts. Both HOST_DDR and BDF regions are allocated sequentially after this offset, with each region placed immediately after the previous one to avoid gaps and overlaps.
Tested-on: IPQ5332 hw1.0 AHB WLAN.WBE.1.6-01275-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/qmi.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/ath12k/qmi.c +15 -4
@@ -2704,8 +2704,8 @@ static const char *ath12k_qmi_get_mem_reg_name(int mem_type)static int ath12k_qmi_assign_target_mem_chunk (struct ath12k_base *ab) {struct device_node *np = ab->dev->of_node; +size_t avail_rmem_size, offset =0 ;struct target_mem_chunk *chunk; -size_t avail_rmem_size;struct resource res;const char *rname;int i, idx, ret;
@@ -2739,9 +2739,20 @@ static int ath12k_qmi_assign_target_mem_chunk(struct ath12k_base *ab) goto out; avail_rmem_size =resource_size (&res); -if (chunk->type ==BDF_MEM_REGION_TYPE ) { - avail_rmem_size -= ab->hw_params->bdf_addr_offset; - res.start += ab->hw_params->bdf_addr_offset; +if (chunk->type ==BDF_MEM_REGION_TYPE || + chunk->type ==HOST_DDR_REGION_TYPE ) { +if (ab->hw_params->bdf_addr_offset > avail_rmem_size || + offset > avail_rmem_size - ab->hw_params->bdf_addr_offset) { +ath12k_err (ab,"qmi mem offset overflow: bdf_offset=%u offset=%zu size=%zu\n" , + ab->hw_params->bdf_addr_offset, offset, + avail_rmem_size); + ret = -EINVAL ; + goto out; + } + + avail_rmem_size -= ab->hw_params->bdf_addr_offset + offset; + res.start += ab->hw_params->bdf_addr_offset + offset; + offset += chunk->size; }if (avail_rmem_size < chunk->size) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 536/1518 wifi: ath12k: Correctly copy the hint BSSID in WMI scan request
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jeff Johnson <[email protected]>
[ Upstream commit 7b0bd40e97a00991122122d5888ae455fb2bfc7a ]
Currently, in ath12k_wmi_send_scan_start_cmd(), the logic to populate the hint_bssid copies the BSSID in the wrong direction, from the firmware message to the argument buffer. Swap the parameters so that the BSSID is correctly populated in the firmware message from the argument buffer.
Compile tested only.
--- drivers/net/wireless/ath/ath12k/wmi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath12k/wmi.c +2 -2
@@ -2816,8 +2816,8 @@ int ath12k_wmi_send_scan_start_cmd(struct ath12k *ar,for (i =0 ; i < arg->num_hint_bssid; ++i) { hint_bssid->freq_flags = arg->hint_bssid[i].freq_flags; -ether_addr_copy (&arg->hint_bssid[i].bssid.addr[0 ], - &hint_bssid->bssid.addr[0 ]); +ether_addr_copy (&hint_bssid->bssid.addr[0 ], + &arg->hint_bssid[i].bssid.addr[0 ]); hint_bssid++; } }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 537/1518 wifi: ath11k: Correctly copy the hint BSSID in WMI scan request
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jeff Johnson <[email protected]>
[ Upstream commit 6fe2dddf59bbb2a96be0fcf23a205807b25ac173 ]
Currently, in ath11k_wmi_send_scan_start_cmd(), the logic to populate the hint_bssid copies the BSSID in the wrong direction, from the firmware message to the argument buffer. Swap the parameters so that the BSSID is correctly populated in the firmware message from the argument buffer.
This issue was reported on ath12k, but exists in ath11k as well.
Compile tested only.
--- drivers/net/wireless/ath/ath11k/wmi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath11k/wmi.c +2 -2
@@ -2411,8 +2411,8 @@ int ath11k_wmi_send_scan_start_cmd(struct ath11k *ar,for (i =0 ; i < params->num_hint_bssid; ++i) { hint_bssid->freq_flags = params->hint_bssid[i].freq_flags; -ether_addr_copy (¶ms->hint_bssid[i].bssid.addr[0 ], - &hint_bssid->bssid.addr[0 ]); +ether_addr_copy (&hint_bssid->bssid.addr[0 ], + ¶ms->hint_bssid[i].bssid.addr[0 ]); hint_bssid++; } }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 538/1518 wifi: ath12k: Avoid buffer overread in ath12k_wmi_op_rx()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jeff Johnson <[email protected]>
[ Upstream commit 7698656a2f7b045af5a6859766238cefea1b1945 ]
Currently, in ath12k_wmi_op_rx(), the firmware buffer is read without first verifying that the buffer has enough data to hold a header. This could result in a buffer overread.
Update the logic to verify the buffer contains at least enough data to hold a wmi_cmd_hdr before reading from the buffer.
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.1.c7-00108-QCAHMTSWPL_V1.0_V2.0_SILICONZ_UPSTREAM-3
--- drivers/net/wireless/ath/ath12k/wmi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/ath12k/wmi.c +4 -4
@@ -9739,12 +9739,12 @@ static void ath12k_wmi_op_rx(struct ath12k_base *ab, struct sk_buff *skb)struct wmi_cmd_hdr *cmd_hdr;enum wmi_tlv_event_id id; - cmd_hdr = (struct wmi_cmd_hdr *)skb->data; - id =le32_get_bits (cmd_hdr->cmd_id,WMI_CMD_HDR_CMD_ID ); - -if (!skb_pull (skb,sizeof (struct wmi_cmd_hdr ))) + cmd_hdr =skb_pull_data (skb,sizeof (*cmd_hdr)); +if (!cmd_hdr) goto out; + id =le32_get_bits (cmd_hdr->cmd_id,WMI_CMD_HDR_CMD_ID ); +switch (id) {/* Process all the WMI events here */ case WMI_SERVICE_READY_EVENTID :
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 539/1518 wifi: ath11k: Avoid buffer overread in ath11k_wmi_tlv_op_rx()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jeff Johnson <[email protected]>
[ Upstream commit 9ef9dd30058cc9223c72f711dca1a28a5947d0c5 ]
Currently, in ath11k_wmi_tlv_op_rx(), the firmware buffer is read without first verifying that the buffer has enough data to hold a header. This could result in a buffer overread.
Add an upfront length check before dereferencing skb->data as a wmi_cmd_hdr. The check is placed before the trace_ath11k_wmi_event() call to preserve the existing trace semantics (tracing the full raw WMI event including the header), unlike the analogous ath12k fix which could use skb_pull_data() directly.
Compile tested only.
--- drivers/net/wireless/ath/ath11k/wmi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath11k/wmi.c +4 -2
@@ -8757,13 +8757,15 @@ static void ath11k_wmi_tlv_op_rx(struct ath11k_base *ab, struct sk_buff *skb)struct wmi_cmd_hdr *cmd_hdr;enum wmi_tlv_event_id id; +if (skb->len <sizeof (*cmd_hdr)) + goto out; + cmd_hdr = (struct wmi_cmd_hdr *)skb->data; id =FIELD_GET (WMI_CMD_HDR_CMD_ID , (cmd_hdr->cmd_id));trace_ath11k_wmi_event (ab, id, skb->data, skb->len); -if (skb_pull (skb,sizeof (struct wmi_cmd_hdr )) ==NULL ) - goto out; +skb_pull (skb,sizeof (*cmd_hdr));switch (id) {/* Process all the WMI events here */
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 540/1518 RDMA/bnxt_re: Clear VM_MAYWRITE on DBR/toggle page mmap
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Selvin Xavier <[email protected]>
[ Upstream commit 9b66c9af7172ffcf727214fa0ebe9a5e1ed6eb16 ]
bnxt_re_mmap() rejects VM_WRITE for the DBR_PAGE and TOGGLE_PAGE mmap flags, but a read-only mapping can still retain VM_MAYWRITE. nd later be upgraded with mprotect(PROT_WRITE). This can bypass the write check that only runs at mmap time.
Clear VM_MAYWRITE before vm_insert_page() in the shared DBR/toggle-page branch, matching the existing policy that userspace writes are not expected for these pages.
--- drivers/infiniband/hw/bnxt_re/ib_verbs.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/infiniband/hw/bnxt_re/ib_verbs.c +4 -2
@@ -4570,11 +4570,13 @@ int bnxt_re_mmap(struct ib_ucontext *ib_uctx, struct vm_area_struct *vma)case BNXT_RE_MMAP_DBR_PAGE :case BNXT_RE_MMAP_TOGGLE_PAGE :/* Driver doesn't expect write access for user space */ -if (vma->vm_flags &VM_WRITE ) +if (vma->vm_flags &VM_WRITE ) { ret = -EFAULT ; -else + }else { +vm_flags_clear (vma,VM_MAYWRITE ); ret =vm_insert_page (vma, vma->vm_start,virt_to_page ((void *)bnxt_entry->mem_offset)); + }break ;default : ret = -EINVAL ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 541/1518 ext4: fix buffer_head leak in ext4_init_orphan_info
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guanghui Yang <[email protected]>
[ Upstream commit 05704335803b69c1bfa8637b7ada942bf2ee8a41 ]
ext4_init_orphan_info() reads orphan file blocks with ext4_bread() and stores the returned buffer_head in oi->of_binfo[i].ob_bh.
If ext4_bread() succeeds but the orphan block magic or checksum validation fails, the function jumps to out_free. However, the old out_free loop starts releasing buffers from i - 1, so the current buffer_head at index i is skipped.
This leaks the buffer_head reference obtained by ext4_bread() on the bad magic and bad checksum error paths.
Fix this by tracking the number of successfully read buffer_heads and releasing exactly those buffer_heads on the error path.
--- fs/ext4/orphan.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
fs/ext4/orphan.c +6 -2
@@ -572,6 +572,7 @@ int ext4_init_orphan_info(struct super_block *sb)int i, j;int ret;int free; +int loaded =0 ;__le32 *bdata;int inodes_per_ob =ext4_inodes_per_orphan_block (sb);struct ext4_orphan_block_tail *ot;
@@ -615,6 +616,7 @@ int ext4_init_orphan_info(struct super_block *sb) ret = -EIO ; goto out_free; } + loaded++; ot =ext4_orphan_block_tail (sb, oi->of_binfo[i].ob_bh);if (le32_to_cpu (ot->ob_magic) !=EXT4_ORPHAN_BLOCK_MAGIC ) {ext4_error (sb,"orphan file block %d: bad magic" , i);
@@ -637,8 +639,10 @@ int ext4_init_orphan_info(struct super_block *sb)iput (inode);return 0 ; out_free: -for (i--; i >=0 ; i--) -brelse (oi->of_binfo[i].ob_bh); +while (loaded >0 ) { + loaded--; +brelse (oi->of_binfo[loaded].ob_bh); + }kvfree (oi->of_binfo); out_put:iput (inode);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 542/1518 ext4: check dir entry fits before reading the hash trailer in ext4_search_dir()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xiang Mei <[email protected]>
[ Upstream commit c7e6b863d298f56522d0d08554bbea7f142e6588 ]
For casefolded encrypted directories ext4 stores an 8-byte hash trailer after the name (EXT4_DIRENT_HASHES()), at an offset derived from de->name_len. On the sb_no_casefold_compat_fallback() path ext4_match() reads that trailer, but ext4_search_dir()'s by-hand pre-check only tests de->name + de->name_len <= dlimit, which proves the name fits, not the rounded trailer. A crafted entry whose name ends at the block boundary passes the check while EXT4_DIRENT_HASHES(de) lands past the block end, so ext4_match() reads out of bounds on an ordinary lookup. KASAN reports it as a use-after-free when the page after the directory block holds a freed object:
BUG: KASAN: use-after-free in ext4_match (fs/ext4/namei.c:1435) Read of size 4 at addr ffff888010458000 by task exploit Call Trace: ext4_match (fs/ext4/namei.c:1435) ext4_search_dir (fs/ext4/namei.c:1470) __ext4_find_entry (fs/ext4/namei.c:1268 fs/ext4/namei.c:1632) ext4_lookup (fs/ext4/namei.c:1703 fs/ext4/namei.c:1769) ... filename_lookup (fs/namei.c:2842) vfs_statx (fs/stat.c:353) __do_sys_newfstatat (fs/stat.c:538) do_syscall_64 (arch/x86/entry/syscall_64.c:94) entry_SYSCALL_64_after_hwframe (arch/x86/entry/entry_64.S:121)
Require, for hash-in-dirent directories, that the whole entry including the rounded trailer fits before calling ext4_match(). This is the same bound ext4_check_dir_entry() already enforces via ext4_dir_rec_len(), so no well-formed entry is rejected. The other caller, ext4_find_dest_de(), runs ext4_check_dir_entry() first and is unaffected.
--- fs/ext4/namei.c | 2 ++ 1 file changed, 2 insertions(+)
fs/ext4/namei.c +2 -0
@@ -1467,6 +1467,8 @@ int ext4_search_dir(struct buffer_head *bh, char *search_buf, int buf_size,/* this code is executed quadratically often */ /* do minimal checking `by hand' */ if (de->name + de->name_len <= dlimit && + (!ext4_hash_in_dirent (dir) || + (char *)de +ext4_dir_rec_len (de->name_len, dir) <= dlimit) &&ext4_match (dir, fname, de)) {/* found a match - just to be sure, do * a full check */
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 543/1518 ARM: dts: allwinner: a10: Fix PMU interrupt
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andre Przywara <[email protected]>
[ Upstream commit eb7051f756460d7b951e94d9656e31ebb631ba28 ]
The Performance Monitoring Unit of the Cortex-A8 cores in the Allwinner A10 SoC is connected to interrupt line 66, not 3. This is shown in the manual (where interrupt 3 is assigned to UART2, also in our .dtsi), but has also been confirmed by triggering an PMU overflow interrupt and inspecting the IRQ controller status registers (from U-Boot). Please note that "perf stat" does not use interrupts, this might explain why this evaded the initial testing.
--- arch/arm/boot/dts/allwinner/sun4i-a10.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/allwinner/sun4i-a10.dtsi +1 -1
@@ -185,7 +185,7 @@ de: display-engine { pmu { compatible = "arm,cortex-a8-pmu"; - interrupts = <3>; + interrupts = <66>; }; reserved-memory {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 544/1518 cpufreq: amd-pstate-ut: Skip tests when amd-pstate driver is not active
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qianheng Peng <[email protected]>
[ Upstream commit 8d31bb1451643f328db0cea0e21e63ef54b4faf2 ]
The crash issue may occur when modprobe amd_pstate_ut on intel platform.
amd_pstate_ut: 1 amd_pstate_ut_acpi_cpc_valid success!
amd_pstate_ut: 2 amd_pstate_ut_check_enabled success!
BUG: kernel NULL pointer dereference, address: 0000000000000080
#PF: supervisor read access in kernel mode
#PF: error_code(0x0000) - not-present page
PGD 0 P4D 0
Oops: 0000 [#1] SMP NOPTI
CPU: 0 PID: 20300 Comm: modprobe
Kdump: loaded Tainted: G O 6.6.0-0010.rc1.ctl4.x86_64 #1
Hardware name: FiberHome R2200 V5/Xeon Boards, BIOS 3.1a 02/24/2020
RIP: 0010:amd_pstate_ut_check_perf+0x141/0x280 [amd_pstate_ut]
Call Trace:
<TASK>
amd_pstate_ut_init+0x1b/0xff0 [amd_pstate_ut]
? __pfx_amd_pstate_ut_init+0x10/0x10 [amd_pstate_ut]
do_one_initcall+0x42/0x2e0
? kmalloc_trace+0x26/0x90
do_init_module+0x60/0x240
__se_sys_init_module+0x185/0x1c0
do_syscall_64+0x62/0x190
entry_SYSCALL_64_after_hwframe+0x76/0x7e
</TASK>Add state detection to amd pstate driver to prevent amd_pstate_ut driver from testing on non-AMD platforms.
(ML: adjust title)
--- drivers/cpufreq/amd-pstate-ut.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/cpufreq/amd-pstate-ut.c +5 -0
@@ -273,6 +273,11 @@ static int amd_pstate_ut_check_driver(u32 index)static int __init amd_pstate_ut_init (void ) {u32 i =0 , arr_size =ARRAY_SIZE (amd_pstate_ut_cases); +enum amd_pstate_mode mode =amd_pstate_get_status (); + +/* don't test if no running amd-pstate driver */ +if (mode ==AMD_PSTATE_UNDEFINED || mode ==AMD_PSTATE_DISABLE ) +return -EOPNOTSUPP ;for (i =0 ; i < arr_size; i++) {int ret = amd_pstate_ut_cases[i].func (i);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 545/1518 cpufreq/amd-pstate: Use sysfs_match_string() for epp
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mario Limonciello (AMD) <[email protected]>
[ Upstream commit 7e17f48667b6707593fc215cbe025157920934f1 ]
Rather than scanning the buffer and manually matching the string use the sysfs macros.
Stable-dep-of: 57476909c300 ("cpufreq/amd-pstate: Fix EPP return type and handle errors during initialization")
--- drivers/cpufreq/amd-pstate.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)
drivers/cpufreq/amd-pstate.c +4 -11
@@ -118,7 +118,6 @@ static const char * const energy_perf_strings[] = { [EPP_INDEX_BALANCE_PERFORMANCE] = "balance_performance", [EPP_INDEX_BALANCE_POWERSAVE] = "balance_power", [EPP_INDEX_POWERSAVE] = "power", -NULL };static unsigned int epp_values[] = {
@@ -1135,16 +1134,15 @@ static ssize_t show_amd_pstate_hw_prefcore(struct cpufreq_policy *policy,static ssize_t show_energy_performance_available_preferences (struct cpufreq_policy *policy,char *buf) { -int i =0 ; -int offset =0 ; +int offset =0 , i;struct amd_cpudata *cpudata = policy->driver_data;if (cpudata->policy ==CPUFREQ_POLICY_PERFORMANCE )return sysfs_emit_at (buf, offset,"%s\n" , energy_perf_strings[EPP_INDEX_PERFORMANCE ]); -while (energy_perf_strings[i] !=NULL ) - offset +=sysfs_emit_at (buf, offset,"%s " , energy_perf_strings[i++]); +for (i =0 ; i <ARRAY_SIZE (energy_perf_strings); i++) + offset +=sysfs_emit_at (buf, offset,"%s " , energy_perf_strings[i]); offset +=sysfs_emit_at (buf, offset,"\n" );
@@ -1155,15 +1153,10 @@ static ssize_t store_energy_performance_preference( struct cpufreq_policy *policy, const char *buf, size_t count) { struct amd_cpudata *cpudata = policy->driver_data; -char str_preference[21 ];ssize_t ret;u8 epp; - ret =sscanf (buf,"%20s" , str_preference); -if (ret !=1 ) -return -EINVAL ; - - ret =match_string (energy_perf_strings,-1 , str_preference); + ret =sysfs_match_string (energy_perf_strings, buf);if (ret <0 )return -EINVAL ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 546/1518 amd-pstate: Make certain freq_attrs conditionally visible
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gautham R. Shenoy <[email protected]>
[ Upstream commit e67a5b6541831bbf1c40b6042a867a4594ec6b55 ]
Certain amd_pstate freq_attrs such as amd_pstate_hw_prefcore and amd_pstate_prefcore_ranking are enabled even when preferred core is not supported on the platform.
Similarly there are common freq_attrs between the amd-pstate and the amd-pstate-epp drivers (eg: amd_pstate_max_freq, amd_pstate_lowest_nonlinear_freq, etc.) but are duplicated in two different freq_attr structs.
Unify all the attributes in a single place and associate each of them with a visibility function that determines whether the attribute should be visible based on the underlying platform support and the current amd_pstate mode.
Stable-dep-of: 57476909c300 ("cpufreq/amd-pstate: Fix EPP return type and handle errors during initialization")
--- drivers/cpufreq/amd-pstate.c | 124 ++++++++++++++++++++++++++--------- 1 file changed, 93 insertions(+), 31 deletions(-)
drivers/cpufreq/amd-pstate.c +93 -31
@@ -1203,12 +1203,87 @@ static ssize_t show_energy_performance_preference(return sysfs_emit (buf,"%s\n" , energy_perf_strings[preference]); } +cpufreq_freq_attr_ro (amd_pstate_max_freq); +cpufreq_freq_attr_ro (amd_pstate_lowest_nonlinear_freq); + +cpufreq_freq_attr_ro (amd_pstate_highest_perf); +cpufreq_freq_attr_ro (amd_pstate_prefcore_ranking); +cpufreq_freq_attr_ro (amd_pstate_hw_prefcore); +cpufreq_freq_attr_rw (energy_performance_preference); +cpufreq_freq_attr_ro (energy_performance_available_preferences); + +struct freq_attr_visibility { +struct freq_attr *attr; +bool (*visibility_fn)(void ); +}; + +/* For attributes which are always visible */ +static bool always_visible (void ) +{ +return true; +} + +/* Determines whether prefcore related attributes should be visible */ +static bool prefcore_visibility (void ) +{ +return amd_pstate_prefcore; +} + +/* Determines whether energy performance preference should be visible */ +static bool epp_visibility (void ) +{ +return cppc_state ==AMD_PSTATE_ACTIVE ; +} + +static struct freq_attr_visibility amd_pstate_attr_visibility[] = { + {&amd_pstate_max_freq, always_visible}, + {&amd_pstate_lowest_nonlinear_freq, always_visible}, + {&amd_pstate_highest_perf, always_visible}, + {&amd_pstate_prefcore_ranking, prefcore_visibility}, + {&amd_pstate_hw_prefcore, prefcore_visibility}, + {&energy_performance_preference, epp_visibility}, + {&energy_performance_available_preferences, epp_visibility}, +}; + +static struct freq_attr **get_freq_attrs (void ) +{ +bool attr_visible[ARRAY_SIZE (amd_pstate_attr_visibility)]; +struct freq_attr **attrs; +int i, j, count; + +for (i =0 , count =0 ; i <ARRAY_SIZE (amd_pstate_attr_visibility); i++) { +struct freq_attr_visibility *v = &amd_pstate_attr_visibility[i]; + + attr_visible[i] = v->visibility_fn (); +if (attr_visible[i]) + count++; + } + +/* amd_pstate_{max_freq, lowest_nonlinear_freq, highest_perf} should always be visible */ +BUG_ON (!count); + + attrs =kcalloc (count +1 ,sizeof (struct freq_attr *),GFP_KERNEL ); +if (!attrs) +return ERR_PTR (-ENOMEM ); + +for (i =0 , j =0 ; i <ARRAY_SIZE (amd_pstate_attr_visibility); i++) { +if (!attr_visible[i]) +continue ; + + attrs[j++] = amd_pstate_attr_visibility[i].attr; + } + +return attrs; +} +static void amd_pstate_driver_cleanup (void ) {if (amd_pstate_prefcore)sched_clear_itmt_support (); cppc_state =AMD_PSTATE_DISABLE ; +kfree (current_pstate_driver->attr); + current_pstate_driver->attr =NULL ; current_pstate_driver =NULL ; }
@@ -1233,6 +1308,7 @@ static int amd_pstate_set_driver(int mode_idx)static int amd_pstate_register_driver (int mode) { +struct freq_attr **attr =NULL ;int ret; ret =amd_pstate_set_driver (mode);
@@ -1241,6 +1317,22 @@ static int amd_pstate_register_driver(int mode) cppc_state = mode; +/* +* Note: It is important to compute the attrs _after_ +* re-initializing the cppc_state. Some attributes become +* visible only when cppc_state is AMD_PSTATE_ACTIVE. +*/ + attr =get_freq_attrs (); +if (IS_ERR (attr)) { + ret = (int )PTR_ERR (attr); +pr_err ("Couldn't compute freq_attrs for current mode %s [%d]\n" , +amd_pstate_get_mode_string (cppc_state), ret); +amd_pstate_driver_cleanup (); +return ret; + } + + current_pstate_driver->attr = attr; +/* at least one CPU supports CPB */ current_pstate_driver->boost_enabled =cpu_feature_enabled (X86_FEATURE_CPB );
@@ -1383,37 +1475,9 @@ static ssize_t prefcore_show(struct device *dev,return sysfs_emit (buf,"%s\n" ,str_enabled_disabled (amd_pstate_prefcore)); } -cpufreq_freq_attr_ro (amd_pstate_max_freq); -cpufreq_freq_attr_ro (amd_pstate_lowest_nonlinear_freq); - -cpufreq_freq_attr_ro (amd_pstate_highest_perf); -cpufreq_freq_attr_ro (amd_pstate_prefcore_ranking); -cpufreq_freq_attr_ro (amd_pstate_hw_prefcore); -cpufreq_freq_attr_rw (energy_performance_preference); -cpufreq_freq_attr_ro (energy_performance_available_preferences);static DEVICE_ATTR_RW (status);static DEVICE_ATTR_RO (prefcore); -static struct freq_attr *amd_pstate_attr[] = { - &amd_pstate_max_freq, - &amd_pstate_lowest_nonlinear_freq, - &amd_pstate_highest_perf, - &amd_pstate_prefcore_ranking, - &amd_pstate_hw_prefcore, -NULL , -}; - -static struct freq_attr *amd_pstate_epp_attr[] = { - &amd_pstate_max_freq, - &amd_pstate_lowest_nonlinear_freq, - &amd_pstate_highest_perf, - &amd_pstate_prefcore_ranking, - &amd_pstate_hw_prefcore, - &energy_performance_preference, - &energy_performance_available_preferences, -NULL , -}; -static struct attribute *pstate_global_attributes[] = { &dev_attr_status.attr, &dev_attr_prefcore.attr,
@@ -1680,7 +1744,6 @@ static struct cpufreq_driver amd_pstate_driver = { .set_boost = amd_pstate_set_boost, .update_limits = amd_pstate_update_limits, .name = "amd-pstate", - .attr = amd_pstate_attr, };static struct cpufreq_driver amd_pstate_epp_driver = {
@@ -1696,7 +1759,6 @@ static struct cpufreq_driver amd_pstate_epp_driver = { .update_limits = amd_pstate_update_limits, .set_boost = amd_pstate_set_boost, .name = "amd-pstate-epp", - .attr = amd_pstate_epp_attr, };/*
@@ -1842,7 +1904,7 @@ static int __init amd_pstate_init(void)return ret; global_attr_free: -cpufreq_unregister_driver (current_pstate_driver); +amd_pstate_unregister_driver (0 );return ret; }device_initcall (amd_pstate_init);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 547/1518 cpufreq/amd-pstate: Add dynamic energy performance preference
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mario Limonciello (AMD) <[email protected]>
[ Upstream commit e30ca6dd5345c5b8ba05f346a8e81105352fe571 ]
Dynamic energy performance preference changes the EPP profile based on whether the machine is running on AC or DC power.
A notification chain from the power supply core is used to adjust EPP values on plug in or plug out events.
When enabled, the driver exposes a sysfs toggle for dynamic EPP, blocks manual writes to energy_performance_preference while it "owns" the EPP updates.
For non-server systems:
* the default EPP for AC mode is performance.
* the default EPP for DC mode is balance_performance.
For server systems dynamic EPP is mostly a no-op.
Stable-dep-of: 57476909c300 ("cpufreq/amd-pstate: Fix EPP return type and handle errors during initialization")
--- Documentation/admin-guide/pm/amd-pstate.rst | 18 ++- drivers/cpufreq/Kconfig.x86 | 12 ++ drivers/cpufreq/amd-pstate.c | 128 +++++++++++++++++++- drivers/cpufreq/amd-pstate.h | 10 +- 4 files changed, 160 insertions(+), 8 deletions(-)
Documentation/admin-guide/pm/amd-pstate.rst +17 -1
@@ -289,7 +289,7 @@ and user can change current preference according to energy or performance needs Please get all support profiles list from ``energy_performance_available_preferences`` attribute, all the profiles are integer values defined between 0 to 255 when EPP feature is enabled by platform -firmware, if EPP feature is disabled, driver will ignore the written value +firmware, but if the dynamic EPP feature is enabled, driver will block writes. This attribute is read-write. ``boost``
@@ -311,6 +311,22 @@ boost or `1` to enable it, for the respective CPU using the sysfs path Other performance and frequency values can be read back from ``/sys/devices/system/cpu/cpuX/acpi_cppc/``, see :ref:`cppc_sysfs`. +Dynamic energy performance profile +================================== +The amd-pstate driver supports dynamically selecting the energy performance +profile based on whether the machine is running on AC or DC power. + +Whether this behavior is enabled by default depends on the kernel +config option `CONFIG_X86_AMD_PSTATE_DYNAMIC_EPP`. This behavior can also be overridden +at runtime by the sysfs file ``/sys/devices/system/cpu/cpufreq/policyX/dynamic_epp``. + +When set to enabled, the driver will select a different energy performance +profile when the machine is running on battery or AC power. +When set to disabled, the driver will not change the energy performance profile +based on the power source and will not react to user desired power state. + +Attempting to manually write to the ``energy_performance_preference`` sysfs +file will fail when ``dynamic_epp`` is enabled. ``amd-pstate`` vs ``acpi-cpufreq`` ======================================
drivers/cpufreq/Kconfig.x86 +12 -0
@@ -68,6 +68,18 @@ config X86_AMD_PSTATE_DEFAULT_MODE For details, take a look at: <file:Documentation/admin-guide/pm/amd-pstate.rst>. +config X86_AMD_PSTATE_DYNAMIC_EPP + bool "AMD Processor P-State dynamic EPP support" + depends on X86_AMD_PSTATE + default n + help + Allow the kernel to dynamically change the energy performance + value from events like ACPI platform profile and AC adapter plug + events. + + This feature can also be changed at runtime, this configuration + option only sets the kernel default value behavior. + config X86_AMD_PSTATE_UT tristate "selftest for AMD Processor P-State driver" depends on X86 && ACPI_PROCESSOR
drivers/cpufreq/amd-pstate.c +122 -6
191 lines not on this page · raw message
drivers/cpufreq/amd-pstate.h +9 -1
@@ -77,6 +77,11 @@ struct amd_aperf_mperf {* Only when hw_prefcore and early prefcore param are true, * AMD P-State driver supports preferred core featue. * @policy: Cpufreq policy value +* @suspended: If CPU core if offlined +* @epp_default_ac: Default EPP value for AC power source +* @epp_default_dc: Default EPP value for DC power source +* @dynamic_epp: Whether dynamic EPP is enabled +* @power_nb: Notifier block for power events * * The amd_cpudata is key private data for each CPU thread in AMD P-State, and * represents all the attributes and goals that AMD P-State requests at runtime.
@@ -105,7 +110,10 @@ struct amd_cpudata {/* EPP feature related attributes*/ u32 policy;bool suspended; -u8 epp_default; +u8 epp_default_ac; +u8 epp_default_dc; +bool dynamic_epp; +struct notifier_block power_nb; };/*
Signature · 1 line
2.53.0
Re: [PATCH 6.18 0547/1518] cpufreq/amd-pstate: Add dynamic energy performance preference
[ A bit late to the party, I know - speed in -stable is way too high
to follow more timely, though. ]
Greg Kroah-Hartman wrote...
Quoted 7 lines
6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mario Limonciello (AMD) <[email protected]>
[ Upstream commit
e30ca6dd5345c5b8ba05f346a8e81105352fe571]
This introduces X86_AMD_PSTATE_DYNAMIC_EPP for 6.18, while it was already removed again upstream, in v7.1-rc2-7-ge4e9b7b38d5d ("cpufreq/amd-pstate: Drop Kconfig option for dynamic EPP").
This is a bit confusing. Mind to shed some light on this? Perhaps the latter commit just didn't make it to 6.18 yet?
Christoph
Sasha Levin
maintainerRe: [PATCH 6.18 0547/1518] cpufreq/amd-pstate: Add dynamic energy performance preference
Quoted 6 lines
This introduces
X86_AMD_PSTATE_DYNAMIC_EPPfor 6.18, while it was already removed again upstream, in v7.1-rc2-7-ge4e9b7b38d5d ("cpufreq/amd-pstate: DropKconfigoption for dynamic EPP").This is a bit confusing. Mind to shed some light on this? Perhaps the latter commit just didn't make it to 6.18 yet?
Your reading is right. e30ca6dd5345 ("cpufreq/amd-pstate: Add dynamic energy performance preference") went into 6.18 as a dependency of another fix, and the removal never followed it.
I am going to leave 6.18 as it is. e4e9b7b38d5d ("cpufreq/amd-pstate:
Drop Kconfig option for dynamic EPP") does not apply there without da8afb1c666a ("cpufreq/amd-pstate: add kernel command line to override dynamic epp") in front of it, and that one is a pure feature addition I do not want to pull into a stable tree just to make a removal apply. The Kconfig symbol is default n and is set in no defconfig, so on 6.18 it changes nothing unless someone enables it deliberately.
Signature · 2 lines
Thanks, Sasha
Greg Kroah-Hartman
maintainerPATCH 548/1518 cpufreq/amd-pstate: Add support for platform profile class
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mario Limonciello (AMD) <[email protected]>
[ Upstream commit 798c47593ccae7dd36c033e557f3f364a2056b9e ]
The platform profile core allows multiple drivers and devices to register platform profile support.
When the legacy platform profile interface is used all drivers will adjust the platform profile as well.
Add support for registering every CPU with the platform profile handler when dynamic EPP is enabled.
The end result will be that changing the platform profile will modify EPP accordingly.
Stable-dep-of: 57476909c300 ("cpufreq/amd-pstate: Fix EPP return type and handle errors during initialization")
--- Documentation/admin-guide/pm/amd-pstate.rst | 4 +- drivers/cpufreq/Kconfig.x86 | 1 + drivers/cpufreq/amd-pstate.c | 106 ++++++++++++++++++-- drivers/cpufreq/amd-pstate.h | 6 ++ 4 files changed, 110 insertions(+), 7 deletions(-)
Documentation/admin-guide/pm/amd-pstate.rst +3 -1
@@ -321,7 +321,9 @@ config option `CONFIG_X86_AMD_PSTATE_DYNAMIC_EPP`. This behavior can also be ove at runtime by the sysfs file ``/sys/devices/system/cpu/cpufreq/policyX/dynamic_epp``. When set to enabled, the driver will select a different energy performance -profile when the machine is running on battery or AC power. +profile when the machine is running on battery or AC power. The driver will +also register with the platform profile handler to receive notifications of +user desired power state and react to those. When set to disabled, the driver will not change the energy performance profile based on the power source and will not react to user desired power state.
drivers/cpufreq/Kconfig.x86 +1 -0
@@ -40,6 +40,7 @@ config X86_AMD_PSTATE select ACPI_PROCESSOR select ACPI_CPPC_LIB if X86_64 select CPU_FREQ_GOV_SCHEDUTIL if SMP + select ACPI_PLATFORM_PROFILE help This driver adds a CPUFreq driver which utilizes a fine grain processor performance frequency control range instead of legacy
drivers/cpufreq/amd-pstate.c +100 -6
162 lines not on this page · raw message
drivers/cpufreq/amd-pstate.h +6 -0
@@ -9,6 +9,7 @@#define _LINUX_AMD_PSTATE_H#include <linux/pm_qos.h> +#include <linux/platform_profile.h> /********************************************************************* * AMD P-state INTERFACE *
@@ -114,6 +115,11 @@ struct amd_cpudata {u8 epp_default_dc;bool dynamic_epp;struct notifier_block power_nb; + +/* platform profile */ +enum platform_profile_option current_profile; +struct device *ppdev; +char *profile_name; };/*
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 549/1518 cpufreq/amd-pstate: Fix EPP return type and handle errors during initialization
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marco Scardovi <[email protected]>
[ Upstream commit 57476909c3000a04e84a1d6018d63ba1b2aa20ab ]
Currently, the EPP getter helper functions (msr_get_epp, shmem_get_epp, and the static call wrapper amd_pstate_get_epp) return u8 or s16. This makes it difficult to correctly propagate negative error values returned by the underlying MSR read or CPPC helpers (such as rdmsrq_on_cpu or cppc_get_epp_perf).
Modify the return type of these functions to int, allowing them to return negative error codes properly.
Additionally, in amd_pstate_epp_cpu_init(), fetch the firmware-programmed default EPP value and validate it before assigning it to the EPP variables. If amd_pstate_get_epp() returns an error code, propagate the error and abort the CPU initialization to prevent subsequent configuration failures.
--- drivers/cpufreq/amd-pstate.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/cpufreq/amd-pstate.c +12 -4
@@ -197,7 +197,7 @@ static inline int get_mode_idx_from_str(const char *str, size_t size)static DEFINE_MUTEX (amd_pstate_driver_lock); -static u8 msr_get_epp (struct amd_cpudata *cpudata) +static int msr_get_epp (struct amd_cpudata *cpudata) {u64 value;int ret;
@@ -213,12 +213,12 @@ static u8 msr_get_epp(struct amd_cpudata *cpudata)DEFINE_STATIC_CALL (amd_pstate_get_epp, msr_get_epp); -static inline s16 amd_pstate_get_epp (struct amd_cpudata *cpudata) +static inline int amd_pstate_get_epp (struct amd_cpudata *cpudata) {return static_call (amd_pstate_get_epp)(cpudata); } -static u8 shmem_get_epp (struct amd_cpudata *cpudata) +static int shmem_get_epp (struct amd_cpudata *cpudata) {u64 epp;int ret;
@@ -1716,6 +1716,7 @@ static int amd_pstate_epp_cpu_init(struct cpufreq_policy *policy)struct amd_cpudata *cpudata;union perf_cached perf;struct device *dev; +int default_epp;int ret;/*
@@ -1767,6 +1768,13 @@ static int amd_pstate_epp_cpu_init(struct cpufreq_policy *policy) policy->boost_supported =READ_ONCE (cpudata->boost_supported); +/* Fetch the firmware programmed default EPP value */ + default_epp =amd_pstate_get_epp (cpudata); +if (default_epp <0 ) { + ret = default_epp; + goto free_cpudata1; + } +/* * Set the policy to provide a valid fallback value in case * the default cpufreq governor is neither powersave nor performance.
@@ -1774,7 +1782,7 @@ static int amd_pstate_epp_cpu_init(struct cpufreq_policy *policy)if (amd_pstate_acpi_pm_profile_server () ||amd_pstate_acpi_pm_profile_undefined ()) { policy->policy =CPUFREQ_POLICY_PERFORMANCE ; - cpudata->epp_default_ac = cpudata->epp_default_dc =amd_pstate_get_epp (cpudata); + cpudata->epp_default_ac = cpudata->epp_default_dc = default_epp; cpudata->current_profile =PLATFORM_PROFILE_PERFORMANCE ; }else { policy->policy =CPUFREQ_POLICY_POWERSAVE ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 550/1518 cpufreq/amd-pstate: Toggle auto_sel in active mode on shared memory systems
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marco Scardovi <[email protected]>
[ Upstream commit 9dfd13f80c856eab79130403a13fa3b83199346b ]
On shared memory systems, the EPP configuration path (handled via cppc_set_epp_perf()) is responsible for toggling on the CPPC autonomous selection register (auto_sel).
Currently, shmem_init_perf() returns early without doing any of the auto_sel configuration steps if cppc_state is AMD_PSTATE_ACTIVE. This skips enabling auto_sel, leaving the CPU in non-autonomous mode.
Remove the early return check in shmem_init_perf() when cppc_state is AMD_PSTATE_ACTIVE. Toggling auto_sel is necessary for the active mode on shared memory systems to function based on the ACPI spec for CPPC v2 and below.
--- drivers/cpufreq/amd-pstate.c | 3 --- 1 file changed, 3 deletions(-)
drivers/cpufreq/amd-pstate.c +0 -3
@@ -457,9 +457,6 @@ static int shmem_init_perf(struct amd_cpudata *cpudata)WRITE_ONCE (cpudata->perf, perf);WRITE_ONCE (cpudata->prefcore_ranking, cppc_perf.highest_perf); -if (cppc_state ==AMD_PSTATE_ACTIVE ) -return 0 ; - ret =cppc_get_auto_sel (cpudata->cpu, &auto_sel);if (ret) {pr_warn ("failed to get auto_sel, ret: %d\n" , ret);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 551/1518 firmware: arm_scmi: Roll back partial protocol table registration
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sudeep Holla <[email protected]>
[ Upstream commit 2224b622260ba590ab56ea1585d6bf7610be25b2 ]
scmi_protocol_table_register() can leave earlier requests registered when a later entry in the same ID table fails. Each request retains a pointer to the driver's ID table, so a failed module load can leave a dangling pointer after the module storage is released.
Unrequest only the successfully registered prefix, in reverse order, before returning the failure. Leave the failed entry and the remaining entries untouched because matching requests can be owned by another driver.
--- drivers/firmware/arm_scmi/bus.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-)
drivers/firmware/arm_scmi/bus.c +20 -11
@@ -136,17 +136,6 @@ static int scmi_protocol_device_request(const struct scmi_device_id *id_table)return ret; } -static int scmi_protocol_table_register (const struct scmi_device_id *id_table) -{ -int ret =0 ; -const struct scmi_device_id *entry; - -for (entry = id_table; entry->name && ret ==0 ; entry++) - ret =scmi_protocol_device_request (entry); - -return ret; -} -/** * scmi_protocol_device_unrequest - Helper to unrequest a device *
@@ -192,6 +181,26 @@ static void scmi_protocol_device_unrequest(const struct scmi_device_id *id_table } } +static int scmi_protocol_table_register (const struct scmi_device_id *id_table) +{ +const struct scmi_device_id *entry; +int ret; + +for (entry = id_table; entry->name; entry++) { + ret =scmi_protocol_device_request (entry); +if (ret) + goto err_unrequest; + } + +return 0 ; + +err_unrequest: +while (entry != id_table) +scmi_protocol_device_unrequest (--entry); + +return ret; +} +static void scmi_protocol_table_unregister (const struct scmi_device_id *id_table) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 552/1518 firmware: arm_scmi: Unrequest devices if driver registration fails
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sudeep Holla <[email protected]>
[ Upstream commit 9f7cd6a62aa754ed6b48cbd5d50de40add1bcc86 ]
scmi_driver_register() requests protocol devices before registering the driver. If driver_register() fails, those requests remain in the global IDR and retain pointers to the module's ID table. Once the failed module load releases that storage, later request matching or SCMI device creation can dereference the stale pointers.
Unrequest the complete protocol table before returning the registration failure. At this point table registration succeeded, so every entry is owned by the current registration attempt.
--- drivers/firmware/arm_scmi/bus.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/firmware/arm_scmi/bus.c +7 -3
@@ -398,10 +398,14 @@ int scmi_driver_register(struct scmi_driver *driver, struct module *owner, driver->driver.mod_name = mod_name; retval =driver_register (&driver->driver); -if (!retval) -pr_debug ("Registered new scmi driver %s\n" , driver->name); +if (retval) { +scmi_protocol_table_unregister (driver->id_table); +return retval; + } -return retval; +pr_debug ("Registered new scmi driver %s\n" , driver->name); + +return 0 ; }EXPORT_SYMBOL_GPL (scmi_driver_register);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 553/1518 riscv: dts: spacemit: add MusePi Pro board device tree
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Troy Mitchell <[email protected]>
[ Upstream commit 0ee59934662dfb89b43a8392e64ac4880c2fca88 ]
Add initial device tree support for the MusePi Pro board [1]. The board is using the SpacemiT K1/M1 SoC.
This device tree is adapted from the SpacemiT vendor tree [2] and enables basic board functionality, including UART console, LED, eMMC, Ethernet, and PDMA.
Stable-dep-of: 8270311d70fd ("riscv: dts: spacemit: k1: Split gmac_clk_ref into independent pinctrl groups")
--- arch/riscv/boot/dts/spacemit/Makefile | 1 + .../riscv/boot/dts/spacemit/k1-musepi-pro.dts | 79 +++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 arch/riscv/boot/dts/spacemit/k1-musepi-pro.dts
arch/riscv/boot/dts/spacemit/Makefile +1 -0
@@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 dtb-$(CONFIG_ARCH_SPACEMIT) += k1-bananapi-f3.dtb dtb-$(CONFIG_ARCH_SPACEMIT) += k1-milkv-jupiter.dtb +dtb-$(CONFIG_ARCH_SPACEMIT) += k1-musepi-pro.dtb dtb-$(CONFIG_ARCH_SPACEMIT) += k1-orangepi-rv2.dtb
arch/riscv/boot/dts/spacemit/k1-musepi-pro.dts new file +79 -0
79 lines not on this page · raw message
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 554/1518 riscv: dts: spacemit: Add OrangePi R2S board device tree
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Opdenacker <[email protected]>
[ Upstream commit 63e572b11464a233f45ad469ba64b8b9e68a9cd1 ]
Add initial device tree support for the OrangePi RV2 board [1], which is marketed as using the Ky X1 SoC but is identical in die and package to the SpacemiT K1 SoC [2].
Enable UART0, to boot into a serial console
Two Gigabit Ethernet ports with RGMII interface standard support are enabled, each port is connected to an external Motorcomm YT8531C PHY chip which uses the GPIO for reset control.
Enable PDMA.
Enable 8 GB eMMC chip for storage.
Stable-dep-of: 8270311d70fd ("riscv: dts: spacemit: k1: Split gmac_clk_ref into independent pinctrl groups")
--- arch/riscv/boot/dts/spacemit/Makefile | 1 + .../boot/dts/spacemit/k1-orangepi-r2s.dts | 90 +++++++++++++++++++ 2 files changed, 91 insertions(+) create mode 100644 arch/riscv/boot/dts/spacemit/k1-orangepi-r2s.dts
arch/riscv/boot/dts/spacemit/Makefile +1 -0
@@ -2,4 +2,5 @@ dtb-$(CONFIG_ARCH_SPACEMIT) += k1-bananapi-f3.dtb dtb-$(CONFIG_ARCH_SPACEMIT) += k1-milkv-jupiter.dtb dtb-$(CONFIG_ARCH_SPACEMIT) += k1-musepi-pro.dtb +dtb-$(CONFIG_ARCH_SPACEMIT) += k1-orangepi-r2s.dtb dtb-$(CONFIG_ARCH_SPACEMIT) += k1-orangepi-rv2.dtb
arch/riscv/boot/dts/spacemit/k1-orangepi-r2s.dts new file +90 -0
90 lines not on this page · raw message
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 555/1518 riscv: dts: spacemit: k1: Split gmac_clk_ref into independent pinctrl groups
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Junhui Liu <[email protected]>
[ Upstream commit 8270311d70fdf36bc8aab1e52b554e654a8839ff ]
The gmac_clk_ref signal is optional for the GMAC controller and is not strictly required for all hardware designs. The pins for gmac0_clk_ref (GPIO 45) and gmac1_clk_ref (GPIO 46) may also be used as GPIOs for other functions even when the Ethernet controller is active.
Split the refclk pins into independent pinctrl groups so boards can request them only when the reference clock path is actually needed.
Among the already mainlined boards, BPI-F3, Jupiter and MusePi Pro have optional hardware paths for the GMAC refclk pins. BPI-F3 and Jupiter route both GMAC refclk pins to the PHYs through NC/0R option resistors, while MusePi Pro only does so for GMAC0. Keep referencing the new clk-ref pinctrl groups on these boards so the optional hardware paths remain usable if the option resistors are populated.
OrangePi R2S has no publicly available schematic, so also keep the clk-ref groups there to preserve the previous pinmux behavior.
--- .../boot/dts/spacemit/k1-bananapi-f3.dts | 4 ++-- .../boot/dts/spacemit/k1-milkv-jupiter.dts | 4 ++-- .../riscv/boot/dts/spacemit/k1-musepi-pro.dts | 2 +- .../boot/dts/spacemit/k1-orangepi-r2s.dts | 4 ++-- arch/riscv/boot/dts/spacemit/k1-pinctrl.dtsi | 24 +++++++++++++++---- 5 files changed, 27 insertions(+), 11 deletions(-)
arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts +2 -2
@@ -46,7 +46,7 @@ ð0 { phy-handle = <&rgmii0>; phy-mode = "rgmii-id"; pinctrl-names = "default"; - pinctrl-0 = <&gmac0_cfg>; + pinctrl-0 = <&gmac0_cfg>, <&gmac0_clk_ref_cfg>; rx-internal-delay-ps = <0>; tx-internal-delay-ps = <0>; status = "okay";
@@ -69,7 +69,7 @@ ð1 { phy-handle = <&rgmii1>; phy-mode = "rgmii-id"; pinctrl-names = "default"; - pinctrl-0 = <&gmac1_cfg>; + pinctrl-0 = <&gmac1_cfg>, <&gmac1_clk_ref_cfg>; rx-internal-delay-ps = <0>; tx-internal-delay-ps = <250>; status = "okay";
arch/riscv/boot/dts/spacemit/k1-milkv-jupiter.dts +2 -2
@@ -26,7 +26,7 @@ ð0 { phy-handle = <&rgmii0>; phy-mode = "rgmii-id"; pinctrl-names = "default"; - pinctrl-0 = <&gmac0_cfg>; + pinctrl-0 = <&gmac0_cfg>, <&gmac0_clk_ref_cfg>; rx-internal-delay-ps = <0>; tx-internal-delay-ps = <0>; status = "okay";
@@ -49,7 +49,7 @@ ð1 { phy-handle = <&rgmii1>; phy-mode = "rgmii-id"; pinctrl-names = "default"; - pinctrl-0 = <&gmac1_cfg>; + pinctrl-0 = <&gmac1_cfg>, <&gmac1_clk_ref_cfg>; rx-internal-delay-ps = <0>; tx-internal-delay-ps = <250>; status = "okay";
arch/riscv/boot/dts/spacemit/k1-musepi-pro.dts +1 -1
@@ -48,7 +48,7 @@ &emmc { ð0 { phy-handle = <&rgmii0>; phy-mode = "rgmii-id"; - pinctrl-0 = <&gmac0_cfg>; + pinctrl-0 = <&gmac0_cfg>, <&gmac0_clk_ref_cfg>; pinctrl-names = "default"; rx-internal-delay-ps = <0>; tx-internal-delay-ps = <0>;
arch/riscv/boot/dts/spacemit/k1-orangepi-r2s.dts +2 -2
@@ -37,7 +37,7 @@ ð0 { phy-handle = <&rgmii0>; phy-mode = "rgmii-id"; pinctrl-names = "default"; - pinctrl-0 = <&gmac0_cfg>; + pinctrl-0 = <&gmac0_cfg>, <&gmac0_clk_ref_cfg>; rx-internal-delay-ps = <0>; tx-internal-delay-ps = <0>; status = "okay";
@@ -60,7 +60,7 @@ ð1 { phy-handle = <&rgmii1>; phy-mode = "rgmii-id"; pinctrl-names = "default"; - pinctrl-0 = <&gmac1_cfg>; + pinctrl-0 = <&gmac1_cfg>, <&gmac1_clk_ref_cfg>; rx-internal-delay-ps = <0>; tx-internal-delay-ps = <250>; status = "okay";
arch/riscv/boot/dts/spacemit/k1-pinctrl.dtsi +20 -4
@@ -27,8 +27,16 @@ gmac0-pins { <K1_PADCONF(11, 1)>, /* gmac0_tx_en */ <K1_PADCONF(12, 1)>, /* gmac0_mdc */ <K1_PADCONF(13, 1)>, /* gmac0_mdio */ - <K1_PADCONF(14, 1)>, /* gmac0_int_n */ - <K1_PADCONF(45, 1)>; /* gmac0_clk_ref */ + <K1_PADCONF(14, 1)>; /* gmac0_int_n */ + + bias-pull-up = <0>; + drive-strength = <21>; + }; + }; + + gmac0_clk_ref_cfg: gmac0-clk-ref-cfg { + gmac0-clk-ref-pins { + pinmux = <K1_PADCONF(45, 1)>; /* gmac0_clk_ref */ bias-pull-up = <0>; drive-strength = <21>;
@@ -51,8 +59,16 @@ gmac1-pins { <K1_PADCONF(40, 1)>, /* gmac1_tx_en */ <K1_PADCONF(41, 1)>, /* gmac1_mdc */ <K1_PADCONF(42, 1)>, /* gmac1_mdio */ - <K1_PADCONF(43, 1)>, /* gmac1_int_n */ - <K1_PADCONF(46, 1)>; /* gmac1_clk_ref */ + <K1_PADCONF(43, 1)>; /* gmac1_int_n */ + + bias-pull-up = <0>; + drive-strength = <21>; + }; + }; + + gmac1_clk_ref_cfg: gmac1-clk-ref-cfg { + gmac1-clk-ref-pins { + pinmux = <K1_PADCONF(46, 1)>; /* gmac1_clk_ref */ bias-pull-up = <0>; drive-strength = <21>;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 556/1518 perf cs-etm: Flush thread stacks after decoder reset
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leo Yan <[email protected]>
[ Upstream commit ea5075e3776846d4941dddf1549426ebd3feb81f ]
Perf resets the CoreSight decoder when moving to a new AUX trace buffer, this causes trace discontinunity globally.
For callchain synthesis, keeping thread-stack state after decoder reset can leave stale call/return history attached to threads that are decoded later, producing incorrect synthesized callchains.
Flush all host thread stacks after a decoder reset. When virtualization is present, flush the guest thread stacks as well.
Stable-dep-of: ec99be8a31db ("perf cs-etm: Avoid truncating AUX buffer sizes to int")
--- tools/perf/util/cs-etm.c | 45 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+)
tools/perf/util/cs-etm.c +45 -0
@@ -2066,6 +2066,45 @@ static int cs_etm__end_block(struct cs_etm_queue *etmq,return 0 ; } + +static int cs_etm__flush_stack_cb (struct thread *thread, +void *data__maybe_unused ) +{ +thread_stack__flush (thread); +return 0 ; +} + +static void cs_etm__flush_machine_stack (struct cs_etm_queue *etmq,pid_t pid) +{ +struct machine *machine; + + machine =machines__find (&etmq->etm->session->machines, pid); +if (machine) +machine__for_each_thread (machine, cs_etm__flush_stack_cb,NULL ); +} + +static void cs_etm__flush_all_stack (struct cs_etm_queue *etmq) +{ +enum cs_etm_pid_fmt pid_fmt =cs_etm__get_pid_fmt (etmq); + +if (!etmq->etm->synth_opts.last_branch) +return ; + +switch (pid_fmt) { +case CS_ETM_PIDFMT_CTXTID2 : +/* Clear the guest stack if virtualization is supported */ +cs_etm__flush_machine_stack (etmq,DEFAULT_GUEST_KERNEL_ID ); + fallthrough; +case CS_ETM_PIDFMT_CTXTID : +cs_etm__flush_machine_stack (etmq,HOST_KERNEL_ID ); +break ; +case CS_ETM_PIDFMT_NONE : +default : +break ; + + } +} +/* * cs_etm__get_data_block: Fetch a block from the auxtrace_buffer queue * if need be.
@@ -2088,6 +2127,12 @@ static int cs_etm__get_data_block(struct cs_etm_queue *etmq) ret =cs_etm_decoder__reset (etmq->decoder);if (ret)return ret; + +/* +* Since the decoder is reset, this causes a global trace +* discontinuity. Flush all thread stacks. +*/ +cs_etm__flush_all_stack (etmq); }return etmq->buf_len;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 557/1518 perf cs-etm: Avoid truncating AUX buffer sizes to int
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leo Yan <[email protected]>
[ Upstream commit ec99be8a31db999a4f866be74ea7db61dbb19f24 ]
cs_etm__get_trace() returns an int, but it used to return etmq->buf_len on success. That value comes from auxtrace_buffer::size, which is a size_t. For a large AUX trace block, returning the byte count through an int can overflow and make a valid buffer look like a negative error.
The callers do not need the actual byte count from cs_etm__get_trace(). The buffer length is already stored in the etmq->buf_len. The callers only need to distinguish three states:
< 0: error
= 0: no more AUX buffers
Quoted 1 line
0: data is available
Make cs_etm__get_trace() return 0 for all non-error cases and use etmq->buf_len to indicate whether a new buffer was found. Then make cs_etm__get_data_block() return 1 whenever data is available, instead of returning the buffer length.
Also refactor cs_etm__get_data_block() to make its return value semantics clearer.
--- tools/perf/util/cs-etm.c | 46 +++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 20 deletions(-)
tools/perf/util/cs-etm.c +26 -20
@@ -1509,8 +1509,7 @@ cs_etm__get_trace(struct cs_etm_queue *etmq) etmq->buf_used =0 ; etmq->buf_len = aux_buffer->size; etmq->buf = aux_buffer->data; - -return etmq->buf_len; +return 0 ; }/*
@@ -2116,26 +2115,33 @@ static int cs_etm__get_data_block(struct cs_etm_queue *etmq) {int ret; -if (!etmq->buf_len) { - ret =cs_etm__get_trace (etmq); -if (ret <=0 ) -return ret; -/* -* We cannot assume consecutive blocks in the data file -* are contiguous, reset the decoder to force re-sync. -*/ - ret =cs_etm_decoder__reset (etmq->decoder); -if (ret) -return ret; +/* The current block is not finished */ +if (etmq->buf_len) +return 1 ; -/* -* Since the decoder is reset, this causes a global trace -* discontinuity. Flush all thread stacks. -*/ -cs_etm__flush_all_stack (etmq); - } + ret =cs_etm__get_trace (etmq); +if (ret <0 ) +return ret; + +/* No more buffer to read */ +if (!etmq->buf_len) +return 0 ; + +/* +* We cannot assume consecutive blocks in the data file +* are contiguous, reset the decoder to force re-sync. +*/ + ret =cs_etm_decoder__reset (etmq->decoder); +if (ret) +return ret; + +/* +* Since the decoder is reset, this causes a global trace +* discontinuity. Flush all thread stacks. +*/ +cs_etm__flush_all_stack (etmq); -return etmq->buf_len; +return 1 ; } static bool cs_etm__is_svc_instr(struct cs_etm_queue *etmq,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 558/1518 xfrm: Fix skb double-free in xfrm_dev_direct_output()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sanghyun Park <[email protected]>
[ Upstream commit 2aed51fc58d9ce450e2c116efb956160fd06fa02 ]
A return value other than 1 from local_out() means that the skb has been consumed or its ownership was transferred. xfrm_dev_direct_output() nevertheless frees the skb on this path, causing a double-free when netfilter drops the packet and invalidating any other owner.
Return the local_out() result directly, matching the ownership handling in xfrm_output_resume().
--- net/xfrm/xfrm_output.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
net/xfrm/xfrm_output.c +1 -3
@@ -629,10 +629,8 @@ static int xfrm_dev_direct_output(struct sock *sk, struct xfrm_state *x,nf_reset_ct (skb); err =skb_dst (skb)->ops->local_out (net, sk, skb); -if (unlikely (err !=1 )) { -kfree_skb (skb); +if (unlikely (err !=1 ))return err; - }/* In transport mode, network destination is * directly reachable, while in tunnel mode,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 559/1518 RDMA/erdma: complete object teardown when the destroy command fails
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leon Romanovsky <[email protected]>
[ Upstream commit 652befcba956ef357f480525ccbe25c59bc81d4d ]
erdma_destroy_qp(), erdma_destroy_cq(), erdma_dereg_mr(), and erdma_destroy_ah() returned early when erdma_post_cmd_wait() failed, leaking the queue buffers, MTTs, doorbells and the STAG, QPN, CQN and AHN identifiers. A command timeout clears ERDMA_CMDQ_STATE_OK_BIT and permanently disables the command queue, so no retry can succeed; the RDMA core keeps the object after a failed destructor and forced uverbs cleanup then nulls the pointers, making the resources unreachable.
Warn on failure but release every software-owned resource and return success, since during terminal destruction the hardware command result is only diagnostic.
--- drivers/infiniband/hw/erdma/erdma_verbs.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)
drivers/infiniband/hw/erdma/erdma_verbs.c +17 -4
@@ -1303,8 +1303,15 @@ int erdma_dereg_mr(struct ib_mr *ibmr, struct ib_udata *udata) ret =erdma_post_cmd_wait (&dev->cmdq, &req,sizeof (req),NULL ,NULL , true); +/* +* A timeout disables the command queue, so retry cannot succeed. Treat +* terminal command failures as diagnostic; propagating them can make +* forced uverbs cleanup discard the last software resource pointers. +*/ if (ret) -return ret; +ibdev_warn_ratelimited (&dev->ibdev, +"failed to deregister MR 0x%x: %d\n" , + ibmr->lkey, ret);erdma_free_idx (&dev->res_cb[ERDMA_RES_TYPE_STAG_IDX ], ibmr->lkey >>8 );
@@ -1330,7 +1337,9 @@ int erdma_destroy_cq(struct ib_cq *ibcq, struct ib_udata *udata) err =erdma_post_cmd_wait (&dev->cmdq, &req,sizeof (req),NULL ,NULL , true);if (err) -return err; +ibdev_warn_ratelimited (&dev->ibdev, +"failed to destroy CQ %u: %d\n" , + cq->cqn, err);if (rdma_is_kernel_res (&cq->ibcq.res)) { dma_free_coherent(&dev->pdev->dev, cq->depth << CQE_SHIFT,
@@ -1378,7 +1387,9 @@ int erdma_destroy_qp(struct ib_qp *ibqp, struct ib_udata *udata) err =erdma_post_cmd_wait (&dev->cmdq, &req,sizeof (req),NULL ,NULL , true);if (err) -return err; +ibdev_warn_ratelimited (&dev->ibdev, +"failed to destroy QP %u: %d\n" , +QP_ID (qp), err);erdma_qp_put (qp);wait_for_completion (&qp->safe_free);
@@ -2282,7 +2293,9 @@ int erdma_destroy_ah(struct ib_ah *ibah, u32 flags) ret =erdma_post_cmd_wait (&dev->cmdq, &req,sizeof (req),NULL ,NULL , flags &RDMA_DESTROY_AH_SLEEPABLE );if (ret) -return ret; +ibdev_warn_ratelimited (&dev->ibdev, +"failed to destroy AH %u: %d\n" , + ah->ahn, ret);erdma_free_idx (&dev->res_cb[ERDMA_RES_TYPE_AH ], ah->ahn);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 560/1518 PM: hibernate: Fix memory leak in snapshot_write_next() error path
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Malaya Kumar Rout <[email protected]>
[ Upstream commit 21d5c4cee31c5ce78f6decc7fafc7e7759af391f ]
When memory_bm_create() succeeds for copy_bm but fails for zero_bm, the function returns without freeing the resources allocated for copy_bm. This results in a memory leak that includes radix tree nodes, zone structures, and page lists.
Fix this by calling memory_bm_free() to release copy_bm's resources before returning the error code when zero_bm allocation fails.
--- kernel/power/snapshot.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/power/snapshot.c +3 -2
@@ -2798,9 +2798,10 @@ int snapshot_write_next(struct snapshot_handle *handle)return error; error =memory_bm_create (&zero_bm,GFP_ATOMIC ,PG_ANY ); -if (error) +if (error) { +memory_bm_free (©_bm,PG_UNSAFE_CLEAR );return error; - + } nr_zero_pages =0 ;hibernate_restore_protection_begin ();
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 561/1518 leds: pca9532: Fix phantom device registration on missing hardware
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cosmo Chou <[email protected]>
[ Upstream commit 8d6b6c05b8e33d11e3fb3203309385e1a9cceecd ]
The initial PWM and PSC register writes in pca9532_configure() do not check the return values of i2c_smbus_write_byte_data(). If the I2C device is physically absent from the bus, the write fails with -ENXIO. However, the driver ignores this error and allows probe() to complete successfully.
This results in the registration of phantom LED class devices and gpiochips backed by non-existent hardware. Subsequent GPIO reads from these phantom chips return bogus values (due to -ENXIO being truncated to an unsigned char in pca9532_gpio_get_value()), silently corrupting hardware state tracking in userspace.
Propagate the I2C write failures back to probe() so the driver core can gracefully abort binding and release devres-managed resources.
--- drivers/leds/leds-pca9532.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/leds/leds-pca9532.c +8 -4
@@ -395,10 +395,14 @@ static int pca9532_configure(struct i2c_client *client,for (i =0 ; i <2 ; i++) { data->pwm[i] = pdata->pwm[i]; data->psc[i] = pdata->psc[i]; -i2c_smbus_write_byte_data (client,PCA9532_REG_PWM (maxleds, i), - data->pwm[i]); -i2c_smbus_write_byte_data (client,PCA9532_REG_PSC (maxleds, i), - data->psc[i]); + err =i2c_smbus_write_byte_data (client,PCA9532_REG_PWM (maxleds, i), + data->pwm[i]); +if (err <0 ) +return err; + err =i2c_smbus_write_byte_data (client,PCA9532_REG_PSC (maxleds, i), + data->psc[i]); +if (err <0 ) +return err; } data->hw_blink = true;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 562/1518 perf cap: Remove used_root parameter and simplify capability checks
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
[ Upstream commit 87ec3437f37b9fe44c524ba967cb12e78de06f15 ]
Refactor perf_cap__capable() to completely remove the used_root out-parameter as requested by the maintainer. Relying on an explicit used_root boolean poisoned sequential capability checks (e.g. failing CAP_SYS_ADMIN checks poisoning the flag for subsequent CAP_PERFMON evaluations for unprivileged users) and created redundant complexity across check_ftrace_capable(), symbol__read_kptr_restrict(), and perf_event_paranoid_check().
Streamline the capability API to perform a pure true/false boolean evaluation. The function checks the Effective set using SYS_capget; if the syscall is missing or fails on legacy kernels, it cleanly falls back to checking EUID == 0. This perfectly preserves modern capability-aware host sessions, guarantees transparent fallback for older kernels, and correctly rejects privileged operations for containerized root processes that have explicitly dropped their capability bounding and permitted sets.
--- tools/perf/builtin-ftrace.c | 13 +++---------- tools/perf/util/bpf-filter.c | 22 +++++++++------------- tools/perf/util/cap.c | 4 +--- tools/perf/util/cap.h | 3 +-- tools/perf/util/symbol.c | 3 +-- tools/perf/util/util.c | 12 +++--------- 6 files changed, 18 insertions(+), 39 deletions(-)
tools/perf/builtin-ftrace.c +3 -10
@@ -71,18 +71,11 @@ static void ftrace__workload_exec_failed_signal(int signo __maybe_unused,static bool check_ftrace_capable (void ) { -bool used_root; - -if (perf_cap__capable (CAP_PERFMON , &used_root)) -return true; - -if (!used_root &&perf_cap__capable (CAP_SYS_ADMIN , &used_root)) +if (perf_cap__capable (CAP_PERFMON ) || +perf_cap__capable (CAP_SYS_ADMIN ))return true; -pr_err ("ftrace only works for %s!\n" , - used_root ?"root" - :"users with the CAP_PERFMON or CAP_SYS_ADMIN capability" - ); +pr_err ("ftrace only works for users with the CAP_PERFMON or CAP_SYS_ADMIN capability!\n" );return false; }
tools/perf/util/bpf-filter.c +9 -13
@@ -629,24 +629,20 @@ struct perf_bpf_filter_expr *perf_bpf_filter_expr__new(enum perf_bpf_filter_termstatic bool check_bpf_filter_capable (void ) { -bool used_root; +int fd; -if (perf_cap__capable (CAP_BPF , &used_root)) +if (perf_cap__capable (CAP_BPF ))return true; -if (!used_root) { -/* Check if root already pinned the filter programs and maps */ -int fd =get_pinned_fd ("filters" ); - -if (fd >=0 ) { -close (fd); -return true; - } +/* Check if root already pinned the filter programs and maps */ + fd =get_pinned_fd ("filters" ); +if (fd >=0 ) { +close (fd); +return true; } -pr_err ("Error: BPF filter only works for %s!\n" -"\tPlease run 'perf record --setup-filter pin' as root first.\n" , - used_root ?"root" :"users with the CAP_BPF capability" ); +pr_err ("Error: BPF filter only works for users with the CAP_BPF capability!\n" +"\tPlease run 'perf record --setup-filter pin' as root first.\n" );return false; }
tools/perf/util/cap.c +1 -3
@@ -12,7 +12,7 @@#define MAX_LINUX_CAPABILITY_U32S _LINUX_CAPABILITY_U32S_3 -bool perf_cap__capable (int cap,bool *used_root) +bool perf_cap__capable (int cap) {struct __user_cap_header_struct header = { .version = _LINUX_CAPABILITY_VERSION_3,
@@ -21,7 +21,6 @@ bool perf_cap__capable(int cap, bool *used_root)struct __user_cap_data_struct data[MAX_LINUX_CAPABILITY_U32S ] = {};__u32 cap_val; - *used_root = false;while (syscall (SYS_capget, &header, &data[0 ]) ==-1 ) {/* Retry, first attempt has set the header.version correctly. */ if (errno == EINVAL && header.version != _LINUX_CAPABILITY_VERSION_3 &&
@@ -29,7 +28,6 @@ bool perf_cap__capable(int cap, bool *used_root)continue ;pr_debug2 ("capget syscall failed (%m) fall back on root check\n" ); - *used_root = true;return geteuid () ==0 ; }
tools/perf/util/cap.h +1 -2
@@ -18,7 +18,6 @@#define CAP_BPF 39#endif -/* Query if a capability is supported, used_root is set if the fallback root check was used. */ -bool perf_cap__capable (int cap,bool *used_root); +bool perf_cap__capable (int cap);#endif /* __PERF_CAP_H */
tools/perf/util/symbol.c +1 -2
@@ -2326,8 +2326,7 @@ static bool symbol__read_kptr_restrict(void) {bool value = false;FILE *fp =fopen ("/proc/sys/kernel/kptr_restrict" ,"r" ); -bool used_root; -bool cap_syslog =perf_cap__capable (CAP_SYSLOG , &used_root); +bool cap_syslog =perf_cap__capable (CAP_SYSLOG );if (fp !=NULL ) {char line[8 ];
tools/perf/util/util.c +3 -9
@@ -331,15 +331,9 @@ int perf_event_paranoid(void)bool perf_event_paranoid_check (int max_level) { -bool used_root; - -if (perf_cap__capable (CAP_SYS_ADMIN , &used_root)) -return true; - -if (!used_root &&perf_cap__capable (CAP_PERFMON , &used_root)) -return true; - -return perf_event_paranoid () <= max_level; +return perf_cap__capable (CAP_SYS_ADMIN ) || +perf_cap__capable (CAP_PERFMON ) || +perf_event_paranoid () <= max_level; }int perf_tip (char **strp,const char *dirpath)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 563/1518 drm/tve200: add OF module alias for autoloading
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Can Peng <[email protected]>
[ Upstream commit b6c3585f2058e0fbfa8cb403458f5cc6cf5c5e06 ]
The TVE200 DRM driver can be built as a module and uses tve200_of_match as its OF match table, but the table is not exported for module alias generation.
Add the MODULE_DEVICE_TABLE(of, ...) entry so modpost can generate OF module aliases for OF based module autoloading.
--- drivers/gpu/drm/tve200/tve200_drv.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/tve200/tve200_drv.c +1 -0
@@ -259,6 +259,7 @@ static const struct of_device_id tve200_of_match[] = { }, {}, }; +MODULE_DEVICE_TABLE (of, tve200_of_match);static struct platform_driver tve200_driver = { .driver = {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 564/1518 netfilter: nf_nat_sip: rewind offset when NAT shrinks the packet
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Westphal <[email protected]>
[ Upstream commit 16aecbe3036f6097c26b51b12e4c1cf207769690 ]
sashiko says:
If map_addr() changes the packet length, such as when the public NAT IP string is shorter or longer than the internal IP, coff will still point to the offset relative to the pre-mangled packet.
If the packet shrinks, coff could overshoot the correct position, potentially causing the next ct_sip_parse_header_uri() call to silently skip bytes and miss subsequent Contact headers. Could this lead to a failure to NAT those subsequent headers and leak internal network details?
--- net/netfilter/nf_nat_sip.c | 5 +++++ 1 file changed, 5 insertions(+)
net/netfilter/nf_nat_sip.c +5 -0
@@ -267,12 +267,17 @@ static unsigned int nf_nat_sip(struct sk_buff *skb, unsigned int protoff, SIP_HDR_CONTACT, &in_header, &matchoff, &matchlen, &addr, &port) > 0) { +int old_len = skb->len, delta; +if (!map_addr (skb, protoff, dataoff, dptr, datalen, matchoff, matchlen, &addr, port)) {nf_ct_helper_log (skb, ct,"cannot mangle contact" );return NF_DROP ; } + + delta = (int )skb->len - old_len; + coff += delta; } if (!map_sip_addr(skb, protoff, dataoff, dptr, datalen, SIP_HDR_FROM) ||
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 565/1518 fs/ntfs3: fix out-of-bounds read of INDEX_ROOT in reparse/objid init
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Weiming Wu <[email protected]>
[ Upstream commit 2064bc663f89e61b8681c1fb9d1ce445de72063d ]
ntfs_reparse_init() and ntfs_objid_init() parse the index root of the $Extend/$Reparse and $Extend/$ObjId metafiles (the INDEX_ROOT attributes named $R and $O). They read its type and rule fields through resident_data(), which does not check that the resident attribute is large enough to hold them.
mi_enum_attr() accepts a resident attribute with data_off == asize and data_size == 0. For such an attribute placed last in its MFT record, resident_data() returns a pointer to the end of the record_size buffer, so reading root->type / root->rule reads past the allocation.
Use resident_data_ex(attr, sizeof(struct INDEX_ROOT)) and bail out when it returns NULL, as ntfs_security_init() already does for $SDH / $SII.
The attribute is only parsed while mounting a crafted image, so this needs CAP_SYS_ADMIN.
BUG: KASAN: slab-out-of-bounds in ntfs_reparse_init (fs/ntfs3/fsntfs.c:2306) Read of size 4 at addr ffff88801219dc00 by task mount ntfs_reparse_init (fs/ntfs3/fsntfs.c:2306) ntfs_fill_super (fs/ntfs3/super.c:1604) get_tree_bdev_flags (fs/super.c:1703) vfs_get_tree (fs/super.c:1758) path_mount (fs/namespace.c:4131) __x64_sys_mount (fs/namespace.c:4360)
--- fs/ntfs3/fsntfs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
fs/ntfs3/fsntfs.c +4 -4
@@ -2293,8 +2293,8 @@ int ntfs_reparse_init(struct ntfs_sb_info *sbi) goto out; } - root_r =resident_data (attr); -if (root_r->type !=ATTR_ZERO || + root_r =resident_data_ex (attr,sizeof (struct INDEX_ROOT )); +if (!root_r || root_r->type !=ATTR_ZERO || root_r->rule !=NTFS_COLLATION_TYPE_UINTS ) { err = -EINVAL ; goto out;
@@ -2331,8 +2331,8 @@ int ntfs_objid_init(struct ntfs_sb_info *sbi) goto out; } - root =resident_data (attr); -if (root->type !=ATTR_ZERO || + root =resident_data_ex (attr,sizeof (struct INDEX_ROOT )); +if (!root || root->type !=ATTR_ZERO || root->rule !=NTFS_COLLATION_TYPE_UINTS ) { err = -EINVAL ; goto out;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 566/1518 drm/panthor: return PTR_ERR() from devm_drm_dev_alloc()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Osama Abdelkader <[email protected]>
[ Upstream commit abc1e559f8e5996eee506dfdc8e3781c2a1e04f9 ]
devm_drm_dev_alloc() returns an ERR_PTR() on failure, but panthor_probe() always converts that failure to -ENOMEM. Preserve the actual error code returned by the DRM core instead.
--- drivers/gpu/drm/panthor/panthor_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/panthor/panthor_drv.c +1 -1
@@ -1630,7 +1630,7 @@ static int panthor_probe(struct platform_device *pdev) ptdev =devm_drm_dev_alloc (&pdev->dev, &panthor_drm_driver, struct panthor_device, base);if (IS_ERR (ptdev)) -return -ENOMEM ; +return PTR_ERR (ptdev);platform_set_drvdata (pdev, ptdev);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 567/1518 arm64: dts: rockchip: Add missing hclk for RK3588 eDP0
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Damon Ding <[email protected]>
[ Upstream commit ede2ee37f0a445cacbf24760f53befa10f64994a ]
Add the required HCLK_VO1 bus clock to RK3588 eDP0 node with corresponding clock-name "hclk". This clock is necessary for the eDP controller to access video output GRF and work properly.
Previously the clock was enabled implicitly via GRF phandle reference. Add it explicitly now to align with updated binding.
--- arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/rockchip/rk3588-base.dtsi +2 -2
@@ -1648,8 +1648,8 @@ hdmi0_out: port@1 { edp0: edp@fdec0000 { compatible = "rockchip,rk3588-edp"; reg = <0x0 0xfdec0000 0x0 0x1000>; - clocks = <&cru CLK_EDP0_24M>, <&cru PCLK_EDP0>; - clock-names = "dp", "pclk"; + clocks = <&cru CLK_EDP0_24M>, <&cru PCLK_EDP0>, <&cru HCLK_VO1>; + clock-names = "dp", "pclk", "hclk"; interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH 0>; phys = <&hdptxphy0>; phy-names = "dp";
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 568/1518 arm64: dts: rockchip: Add missing hclk for RK3588 eDP1
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Damon Ding <[email protected]>
[ Upstream commit 09820811c549ee2c408defe36b210b13c7a85fcf ]
Add the required HCLK_VO1 bus clock to RK3588 eDP1 node with corresponding clock-name "hclk". This clock is necessary for the eDP controller to access video output GRF and work properly.
Previously the clock was enabled implicitly via GRF phandle reference. Add it explicitly now to align with updated binding.
--- arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi +2 -2
@@ -285,8 +285,8 @@ hdmi1_out: port@1 { edp1: edp@fded0000 { compatible = "rockchip,rk3588-edp"; reg = <0x0 0xfded0000 0x0 0x1000>; - clocks = <&cru CLK_EDP1_24M>, <&cru PCLK_EDP1>; - clock-names = "dp", "pclk"; + clocks = <&cru CLK_EDP1_24M>, <&cru PCLK_EDP1>, <&cru HCLK_VO1>; + clock-names = "dp", "pclk", "hclk"; interrupts = <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH 0>; phys = <&hdptxphy1>; phy-names = "dp";
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 569/1518 arm64: dts: rockchip: Fix Gru WLAN sideband interrupt
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fabio Estevam <[email protected]>
[ Upstream commit a761818d9ee11183df0aefd16bf9fe46cc1c4c6d ]
The Marvell WLAN host wake interrupt is wired to GPIO0 8 and is not one of the PCI INTx interrupts. The PCI device schema therefore interprets the two-cell GPIO interrupt specifier as an invalid PCI interrupt and reports dtbs_check warnings:
pcie@0,0: wifi@0,0:interrupts:0:0: 8 is not one of [1, 2, 3, 4] pcie@0,0: wifi@0,0:interrupts:0: [8, 8] is too long
Describe the sideband interrupt with interrupts-extended, which explicitly carries the interrupt controller and removes the ambiguity.
--- arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi +1 -2
@@ -503,8 +503,7 @@ &pci_rootport { mvl_wifi: wifi@0,0 { compatible = "pci1b4b,2b42"; reg = <0x0000 0x0 0x0 0x0 0x0>; - interrupt-parent = <&gpio0>; - interrupts = <8 IRQ_TYPE_LEVEL_LOW>; + interrupts-extended = <&gpio0 8 IRQ_TYPE_LEVEL_LOW>; pinctrl-names = "default"; pinctrl-0 = <&wlan_host_wake_l>; wakeup-source;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 570/1518 arm64: dts: rockchip: Fix rk3566-bigtreetech-cb2 touchscreen property
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fabio Estevam <[email protected]>
[ Upstream commit 7707e4555cf1d52689621e3206df8ad2debaa0dd ]
The TSC2007 driver uses the ti,max-rt property to specify the maximum touch resistance, but the rk3566-bigtreetech-cb2 device tree uses the undocumented ti,rt-thr property instead.
As a result, the configured value is ignored and the driver falls back to its default maximum resistance value of 4095.
Replace ti,rt-thr with ti,max-rt to preserve the intended resistance threshold of 3000.
--- arch/arm64/boot/dts/rockchip/rk3566-bigtreetech-cb2.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3566-bigtreetech-cb2.dtsi +1 -1
@@ -569,7 +569,7 @@ tft_tp: touchscreen@48 { reg = <0x48>; status = "okay"; ti,x-plate-ohms = <660>; - ti,rt-thr = <3000>; + ti,max-rt = <3000>; ti,fuzzx = <32>; ti,fuzzy = <16>; };
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 571/1518 bpf: Fix CFI mismatch in task work callback
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mykyta Yatsenko <[email protected]>
[ Upstream commit 2805abd089576799b15092949420e3f8ba97fabd ]
BPF subprograms use the bpf_callback_t ABI, but task work invokes the callback through a three-argument function pointer. This trips kCFI.
Store and invoke the callback as bpf_callback_t.
--- kernel/bpf/helpers.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
kernel/bpf/helpers.c +5 -4
@@ -3960,7 +3960,7 @@ struct bpf_task_work_ctx {struct bpf_map *map;void *map_val;enum task_work_notify_mode mode; -bpf_task_work_callback_t callback_fn; +bpf_callback_t callback_fn;struct rcu_head rcu; }__aligned(8) ;
@@ -4035,7 +4035,8 @@ static void bpf_task_work_callback(struct callback_head *cb) key = (void *)map_key_from_value (ctx->map, ctx->map_val, &idx);migrate_disable (); - ctx->callback_fn (ctx->map, key, ctx->map_val); + ctx->callback_fn ((u64 )(long )ctx->map, (u64 )(long )key, + (u64 )(long )ctx->map_val,0 ,0 );migrate_enable ();bpf_task_work_ctx_reset (ctx);
@@ -4148,7 +4149,7 @@ static struct bpf_task_work_ctx *bpf_task_work_acquire_ctx(struct bpf_task_work }static int bpf_task_work_schedule (struct task_struct *task,struct bpf_task_work *tw, -struct bpf_map *map,bpf_task_work_callback_t callback_fn, +struct bpf_map *map,void *callback_fn,struct bpf_prog_aux *aux,enum task_work_notify_mode mode) {struct bpf_prog *prog;
@@ -4173,7 +4174,7 @@ static int bpf_task_work_schedule(struct task_struct *task, struct bpf_task_work } ctx->task = task; - ctx->callback_fn = callback_fn; + ctx->callback_fn = (bpf_callback_t )callback_fn; ctx->prog = prog; ctx->mode = mode; ctx->map = map;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 572/1518 ARM: lpc32xx: only run SoC init on LPC32xx hardware
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Karl Mehltretter <[email protected]>
[ Upstream commit 717ea4000867e6dffee5e1ed92150a9704ae9f68 ]
lpc32xx_check_uid() and lpc32xx_pm_init() are arch_initcalls that poke LPC32xx-only registers. Since the multiplatform conversion they also run on other ARCH_MULTI_V5 boards where access faults e.g. on versatile:
Unable to handle kernel paging request at virtual address f4004130 PC is at lpc32xx_check_uid+0x2c/0x9c
Drop the arch_initcall() registrations and call both functions directly from lpc3250_machine_init(), the machine's .init_machine hook. The calls are placed in link order (common.c, pm.c, phy3250.c) to keep their previous relative ordering.
--- arch/arm/mach-lpc32xx/common.c | 5 +---- arch/arm/mach-lpc32xx/common.h | 2 ++ arch/arm/mach-lpc32xx/phy3250.c | 2 ++ arch/arm/mach-lpc32xx/pm.c | 5 +---- 4 files changed, 6 insertions(+), 8 deletions(-)
arch/arm/mach-lpc32xx/common.c +1 -4
@@ -106,7 +106,7 @@ void __init lpc32xx_map_io(void)iotable_init (lpc32xx_io_desc,ARRAY_SIZE (lpc32xx_io_desc)); } -static int __init lpc32xx_check_uid (void ) +void __init lpc32xx_check_uid (void ) {u32 uid[4 ];
@@ -119,7 +119,4 @@ static int __init lpc32xx_check_uid(void) system_serial_low = uid[0 ]; system_serial_high = uid[1 ]; } - -return 1 ; } -arch_initcall (lpc32xx_check_uid);
arch/arm/mach-lpc32xx/common.h +2 -0
@@ -16,6 +16,8 @@* Other arch specific structures and functions */ extern void __init lpc32xx_map_io (void ); +extern void __init lpc32xx_check_uid (void ); +extern void __init lpc32xx_pm_init (void );extern void __init lpc32xx_serial_init (void );/*
arch/arm/mach-lpc32xx/phy3250.c +2 -0
@@ -71,6 +71,8 @@ static const struct of_dev_auxdata lpc32xx_auxdata_lookup[] __initconst = {static void __init lpc3250_machine_init (void ) { +lpc32xx_check_uid (); +lpc32xx_pm_init ();lpc32xx_serial_init ();of_platform_default_populate (NULL , lpc32xx_auxdata_lookup,NULL );
arch/arm/mach-lpc32xx/pm.c +1 -4
@@ -120,7 +120,7 @@ static const struct platform_suspend_ops lpc32xx_pm_ops = {#define EMC_DYN_MEM_CTRL_OFS 0x20#define EMC_SRMMC (1 << 3)#define EMC_CTRL_REG io_p2v(LPC32XX_EMC_BASE + EMC_DYN_MEM_CTRL_OFS) -static int __init lpc32xx_pm_init (void ) +void __init lpc32xx_pm_init (void ) {/* * Setup SDRAM self-refresh clock to automatically disable o
@@ -129,7 +129,4 @@ static int __init lpc32xx_pm_init(void)__raw_writel (__raw_readl (EMC_CTRL_REG ) |EMC_SRMMC ,EMC_CTRL_REG );suspend_set_ops (&lpc32xx_pm_ops); - -return 0 ; } -arch_initcall (lpc32xx_pm_init);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 573/1518 selftests/bpf: Fix incorrect error checking for pthread_create
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Feng Yang <[email protected]>
[ Upstream commit b04b8d4e198aefc863e7b702ececb957845b0c25 ]
pthread_create returns 0 on success and a positive error code on failure; it never returns a negative value. The current conditional branch can never be taken. Failures during thread creation are silently ignored, which will lead to invalid memory access when waiting on threads or dereferencing thread handles later.
--- tools/testing/selftests/bpf/test_progs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/test_progs.c +1 -1
@@ -1690,7 +1690,7 @@ static void server_main(void) data[i].worker_id = i; data[i].sock_fd = env.worker_socks[i]; rc =pthread_create (&dispatcher_threads[i],NULL , dispatch_thread, &data[i]); -if (rc <0 ) { +if (rc) {perror ("Failed to launch dispatcher thread" );exit (EXIT_ERR_SETUP_INFRA ); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 574/1518 selftests/bpf: Fix memory leak on subtest_states reallocation
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Feng Yang <[email protected]>
[ Upstream commit 06efb01c6530e9cfc247178cb96aa8adb3beaf61 ]
Fix memory leak in subtest_states reallocation,
and revert subtest_num if allocation fails.
--- tools/testing/selftests/bpf/test_progs.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
tools/testing/selftests/bpf/test_progs.c +5 -4
@@ -550,18 +550,19 @@ bool test__start_subtest(const char *subtest_name)struct test_state *state = env.test_state;struct subtest_state *subtest_state;size_t sub_state_size =sizeof (*subtest_state); +void *tmp;if (env.subtest_state)test__end_subtest (); state->subtest_num++; - state->subtest_states = -realloc (state->subtest_states, - state->subtest_num * sub_state_size); -if (!state->subtest_states) { + tmp =realloc (state->subtest_states, state->subtest_num * sub_state_size); +if (!tmp) { + state->subtest_num--;fprintf (stderr,"Not enough memory to allocate subtest result\n" );return false; } + state->subtest_states = tmp; subtest_state = &state->subtest_states[state->subtest_num -1 ];
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 575/1518 cxl/region: Fix use-after-free in find_pos_and_ways() error path
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alison Schofield <[email protected]>
[ Upstream commit 15da704b732332cc1e8f121f624e5e6c05124c5d ]
The error path releases its reference to a switch decoder before logging an error that includes the decoder name. If the released reference is the last one, the decoder can be freed before the error message accesses its name.
Drop the reference after the error is reported.
--- drivers/cxl/core/region.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/cxl/core/region.c +3 -4
@@ -1815,14 +1815,13 @@ static int find_pos_and_ways(struct cxl_port *port, struct range *range,break ; } } -put_device (dev); -if (rc)dev_err (port->uport_dev,"failed to find %s:%s in target list of %s\n" ,dev_name (&port->dev), -dev_name (port->parent_dport->dport_dev), -dev_name (&cxlsd->cxld.dev)); +dev_name (port->parent_dport->dport_dev),dev_name (dev)); + +put_device (dev);return rc; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 576/1518 pinctrl: mediatek: free EINT resources on unbind
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Justin Yeh <[email protected]>
[ Upstream commit 88292b7103d260e3e606eb3bb2794060a5fde48e ]
mtk_eint_do_init() creates an IRQ domain, populates it with a mapping for every EINT line and installs a chained handler on the parent interrupt, but none of these are ever released. This was harmless while the drivers were built-in, but now that they can be built as modules and unbound/rmmod'd it leaves behind a dangling IRQ domain, interrupt mappings whose chip data points at freed memory, and a chained handler that keeps firing into that freed data.
The plain allocations in mtk_eint_do_init() already use the device-managed devm_*() helpers, so tear the remaining resources down the same way:
register a devm action that detaches the chained handler, waits for any in-flight handler to finish, disposes of the per-line mappings and removes the IRQ domain. This mirrors the device-managed lifecycle adopted for the GPIO chip and keeps the whole EINT setup self-cleaning on unbind.
--- drivers/pinctrl/mediatek/mtk-eint.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-)
drivers/pinctrl/mediatek/mtk-eint.c +24 -1
@@ -12,8 +12,10 @@*/ #include <linux/delay.h> +#include <linux/device.h> #include <linux/err.h> #include <linux/gpio/driver.h> +#include <linux/interrupt.h> #include <linux/io.h> #include <linux/irqchip/chained_irq.h> #include <linux/irqdomain.h>
@@ -504,6 +506,27 @@ int mtk_eint_find_irq(struct mtk_eint *eint, unsigned long eint_n) }EXPORT_SYMBOL_GPL (mtk_eint_find_irq); +static void mtk_eint_teardown (void *data) +{ +struct mtk_eint *eint = data; +unsigned int i, virq; + +/* Detach the demux handler so it can no longer reference freed data. */ +irq_set_chained_handler_and_data (eint->irq,NULL ,NULL ); + +/* Wait for any in-flight handler to finish before tearing down. */ +synchronize_irq (eint->irq); + +/* Dispose of all child mappings before the domain is removed. */ +for (i =0 ; i < eint->hw->ap_num; i++) { + virq =irq_find_mapping (eint->domain, i); +if (virq) +irq_dispose_mapping (virq); + } + +irq_domain_remove (eint->domain); +} +int mtk_eint_do_init (struct mtk_eint *eint,struct mtk_eint_pin *eint_pin) {unsigned int size, i, port, virq, inst =0 ;
@@ -596,7 +619,7 @@ int mtk_eint_do_init(struct mtk_eint *eint, struct mtk_eint_pin *eint_pin)irq_set_chained_handler_and_data (eint->irq, mtk_eint_irq_handler, eint); -return 0 ; +return devm_add_action_or_reset (eint->dev, mtk_eint_teardown, eint); err_eint:for (i =0 ; i < eint->nbase; i++) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 577/1518 tools/build: Allow versioning of all LLVM tools defined in Makefile.include
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: James Clark <[email protected]>
[ Upstream commit d5a1d1270c898057afc5b51fb6d0f2defa89d56d ]
The version of LLVM tools can be given on the build command with LLVM=-15, but this isn't applied to all tools. For example $(CC) gets versioned, but $(CLANG) doesn't. This causes a Perf build with LTO=1 to fail with an error about mixed clang versions:
ld.lld: error: libperf/core.o: Unknown attribute kind (86)
(Producer: 'LLVM18.1.8' Reader: 'LLVM 15.0.7')
This file has two "ifneq ($(LLVM),)" blocks adjacent to each other, so merge these blocks making it obvious that all tools should be versioned consistently and there is nothing special about each block.
This also reveals that ?= and "allow-override" are used inconsistently between the blocks. "allow-override" is technically only required for builtin variables, but isn't only used on them, and doesn't do any harm if used on a non-builtin. Make them all "allow-override" for consistency. The only functional difference this will cause is if there is a file level definition of one of the variables followed by an "#include of Makefile.include" which will now overwrite. But this isn't done and in a later commit some of the duplicate definitions will be removed for good measure.
There are also some other LLVM tools that are not defined here and will be moved in a later commit.
--- tools/scripts/Makefile.include | 37 ++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 17 deletions(-)
tools/scripts/Makefile.include +20 -17
@@ -59,10 +59,18 @@ LLVM_SUFFIX := $(LLVM) endif $(call allow-override,CC,$(LLVM_PREFIX)clang$(LLVM_SUFFIX)) +$(call allow-override,CLANG,$(LLVM_PREFIX)clang$(LLVM_SUFFIX)) +$(call allow-override,HOSTCC,$(LLVM_PREFIX)clang$(LLVM_SUFFIX)) $(call allow-override,AR,$(LLVM_PREFIX)llvm-ar$(LLVM_SUFFIX)) +$(call allow-override,HOSTAR,$(LLVM_PREFIX)llvm-ar$(LLVM_SUFFIX)) $(call allow-override,LD,$(LLVM_PREFIX)ld.lld$(LLVM_SUFFIX)) +$(call allow-override,HOSTLD,$(LLVM_PREFIX)ld.lld$(LLVM_SUFFIX)) $(call allow-override,CXX,$(LLVM_PREFIX)clang++$(LLVM_SUFFIX)) $(call allow-override,STRIP,$(LLVM_PREFIX)llvm-strip$(LLVM_SUFFIX)) +$(call allow-override,LLVM_STRIP,$(LLVM_PREFIX)llvm-strip$(LLVM_SUFFIX)) +$(call allow-override,LLC,$(LLVM_PREFIX)llc$(LLVM_SUFFIX)) +$(call allow-override,LLVM_CONFIG,$(LLVM_PREFIX)llvm-config$(LLVM_SUFFIX)) +$(call allow-override,LLVM_OBJCOPY,$(LLVM_PREFIX)llvm-objcopy$(LLVM_SUFFIX)) else # Allow setting various cross-compile vars or setting CROSS_COMPILE as a prefix. $(call allow-override,CC,$(CROSS_COMPILE)gcc)
@@ -70,26 +78,21 @@ $(call allow-override,AR,$(CROSS_COMPILE)ar) $(call allow-override,LD,$(CROSS_COMPILE)ld) $(call allow-override,CXX,$(CROSS_COMPILE)g++) $(call allow-override,STRIP,$(CROSS_COMPILE)strip) -endif - -CC_NO_CLANG := $(shell $(CC) -dM -E -x c /dev/null | grep -Fq "__clang__"; echo $$?) -ifneq ($(LLVM),) -HOSTAR ?= $(LLVM_PREFIX)llvm-ar$(LLVM_SUFFIX) -HOSTCC ?= $(LLVM_PREFIX)clang$(LLVM_SUFFIX) -HOSTLD ?= $(LLVM_PREFIX)ld.lld$(LLVM_SUFFIX) -else -HOSTAR ?= ar -HOSTCC ?= gcc -HOSTLD ?= ld +# Host versions aren't prefixed +$(call allow-override,HOSTAR,ar) +$(call allow-override,HOSTCC,gcc) +$(call allow-override,HOSTLD,ld) + +# Some tools still require Clang, LLC and/or LLVM utils +$(call allow-override,CLANG,clang) +$(call allow-override,LLC,llc) +$(call allow-override,LLVM_CONFIG,llvm-config) +$(call allow-override,LLVM_OBJCOPY,llvm-objcopy) +$(call allow-override,LLVM_STRIP,llvm-strip) endif -# Some tools require Clang, LLC and/or LLVM utils -CLANG ?= clang -LLC ?= llc -LLVM_CONFIG ?= llvm-config -LLVM_OBJCOPY ?= llvm-objcopy -LLVM_STRIP ?= llvm-strip +CC_NO_CLANG := $(shell $(CC) -dM -E -x c /dev/null | grep -Fq "__clang__"; echo $$?) # Some tools require bpftool SYSTEM_BPFTOOL ?= bpftool
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 578/1518 arm64: RSI: fix field-spanning write warning in attestation token init
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kohei Enju <[email protected]>
[ Upstream commit 221049874b6a78c7d87bc826581b0695cd338e2b ]
The challenge is passed in registers a1 through a8. However, copying to ®s.a1 makes FORTIFY treat the destination as the single a1 field, resulting in a field-spanning write warning. [1]
Overlay the SMCCC register structure with an RSI-specific argument layout and copy the challenge into an explicit 64-byte array. This keeps the existing a1-a8 argument encoding while giving the copy a correctly sized destination object.
[1]
memcpy: detected field-spanning write (size 64) of single field "®s.a1" at ./arch/arm64/include/asm/rsi_cmds.h:119 (size 8)
WARNING: ./arch/arm64/include/asm/rsi_cmds.h:119 at rsi_attestation_token_init+0xdc/0xf8 [arm_cca_guest], CPU#0: cat/3314
--- arch/arm64/include/asm/rsi_cmds.h | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-)
arch/arm64/include/asm/rsi_cmds.h +19 -8
@@ -88,6 +88,14 @@ static inline long rsi_set_addr_range_state(phys_addr_t start,return res.a0; } +#define RSI_ATTEST_CHALLENGE_MIN_SIZE 32 +#define RSI_ATTEST_CHALLENGE_MAX_SIZE 64 + +struct rsi_attestation_token_init_args { +unsigned long fid; +u8 challenge[RSI_ATTEST_CHALLENGE_MAX_SIZE ]; +}; +/** * rsi_attestation_token_init - Initialise the operation to retrieve an * attestation token.
@@ -109,18 +117,21 @@ static inline long rsi_set_addr_range_state(phys_addr_t start,static inline long rsi_attestation_token_init (const u8 *challenge,unsigned long size) { -struct arm_smccc_1_2_regs regs = {0 }; +union { +struct arm_smccc_1_2_regs regs; +struct rsi_attestation_token_init_args init; + } args = {0 }; -/* The challenge must be at least 32bytes and at most 64bytes */ -if (!challenge || size <32 || size >64 ) +if (!challenge || size <RSI_ATTEST_CHALLENGE_MIN_SIZE || + size >RSI_ATTEST_CHALLENGE_MAX_SIZE )return -EINVAL ; - regs.a0 =SMC_RSI_ATTESTATION_TOKEN_INIT ; -memcpy (®s.a1, challenge, size); -arm_smccc_1_2_smc (®s, ®s); + args.init.fid =SMC_RSI_ATTESTATION_TOKEN_INIT ; +memcpy (args.init.challenge, challenge, size); +arm_smccc_1_2_smc (&args.regs, &args.regs); -if (regs.a0 ==RSI_SUCCESS ) -return regs.a1; +if (args.regs.a0 ==RSI_SUCCESS ) +return args.regs.a1;return -EINVAL ; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 579/1518 power: supply: sbs-battery: Use a per-device serial number buffer
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Babanpreet Singh <[email protected]>
[ Upstream commit 6027892925b8d19d2245c2d077e2ae35b49cc2b1 ]
sbs_get_battery_serial_number() formats the battery serial number into sbs_serial[], a single file-scope buffer shared by every sbs-battery instance, and points val->strval at it.
Nothing restricts this driver to one instance. It binds per I2C client, and sbs-manager registers one muxed I2C channel per supported battery specifically so that the smart battery driver can be bound to each of them, so several sbs-battery instances on one system is a supported configuration.
The power supply core reads strval after the driver's get_property() callback has returned: power_supply_show_property() fills a local union power_supply_propval, then formats it with sysfs_emit(). Two concurrent POWER_SUPPLY_PROP_SERIAL_NUMBER reads on different batteries therefore race for the shared buffer - battery B's sprintf() can land between battery A filling the buffer and the core reading it, and battery A then reports battery B's serial number.
Move the buffer into struct sbs_info so that each battery formats into its own storage. It is deliberately not added to the chip->strings[]
array: those entries hold the cached constant strings that sbs_invalidate_cached_props() clears on presence changes, whereas the serial number is re-read from its word register on every access.
--- drivers/power/supply/sbs-battery.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/power/supply/sbs-battery.c +4 -3
@@ -217,6 +217,7 @@ struct sbs_info {u32 flags;int technology;char strings[NR_STRING_BUFFERS ][I2C_SMBUS_BLOCK_MAX +1 ]; +char serial[5 ]; }; static char *sbs_get_string_buf(struct sbs_info *chip,
@@ -821,18 +822,18 @@ static int sbs_get_battery_capacity(struct i2c_client *client,return 0 ; } -static char sbs_serial[5 ];static int sbs_get_battery_serial_number (struct i2c_client *client,union power_supply_propval *val) { +struct sbs_info *chip =i2c_get_clientdata (client);int ret; ret =sbs_read_word_data (client, sbs_data[REG_SERIAL_NUMBER ].addr);if (ret <0 )return ret; -sprintf (sbs_serial,"%04x" , ret); - val->strval = sbs_serial; +sprintf (chip->serial,"%04x" , ret); + val->strval = chip->serial;return 0 ; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 580/1518 scsi: ufs: debugfs: Reserve space for a string terminator
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Li Qiang <[email protected]>
[ Upstream commit abd26e6b53c4169122d61fdd4cabe09bdd916aac ]
ufs_saved_err_write() copies user input into a zero-initialized stack buffer and passes it to kstrtoint(). A write that fills the entire buffer overwrites its only terminator.
Reject an input whose length leaves no room for the trailing NUL.
--- drivers/ufs/core/ufs-debugfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ufs/core/ufs-debugfs.c +1 -1
@@ -165,7 +165,7 @@ static ssize_t ufs_saved_err_write(struct file *file, const char __user *buf,char val_str[16 ] = { };int val, ret; -if (count >sizeof (val_str)) +if (count >=sizeof (val_str))return -EINVAL ;if (copy_from_user (val_str, buf, count))return -EFAULT ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 581/1518 crypto: keembay - Initialize completion before requesting IRQ
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Linmao Li <[email protected]>
[ Upstream commit fce20289dd622cc7ab78d72c8a979a9f8b7cb10e ]
kmb_ocs_aes_probe() requests the device IRQ before initializing irq_completion. Once the handler is registered it can run immediately, and ocs_aes_irq_handler() unconditionally calls complete(). An interrupt in this window would therefore use an uninitialized completion.
Initialize the completion before requesting the IRQ, as the sibling OCS HCU and ECC drivers already do.
--- drivers/crypto/intel/keembay/keembay-ocs-aes-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/crypto/intel/keembay/keembay-ocs-aes-core.c +2 -2
@@ -1602,6 +1602,8 @@ static int kmb_ocs_aes_probe(struct platform_device *pdev)if (IS_ERR (aes_dev->base_reg))return PTR_ERR (aes_dev->base_reg); +init_completion (&aes_dev->irq_completion); +/* Get and request IRQ */ aes_dev->irq =platform_get_irq (pdev,0 );if (aes_dev->irq <0 )
@@ -1619,8 +1621,6 @@ static int kmb_ocs_aes_probe(struct platform_device *pdev)list_add_tail (&aes_dev->list, &ocs_aes.dev_list);spin_unlock (&ocs_aes.lock); -init_completion (&aes_dev->irq_completion); -/* Initialize crypto engine */ aes_dev->engine =crypto_engine_alloc_init (dev, true);if (!aes_dev->engine) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 582/1518 crypto: keembay - publish OF module alias for OCS AES/SM4
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Can Peng <[email protected]>
[ Upstream commit 0a94091e29f914e4f233a208599ca4055882c01b ]
The Keem Bay OCS AES/SM4 driver has an OF match table wired to .of_match_table, but does not export the table with MODULE_DEVICE_TABLE().
Although the match table lives in keembay-ocs-aes-core.o, that object is part of the composite keembay-ocs-aes module. Add the missing MODULE_DEVICE_TABLE(of, ...) entry so modpost can generate OF module alias information for OF based module autoloading.
This is a source-level fix. It does not claim dynamic hardware reproduction; the evidence is the driver-owned match table, its use by the platform driver, and the missing module alias publication.
--- drivers/crypto/intel/keembay/keembay-ocs-aes-core.c | 1 + 1 file changed, 1 insertion(+)
drivers/crypto/intel/keembay/keembay-ocs-aes-core.c +1 -0
@@ -1561,6 +1561,7 @@ static const struct of_device_id kmb_ocs_aes_of_match[] = { }, {} }; +MODULE_DEVICE_TABLE (of, kmb_ocs_aes_of_match);static void kmb_ocs_aes_remove (struct platform_device *pdev) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 583/1518 RDMA/mlx5: Fix integer overflow of user QP buffer size
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maher Sanalla <[email protected]>
[ Upstream commit dec47e4b0fe34afdf38caa72b4408ba95502e5de ]
set_user_buf_size() computes the QP buffer size by left-shifting the user-supplied rq.wqe_cnt and rq.wqe_shift values as signed integers. A sufficiently large rq.wqe_cnt causes signed integer overflow, which is undefined behavior, and yields a small or negative buf_size, causing ib_umem_get() to map a buffer smaller than the hardware will actually write into.
Replace the shifts and addition with check_shl_overflow() and check_add_overflow(), rejecting invalid user inputs.
Moreover, guard the identical shift computing qp->sq.offset in _create_user_qp() before set_user_buf_size() is reached.
--- drivers/infiniband/hw/mlx5/qp.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-)
drivers/infiniband/hw/mlx5/qp.c +20 -5
@@ -637,6 +637,7 @@ static int set_user_buf_size(struct mlx5_ib_dev *dev, struct ib_qp_init_attr *attr) {int desc_sz =1 << qp->sq.wqe_shift; +int rq_buf_size, sq_buf_size;if (desc_sz >MLX5_CAP_GEN (dev->mdev, max_wqe_sz_sq)) { mlx5_ib_warn(dev, "desc_sz %d, max_sq_desc_sz %d\n",
@@ -661,11 +662,21 @@ static int set_user_buf_size(struct mlx5_ib_dev *dev,if (attr->qp_type ==IB_QPT_RAW_PACKET || qp->flags &IB_QP_CREATE_SOURCE_QPN ) { - base->ubuffer.buf_size = qp->rq.wqe_cnt << qp->rq.wqe_shift; - qp->raw_packet_qp.sq.ubuffer.buf_size = qp->sq.wqe_cnt <<6 ; +if (check_shl_overflow (qp->rq.wqe_cnt, qp->rq.wqe_shift, + &base->ubuffer.buf_size)) +return -EINVAL ; +if (check_shl_overflow (qp->sq.wqe_cnt,6 , + &qp->raw_packet_qp.sq.ubuffer.buf_size)) +return -EINVAL ; }else { - base->ubuffer.buf_size = (qp->rq.wqe_cnt << qp->rq.wqe_shift) + - (qp->sq.wqe_cnt <<6 ); +if (check_shl_overflow (qp->rq.wqe_cnt, qp->rq.wqe_shift, + &rq_buf_size)) +return -EINVAL ; +if (check_shl_overflow (qp->sq.wqe_cnt,6 , &sq_buf_size)) +return -EINVAL ; +if (check_add_overflow (rq_buf_size, sq_buf_size, + &base->ubuffer.buf_size)) +return -EINVAL ; }return 0 ;
@@ -989,7 +1000,11 @@ static int _create_user_qp(struct mlx5_ib_dev *dev, struct ib_pd *pd, qp->rq.offset =0 ; qp->sq.wqe_shift =ilog2 (MLX5_SEND_WQE_BB ); - qp->sq.offset = qp->rq.wqe_cnt << qp->rq.wqe_shift; +if (check_shl_overflow (qp->rq.wqe_cnt, qp->rq.wqe_shift, + &qp->sq.offset)) { + err = -EINVAL ; + goto err_bfreg; + } err =set_user_buf_size (dev, qp, ucmd, base, attr);if (err)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 584/1518 thermal/drivers/airoha: Fix copy paste error on clamp_t low temp
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Marangi <[email protected]>
[ Upstream commit 251621813fb4275e24431f9a0690aec9b15823e7 ]
In airoha_thermal_set_trips, there is a copy paste error on clamping the value for the low trip temp point. Fix it to the correct value and actually clamp for the low variable.
--- drivers/thermal/airoha_thermal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/thermal/airoha_thermal.c +1 -1
@@ -273,7 +273,7 @@ static int airoha_thermal_set_trips(struct thermal_zone_device *tz, int low,if (low != -INT_MAX ) {/* Validate low and clamp it to a supported value */ - low =clamp_t (int, high,RAW_TO_TEMP (priv,0 ), + low =clamp_t (int, low,RAW_TO_TEMP (priv,0 ),RAW_TO_TEMP (priv,FIELD_MAX (EN7581_DOUT_TADC_MASK )));/* We offset the low temp of 1°C to trigger correct event */
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 585/1518 thermal/drivers/airoha: Fix copy paste error for sen internal
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Marangi <[email protected]>
[ Upstream commit 6791265d609549be55bb35b747c9648d0b570c12 ]
In airoha_thermal_setup_monitor there is a copy paste error on configuring the internval for temp monitor. Fix the error and use the correct mask for the sen interval for the EN7581_TEMPMONCTL2 register.
--- drivers/thermal/airoha_thermal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/thermal/airoha_thermal.c +1 -1
@@ -403,7 +403,7 @@ static void airoha_thermal_setup_monitor(struct airoha_thermal_priv *priv)* sen interval is 379 * 52.715us = 19.97ms */ writel (FIELD_PREP (EN7581_FILT_INTERVAL ,1 ) | -FIELD_PREP (EN7581_FILT_INTERVAL ,379 ), +FIELD_PREP (EN7581_SEN_INTERVAL ,379 ), priv->base +EN7581_TEMPMONCTL2 );/* AHB poll is set to 146 * 68.64 = 10.02us */
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 586/1518 thermal/drivers/qcom-spmi-adc-tm5: Drop IIO_VAL_INT check in adc_tm5_get_temp
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rakesh Kota <[email protected]>
[ Upstream commit 0c569e22020f53ddfac0099b0aa193907bfbcd6f ]
Commit bb21ee31f575 ("iio: Fix iio_multiply_value use in iio_read_channel_processed_scale") fixed the iio_read_channel_processed_scale to return 0 on success instead of IIO_VAL_INT (1). The existing check in adc_tm5_get_temp() treated a successful return as an error because it expected IIO_VAL_INT. Drop the redundant ret != IIO_VAL_INT condition and rely solely on the negative error check.
--- drivers/thermal/qcom/qcom-spmi-adc-tm5.c | 3 --- 1 file changed, 3 deletions(-)
drivers/thermal/qcom/qcom-spmi-adc-tm5.c +0 -3
@@ -369,9 +369,6 @@ static int adc_tm5_get_temp(struct thermal_zone_device *tz, int *temp)if (ret <0 )return ret; -if (ret !=IIO_VAL_INT ) -return -EINVAL ; -return 0 ; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 587/1518 powercap: intel_rapl_tpmi: Handle PMU registration failure during probe
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sumeet Pawnikar <[email protected]>
[ Upstream commit 9229916d59918ec9d3639e7263e1e97be638e361 ]
intel_rapl_tpmi_probe() invokes rapl_package_add_pmu() but ignores its return value, so a PMU registration failure would leave the driver reporting probe success despite the PMU being absent, with no log trace.
Since PMU registration is an optional auxiliary feature for perf energy counters, its failure should not break the primary powercap functionality. Check the return value and log a warning to ensure graceful degradation.
--- drivers/powercap/intel_rapl_tpmi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/powercap/intel_rapl_tpmi.c +4 -1
@@ -314,7 +314,10 @@ static int intel_rapl_tpmi_probe(struct auxiliary_device *auxdev, goto err; } -rapl_package_add_pmu (trp->rp); + ret =rapl_package_add_pmu (trp->rp); +if (ret) +dev_info (&auxdev->dev,"Failed to add RAPL PMU for Package%d, %d\n" , + info->package_id, ret);auxiliary_set_drvdata (auxdev, trp);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 588/1518 isofs: release zisofs block pointer buffer head
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yichong Chen <[email protected]>
[ Upstream commit 2f7dd9b86fe4076059e6a4a2a2c5d565afd76b9e ]
zisofs_fill_pages() reads the compressed block pointer table. The error paths release the current buffer_head, the loop also releases the old buffer_head when it advances. However, the success path leaves the last buffer_head referenced. Release it before returning success.
--- fs/isofs/compress.c | 1 + 1 file changed, 1 insertion(+)
fs/isofs/compress.c +1 -0
@@ -293,6 +293,7 @@ static int zisofs_fill_pages(struct inode *inode, int full_page, int pcount,memzero_page (*pages, poffset,PAGE_SIZE - poffset);SetPageUptodate (*pages); } +brelse (bh);return 0 ; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 589/1518 clk: mediatek: mt6735: Unregister PLLs on probe failure
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Myeonghun Pak <[email protected]>
[ Upstream commit 935ad6242c47b37380d0cb7ec366516fe11855b4 ]
mtk_clk_register_plls() registers the apmixedsys PLL clocks manually, while clk_mt6735_apmixed_remove() unregisters them on driver removal.
If devm_of_clk_add_hw_provider() fails after the PLL registration succeeds, probe returns the error directly and the remove callback is not run. This leaves the registered PLL clocks behind on the probe failure path.
Unregister the PLLs in that failure branch before returning the error.
--- drivers/clk/mediatek/clk-mt6735-apmixedsys.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/clk/mediatek/clk-mt6735-apmixedsys.c +4 -1
@@ -102,9 +102,12 @@ static int clk_mt6735_apmixed_probe(struct platform_device *pdev) ret =devm_of_clk_add_hw_provider (&pdev->dev, of_clk_hw_onecell_get, clk_data); -if (ret) +if (ret) {dev_err (&pdev->dev,"Failed to register clock provider: %d\n" , ret); +mtk_clk_unregister_plls (apmixedsys_plls,ARRAY_SIZE (apmixedsys_plls), + clk_data); + }return ret; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 590/1518 spi: oc-tiny: switch to managed controller allocation
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fan Wu <[email protected]>
[ Upstream commit d710f43ce30975d197f73c543bfe47b958d8ba17 ]
The controller is allocated with the non-managed spi_alloc_host() while the interrupt is registered with devm_request_irq(). During removal, spi_bitbang_stop() only unregisters the controller; the subsequent spi_controller_put() then frees the controller together with its embedded driver-private devdata, which is the IRQ handler's dev_id. The devm_request_irq() release action (free_irq()), which drains the handler, does not run until after .remove() returns. A late or latched interrupt can therefore reach tiny_spi_irq() and dereference already-freed memory (e.g. hw->base).
Switch to devm_spi_alloc_host() so that the devres LIFO order releases the controller only after free_irq() has drained the handler, and drop the now-redundant spi_controller_put() from .remove(). The probe error path is simplified to direct returns.
This issue was found by an in-house static analysis tool.
--- drivers/spi/spi-oc-tiny.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-)
drivers/spi/spi-oc-tiny.c +8 -16
@@ -211,11 +211,11 @@ static int tiny_spi_probe(struct platform_device *pdev)struct tiny_spi_platform_data *platp =dev_get_platdata (&pdev->dev);struct tiny_spi *hw;struct spi_controller *host; -int err = -ENODEV ; +int err; - host =spi_alloc_host (&pdev->dev,sizeof (struct tiny_spi )); + host =devm_spi_alloc_host (&pdev->dev,sizeof (struct tiny_spi ));if (!host) -return err; +return -ENOMEM ;/* setup the host state. */ host->bus_num = pdev->id;
@@ -233,10 +233,8 @@ static int tiny_spi_probe(struct platform_device *pdev)/* find and map our resources */ hw->base =devm_platform_ioremap_resource (pdev,0 ); -if (IS_ERR (hw->base)) { - err =PTR_ERR (hw->base); - goto exit; - } +if (IS_ERR (hw->base)) +return PTR_ERR (hw->base);/* irq is optional */ hw->irq =platform_get_irq (pdev,0 );if (hw->irq >=0 ) {
@@ -244,7 +242,7 @@ static int tiny_spi_probe(struct platform_device *pdev) err =devm_request_irq (&pdev->dev, hw->irq, tiny_spi_irq,0 , pdev->name, hw);if (err) - goto exit; +return err; }/* find platform data */ if (platp) {
@@ -253,29 +251,23 @@ static int tiny_spi_probe(struct platform_device *pdev) }else { err =tiny_spi_of_probe (pdev);if (err) - goto exit; +return err; }/* register our spi controller */ err =spi_bitbang_start (&hw->bitbang);if (err) - goto exit; +return err;dev_info (&pdev->dev,"base %p, irq %d\n" , hw->base, hw->irq);return 0 ; - -exit: -spi_controller_put (host); -return err; }static void tiny_spi_remove (struct platform_device *pdev) {struct tiny_spi *hw =platform_get_drvdata (pdev); -struct spi_controller *host = hw->bitbang.ctlr;spi_bitbang_stop (&hw->bitbang); -spi_controller_put (host); }#ifdef CONFIG_OF
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 591/1518 w1: ds2482: Fix signedness bug in ds2482_w1_triplet()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Babanpreet Singh <[email protected]>
[ Upstream commit 4d3721b204f961e905714954ff95633337b768e3 ]
ds2482_wait_1wire_idle() returns the status register value (0..255) on success, or a negative value on I2C failure: -1 when selecting the status register fails, or a negative errno from i2c_smbus_read_byte().
ds2482_w1_triplet() feeds that result into "return (status >> 5);" without checking for errors, and the function returns u8. For a negative status the arithmetic shift keeps the sign and the u8 truncation fabricates a triplet result whose meaning depends on the errno value: -1 and -EIO happen to become 0xff, whose set low bits make w1_search() abort, but -ETIMEDOUT (-110 >> 5 = -4) becomes 0xfc - "devices responded on both branches, wrote 1" - and -EOPNOTSUPP (-95 >> 5 = -3) becomes 0xfd - "only the zero branch responded". w1_search() then continues the ROM search with a fabricated direction bit instead of aborting, and the corrupted id is either rejected by the ROM CRC (existing device missed) or registers a phantom slave.
The function already defines an in-band error value: status is initialized to (3 << 5), which decodes to 3 (both branch bits set, "no device responded") and makes w1_search() terminate the search when sending the triplet command fails. Decode a negative status to the same value.
Found by smatch:drivers/w1/masters/ds2482.c:314 ds2482_w1_triplet() warn: signedness bug returning '(-67108864)'
--- drivers/w1/masters/ds2482.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/w1/masters/ds2482.c +4 -0
@@ -310,6 +310,10 @@ static u8 ds2482_w1_triplet(void *data, u8 dbit)mutex_unlock (&pdev->access_lock); +/* On bus error, decode to 3 (no device responded) to abort the search */ +if (status <0 ) + status =3 <<5 ; +/* Decode the status */ return (status >>5 ); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 592/1518 cpufreq/amd-pstate: Add comment explaining nominal_perf usage for performance policy
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Juan Martinez <[email protected]>
[ Upstream commit 94dbce6c13cd7634f9bdb402248991c95a8c3d57 ]
Add comment explaining why nominal_perf is used for MinPerf when the CPU frequency policy is set to CPUFREQ_POLICY_PERFORMANCE, rather than using highest_perf or lowest_nonlinear_perf.
Stable-dep-of: 5c3ecf36d291 ("cpufreq/amd-pstate: Set min_limit_freq based on bios_min_perf")
--- drivers/cpufreq/amd-pstate.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/cpufreq/amd-pstate.c +13 -0
@@ -635,6 +635,19 @@ static void amd_pstate_update_min_max_limit(struct cpufreq_policy *policy)WRITE_ONCE (cpudata->max_limit_freq, policy->max);if (cpudata->policy ==CPUFREQ_POLICY_PERFORMANCE ) { +/* +* For performance policy, set MinPerf to nominal_perf rather than +* highest_perf or lowest_nonlinear_perf. +* +* Per commit 0c411b39e4f4c, using highest_perf was observed +* to cause frequency throttling on power-limited platforms, leading to +* performance regressions. Using lowest_nonlinear_perf would limit +* performance too much for HPC workloads requiring high frequency +* operation and minimal wakeup latency from idle states. +* +* nominal_perf therefore provides a balance by avoiding throttling +* while still maintaining enough performance for HPC workloads. +*/ perf.min_limit_perf =min (perf.nominal_perf, perf.max_limit_perf);WRITE_ONCE (cpudata->min_limit_freq,min (cpudata->nominal_freq, cpudata->max_limit_freq)); }else {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 593/1518 cpufreq/amd-pstate: Set min_limit_freq based on bios_min_perf
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: K Prateek Nayak <[email protected]>
[ Upstream commit 5c3ecf36d2918facff40548ee6ae28eef0865266 ]
amd_pstate_update_min_max_limit() sets the min_limit_perf to the nominal_perf to avoid frequency throttling when the system is idling.
This was found to be an ideal default but is suboptimal for users who have profiled their workload at different operating frequencies and have configured the optimal idling frequency via bios_min_perf.
Use the bios_min_perf (if configured) as the min_limit_perf when running with performance governor. In absence of bios_min_perf, continue using nominal_perf as the default min_limit_perf to avoid throttling.
--- drivers/cpufreq/amd-pstate.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
drivers/cpufreq/amd-pstate.c +16 -6
@@ -635,9 +635,12 @@ static void amd_pstate_update_min_max_limit(struct cpufreq_policy *policy)WRITE_ONCE (cpudata->max_limit_freq, policy->max);if (cpudata->policy ==CPUFREQ_POLICY_PERFORMANCE ) { +u8 min_limit_perf = perf.bios_min_perf ?: perf.nominal_perf; +u32 min_limit_freq; +/* -* For performance policy, set MinPerf to nominal_perf rather than -* highest_perf or lowest_nonlinear_perf. +* For performance policy, set MinPerf to nominal_perf / bios_min_perf +* rather than highest_perf or lowest_nonlinear_perf. * * Per commit 0c411b39e4f4c, using highest_perf was observed * to cause frequency throttling on power-limited platforms, leading to
@@ -645,11 +648,18 @@ static void amd_pstate_update_min_max_limit(struct cpufreq_policy *policy)* performance too much for HPC workloads requiring high frequency * operation and minimal wakeup latency from idle states. * -* nominal_perf therefore provides a balance by avoiding throttling -* while still maintaining enough performance for HPC workloads. +* nominal_perf therefore provides a balanced default by avoiding +* throttling while still maintaining enough performance for HPC +* workloads when bios_min_perf is not available. +* +* When bios_min_perf is available, users have profiled their workloads +* to understand the best idling frequency. Use that instead. */ - perf.min_limit_perf =min (perf.nominal_perf, perf.max_limit_perf); -WRITE_ONCE (cpudata->min_limit_freq,min (cpudata->nominal_freq, cpudata->max_limit_freq)); + min_limit_perf =min (min_limit_perf, perf.max_limit_perf); + min_limit_freq =perf_to_freq (perf, cpudata->nominal_freq, min_limit_perf); + perf.min_limit_perf = min_limit_perf; + +WRITE_ONCE (cpudata->min_limit_freq,min (min_limit_freq, cpudata->max_limit_freq)); }else { perf.min_limit_perf =freq_to_perf (perf, cpudata->nominal_freq, policy->min);WRITE_ONCE (cpudata->min_limit_freq, policy->min);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 594/1518 remoteproc: core: Drop redundant initialization of ret in rproc_shutdown()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peng Fan <[email protected]>
[ Upstream commit 4531b6bad5af669511c348ad5225d9f697af221b ]
The variable ret is immediately assigned the return value of mutex_lock_interruptible(), making its prior initialization to zero unnecessary. Remove the redundant assignment
No functional changes.
Stable-dep-of: 2482ca875ef5 ("remoteproc: Allow shutdown of crashed processors")
--- drivers/remoteproc/remoteproc_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/remoteproc/remoteproc_core.c +1 -1
@@ -1989,7 +1989,7 @@ EXPORT_SYMBOL(rproc_boot);int rproc_shutdown (struct rproc *rproc) {struct device *dev = &rproc->dev; -int ret =0 ; +int ret; ret =mutex_lock_interruptible (&rproc->lock);if (ret) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 595/1518 remoteproc: Allow shutdown of crashed processors
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bjorn Andersson <[email protected]>
[ Upstream commit 2482ca875ef5993df8daee563033d70e2523a25f ]
rproc_shutdown() rejects a remoteproc in RPROC_CRASHED state, and rproc_del() ignores that error. The result of these two decisions is that a user cannot stop a remoteproc that with recovery disabled that has entered a crash state, and removal of an associated remoteproc driver will release resources without first stopping the remoteproc.
Allow rproc_shutdown() to stop crashed processors. Propagate the crash state to subdevice teardown, to allow subdevices to dismantle things appropriately.
--- drivers/remoteproc/remoteproc_core.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/remoteproc/remoteproc_core.c +5 -2
@@ -1989,6 +1989,7 @@ EXPORT_SYMBOL(rproc_boot);int rproc_shutdown (struct rproc *rproc) {struct device *dev = &rproc->dev; +bool crashed;int ret; ret =mutex_lock_interruptible (&rproc->lock);
@@ -1998,16 +1999,18 @@ int rproc_shutdown(struct rproc *rproc) }if (rproc->state !=RPROC_RUNNING && - rproc->state !=RPROC_ATTACHED ) { + rproc->state !=RPROC_ATTACHED && + rproc->state !=RPROC_CRASHED ) { ret = -EINVAL ; goto out; } + crashed = rproc->state ==RPROC_CRASHED ;/* if the remote proc is still needed, bail out */ if (!atomic_dec_and_test (&rproc->power)) goto out; - ret =rproc_stop (rproc, false); + ret =rproc_stop (rproc, crashed);if (ret) {atomic_inc (&rproc->power); goto out;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 596/1518 remoteproc: core: Attach rproc asynchronously in rproc_add() path via schedule_work()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jingyi Wang <[email protected]>
[ Upstream commit 026a3fada43261e403c6c4d9bda9501547e3f108 ]
Unlike the remoteproc firmware load path where rproc_add() call rproc_auto_boot_callback() asynchronously and ignores the return value of rproc_boot(), the attach path calls rproc_boot() synchronously and propagates its return value back to rproc_add(). This means a failure during rproc_attach() causes rproc_add() to fail and triggers resource release, removing the remoteproc from sysfs and making it unavailable for recovery or further boot attempts.
Align the remoteproc attach path with the firmware load path by introducing attach_work and scheduling rproc_boot() asynchronously via schedule_work(). This keeps the remoteproc registered and available in sysfs even if the initial attach attempt fails, and avoids blocking rproc_add() on the attach result.
Stable-dep-of: 74ee3b2f5767 ("remoteproc: Prevent crash handling to race with rproc_del()")
--- drivers/remoteproc/remoteproc_core.c | 20 ++++++++++++-------- include/linux/remoteproc.h | 2 ++ 2 files changed, 14 insertions(+), 8 deletions(-)
drivers/remoteproc/remoteproc_core.c +12 -8
@@ -1678,18 +1678,21 @@ static void rproc_auto_boot_callback(const struct firmware *fw, void *context)release_firmware (fw); } +static void rproc_attach_work (struct work_struct *work) +{ + struct rproc *rproc = container_of(work, struct rproc, attach_work); + +rproc_boot (rproc); +} +static int rproc_trigger_auto_boot (struct rproc *rproc) {int ret; -/* -* Since the remote processor is in a detached state, it has already -* been booted by another entity. As such there is no point in waiting -* for a firmware image to be loaded, we can simply initiate the process -* of attaching to it immediately. -*/ -if (rproc->state ==RPROC_DETACHED ) -return rproc_boot (rproc); +if (rproc->state ==RPROC_DETACHED ) { +schedule_work (&rproc->attach_work); +return 0 ; + }/* * We're initiating an asynchronous firmware loading, so we can
@@ -2520,6 +2523,7 @@ struct rproc *rproc_alloc(struct device *dev, const char *name,INIT_LIST_HEAD (&rproc->dump_segments);INIT_WORK (&rproc->crash_handler, rproc_crash_handler_work); +INIT_WORK (&rproc->attach_work, rproc_attach_work); rproc->state =RPROC_OFFLINE ;
include/linux/remoteproc.h +2 -0
@@ -526,6 +526,7 @@ enum rproc_features {* @subdevs: list of subdevices, to following the running state * @notifyids: idr for dynamically assigning rproc-wide unique notify ids * @index: index of this rproc device +* @attach_work: workqueue for attaching rproc * @crash_handler: workqueue for handling a crash * @crash_cnt: crash counter * @recovery_disabled: flag that state if recovery was disabled
@@ -568,6 +569,7 @@ struct rproc {struct list_head subdevs;struct idr notifyids;int index; +struct work_struct attach_work;struct work_struct crash_handler;unsigned int crash_cnt;bool recovery_disabled;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 597/1518 remoteproc: Prevent crash handling to race with rproc_del()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bjorn Andersson <[email protected]>
[ Upstream commit 74ee3b2f5767447c57959994341e5b95f1079977 ]
There's no synchronization between rproc_crash_handler_work() and rproc_del(), as such it's possible for a driver to be removed while crash-handler work is scheduled, or even executing - resulting in use-after-free issues.
To avoid this the scheduled work need to be cancelled and synchronized against before the removal proceeds.
In order to ensure that this doesn't race with the reporting, and thereby scheduling new work, a "deleting" flag is introduced. This is similar to the RPROC_DELETE state that was introduced to ensure that "start" didn't race with rproc_del(), but the existing mechanism can not be used as it's valid to call rproc_report_crash() in atomic context - and the "state" is protected by a mutex.
In the event that work is cancelled the pm_stay_awake() is left unbalanced and need to be unrolled.
The blocking and cancelling of crash-handler work prior to the actual rproc_shutdown() call does have the explicit side-effect that crashes resulting from the shutdown process will not enter the crash-handling path, and as such will not generate devcoredumps etc. Due to the existing mutual exclusion between these code paths there's no concrete reduction in functionality, but further work would be needed to handle this case.
--- drivers/remoteproc/remoteproc_core.c | 42 +++++++++++++++++++++------ drivers/remoteproc/remoteproc_sysfs.c | 1 - include/linux/remoteproc.h | 13 +++++---- 3 files changed, 41 insertions(+), 15 deletions(-)
drivers/remoteproc/remoteproc_core.c +33 -9
@@ -1841,6 +1841,11 @@ int rproc_trigger_recovery(struct rproc *rproc)if (ret)return ret; +if (READ_ONCE (rproc->deleting)) { + ret = -ENODEV ; + goto unlock_mutex; + } +/* State could have changed before we got the mutex */ if (rproc->state !=RPROC_CRASHED ) goto unlock_mutex;
@@ -1873,6 +1878,11 @@ static void rproc_crash_handler_work(struct work_struct *work)mutex_lock (&rproc->lock); +if (READ_ONCE (rproc->deleting)) { +mutex_unlock (&rproc->lock); + goto out; + } +if (rproc->state ==RPROC_CRASHED ) {/* handle only the first crash detected */ mutex_unlock (&rproc->lock);
@@ -1928,9 +1938,9 @@ int rproc_boot(struct rproc *rproc)return ret; } -if (rproc->state ==RPROC_DELETED ) { +if (READ_ONCE (rproc->deleting)) { ret = -ENODEV ; -dev_err (dev,"can't boot deleted rproc %s\n" , rproc->name); +dev_err (dev,"can't boot deleting rproc %s\n" , rproc->name); goto unlock_mutex; }
@@ -2522,8 +2532,9 @@ struct rproc *rproc_alloc(struct device *dev, const char *name,INIT_LIST_HEAD (&rproc->subdevs);INIT_LIST_HEAD (&rproc->dump_segments); -INIT_WORK (&rproc->crash_handler, rproc_crash_handler_work);INIT_WORK (&rproc->attach_work, rproc_attach_work); +INIT_WORK (&rproc->crash_handler, rproc_crash_handler_work); +spin_lock_init (&rproc->crash_handler_lock); rproc->state =RPROC_OFFLINE ;
@@ -2587,16 +2598,21 @@ EXPORT_SYMBOL(rproc_put);*/ int rproc_del (struct rproc *rproc) { +unsigned long flags; +if (!rproc)return -EINVAL ; +spin_lock_irqsave (&rproc->crash_handler_lock, flags); +WRITE_ONCE (rproc->deleting, true); +spin_unlock_irqrestore (&rproc->crash_handler_lock, flags); + +if (cancel_work_sync (&rproc->crash_handler)) +pm_relax (rproc->dev.parent); +/* TODO: make sure this works with rproc->power > 1 */ rproc_shutdown (rproc); -mutex_lock (&rproc->lock); - rproc->state =RPROC_DELETED ; -mutex_unlock (&rproc->lock); -rproc_delete_debug_dir (rproc);/* the rproc is downref'ed as soon as it's removed from the klist */
@@ -2708,18 +2724,26 @@ EXPORT_SYMBOL(rproc_get_by_child);*/ void rproc_report_crash (struct rproc *rproc,enum rproc_crash_type type) { +unsigned long flags; +if (!rproc) {pr_err ("NULL rproc pointer\n" );return ; } +spin_lock_irqsave (&rproc->crash_handler_lock, flags); +if (READ_ONCE (rproc->deleting)) { +spin_unlock_irqrestore (&rproc->crash_handler_lock, flags); +return ; + } +/* Prevent suspend while the remoteproc is being recovered */ pm_stay_awake (rproc->dev.parent); +queue_work (rproc_recovery_wq, &rproc->crash_handler); +spin_unlock_irqrestore (&rproc->crash_handler_lock, flags);dev_err (&rproc->dev,"crash detected in %s: type %s\n" , rproc->name,rproc_crash_to_string (type)); - -queue_work (rproc_recovery_wq, &rproc->crash_handler); }EXPORT_SYMBOL (rproc_report_crash);
drivers/remoteproc/remoteproc_sysfs.c +0 -1
@@ -168,7 +168,6 @@ static const char * const rproc_state_string[] = { [RPROC_SUSPENDED] = "suspended", [RPROC_RUNNING] = "running", [RPROC_CRASHED] = "crashed", - [RPROC_DELETED] = "deleted", [RPROC_ATTACHED] = "attached", [RPROC_DETACHED] = "detached", [RPROC_LAST] = "invalid",
include/linux/remoteproc.h +8 -5
@@ -37,6 +37,7 @@#include <linux/types.h> #include <linux/mutex.h> +#include <linux/spinlock.h> #include <linux/virtio.h> #include <linux/cdev.h> #include <linux/completion.h>
@@ -412,7 +413,6 @@ struct rproc_ops {* a message. * @RPROC_RUNNING: device is up and running * @RPROC_CRASHED: device has crashed; need to start recovery -* @RPROC_DELETED: device is deleted * @RPROC_ATTACHED: device has been booted by another entity and the core * has attached to it * @RPROC_DETACHED: device has been booted by another entity and waiting
@@ -430,10 +430,9 @@ enum rproc_state {RPROC_SUSPENDED =1 ,RPROC_RUNNING =2 ,RPROC_CRASHED =3 , -RPROC_DELETED =4 , -RPROC_ATTACHED =5 , -RPROC_DETACHED =6 , - RPROC_LAST = 7, +RPROC_ATTACHED =4 , +RPROC_DETACHED =5 , + RPROC_LAST = 6, };/**
@@ -528,6 +527,8 @@ enum rproc_features {* @index: index of this rproc device * @attach_work: workqueue for attaching rproc * @crash_handler: workqueue for handling a crash +* @crash_handler_lock: serializes crash handler queueing and deletion +* @deleting: remoteproc deletion has begun * @crash_cnt: crash counter * @recovery_disabled: flag that state if recovery was disabled * @max_notifyid: largest allocated notify id.
@@ -571,6 +572,8 @@ struct rproc {int index;struct work_struct attach_work;struct work_struct crash_handler; +spinlock_t crash_handler_lock; +bool deleting;unsigned int crash_cnt;bool recovery_disabled;int max_notifyid;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 598/1518 firmware: qcom_scm: Introduce PAS context allocator helper function
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mukesh Ojha <[email protected]>
[ Upstream commit ccb7bde5f7cc794dee0cd66fd451cb0e0715712d ]
When the Peripheral Authentication Service (PAS) method runs on a SoC where Linux operates at EL2 (i.e., without the Gunyah hypervisor), the reset sequences are handled by TrustZone. In such cases, Linux must perform additional steps before invoking PAS SMC calls, such as creating a SHM bridge. Therefore, PAS SMC calls require awareness and handling of these additional steps when Linux runs at EL2.
To support this, there is a need for a data structure that can be initialized prior to invoking any SMC or MDT functions. This structure allows those functions to determine whether they are operating in the presence or absence of the Gunyah hypervisor and behave accordingly.
Currently, remoteproc and non-remoteproc subsystems use different variants of the MDT loader helper API, primarily due to differences in metadata context handling. Remoteproc subsystems retain the metadata context until authentication and reset are completed, while non-remoteproc subsystems (e.g., video, graphics, IPA, etc.) do not retain the metadata context and can free it within the qcom_scm_pas_init() call by passing a NULL context parameter and due to these differences, it is not possible to extend metadata context handling to support remoteproc and non remoteproc subsystem use PAS operations, when Linux operates at EL2.
Add PAS context data structure allocator helper function.
Stable-dep-of: 0ea50486978f ("remoteproc: qcom: q6v5: Request shutdown if crash is triggered host-side")
--- drivers/firmware/qcom/qcom_scm.c | 34 ++++++++++++++++++++++++++ include/linux/firmware/qcom/qcom_scm.h | 14 +++++++++++ 2 files changed, 48 insertions(+)
drivers/firmware/qcom/qcom_scm.c +34 -0
@@ -558,6 +558,40 @@ static void qcom_scm_set_download_mode(u32 dload_mode)dev_err (__scm->dev,"failed to set download mode: %d\n" , ret); } +/** +* devm_qcom_scm_pas_context_alloc() - Allocate peripheral authentication service +* context for a given peripheral +* +* PAS context is device-resource managed, so the caller does not need +* to worry about freeing the context memory. +* +* @dev: PAS firmware device +* @pas_id: peripheral authentication service id +* @mem_phys: Subsystem reserve memory start address +* @mem_size: Subsystem reserve memory size +* +* Returns: The new PAS context, or ERR_PTR() on failure. +*/ +struct qcom_scm_pas_context *devm_qcom_scm_pas_context_alloc (struct device *dev, +u32 pas_id, +phys_addr_t mem_phys, +size_t mem_size) +{ +struct qcom_scm_pas_context *ctx; + + ctx =devm_kzalloc (dev,sizeof (*ctx),GFP_KERNEL ); +if (!ctx) +return ERR_PTR (-ENOMEM ); + + ctx->dev = dev; + ctx->pas_id = pas_id; + ctx->mem_phys = mem_phys; + ctx->mem_size = mem_size; + +return ctx; +} +EXPORT_SYMBOL_GPL (devm_qcom_scm_pas_context_alloc); +/** * qcom_scm_pas_init_image() - Initialize peripheral authentication service * state machine for a given peripheral, using the
include/linux/firmware/qcom/qcom_scm.h +14 -0
@@ -72,6 +72,20 @@ struct qcom_scm_pas_metadata {ssize_t size; }; +struct qcom_scm_pas_context { +struct device *dev; +u32 pas_id; +phys_addr_t mem_phys; +size_t mem_size; +void *ptr; +dma_addr_t phys; +ssize_t size; +}; + +struct qcom_scm_pas_context *devm_qcom_scm_pas_context_alloc (struct device *dev, +u32 pas_id, +phys_addr_t mem_phys, +size_t mem_size);int qcom_scm_pas_init_image (u32 pas_id,const void *metadata,size_t size,struct qcom_scm_pas_metadata *ctx);void qcom_scm_pas_metadata_release (struct qcom_scm_pas_metadata *ctx);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 599/1518 staging: rtl8723bs: use kfree_sensitive() for key material
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ivy Lopez <[email protected]>
[ Upstream commit d205dfa8cb825f1954ca1cfa474fc50bf06ee4aa ]
The set_stakey_parm struct contains a 16-byte encryption key. Use kfree_sensitive() instead of kfree() to ensure the key material is zeroed before the memory is freed, preventing potential information leaks.
--- drivers/staging/rtl8723bs/core/rtw_cmd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8723bs/core/rtw_cmd.c +4 -4
@@ -889,7 +889,7 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 unicast_if (enqueue) { ph2c =kzalloc (sizeof (*ph2c),GFP_KERNEL );if (!ph2c) { -kfree (psetstakey_para); +kfree_sensitive (psetstakey_para); res = _FAIL; goto exit; }
@@ -897,7 +897,7 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 unicast_ psetstakey_rsp =kzalloc (sizeof (*psetstakey_rsp),GFP_KERNEL );if (!psetstakey_rsp) {kfree (ph2c); -kfree (psetstakey_para); +kfree_sensitive (psetstakey_para); res = _FAIL; goto exit; }
@@ -908,7 +908,7 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 unicast_ res =rtw_enqueue_cmd (pcmdpriv, ph2c); }else {set_stakey_hdl (padapter, (u8 *)psetstakey_para); -kfree (psetstakey_para); +kfree_sensitive (psetstakey_para); } exit:return res;
@@ -948,7 +948,7 @@ u8 rtw_clearstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 enqueu psetstakey_rsp =kzalloc (sizeof (*psetstakey_rsp),GFP_KERNEL );if (!psetstakey_rsp) {kfree (ph2c); -kfree (psetstakey_para); +kfree_sensitive (psetstakey_para); res = _FAIL; goto exit; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 600/1518 fs/ntfs3: reject restart table growth beyond U16_MAX entries
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Weiming Shi <[email protected]>
[ Upstream commit 111f8d74a19d85942ecbb3aba78f6f3c88e59391 ]
During $LogFile replay, log_replay() indexes the transaction table by the transact_id taken from the log record header. check_log_rec() only verifies that transact_id is non-zero and properly aligned, not its magnitude, so a crafted image can request an arbitrarily large index.
alloc_rsttbl_from_idx() grows the table to cover that index via extend_rsttbl(), which passes the new entry count to init_rsttbl():
rt = init_rsttbl(esize, used + add);
used + add is computed as u32 but init_rsttbl() takes a u16, and the count is stored in struct RESTART_TABLE as a __le16. When used + add exceeds U16_MAX it is truncated, init_rsttbl() allocates a table far smaller than the index requires, and alloc_rsttbl_from_idx() then dereferences and writes at the original, untruncated offset -- an out-of-bounds access past the allocation, reachable by mounting a crafted NTFS image.
BUG: KASAN: use-after-free in alloc_rsttbl_from_idx (fs/ntfs3/fslog.c:950) Read of size 4 at addr ffff8880327ffff8 by task exploit alloc_rsttbl_from_idx (fs/ntfs3/fslog.c:950) log_replay (fs/ntfs3/fslog.c:4562) ntfs_loadlog_and_replay (fs/ntfs3/fsntfs.c:324) ntfs_fill_super (fs/ntfs3/super.c:1393) get_tree_bdev_flags vfs_get_tree path_mount __x64_sys_mount
A restart table is limited to U16_MAX entries by its __le16 count, so a larger growth request is invalid input. Reject it in extend_rsttbl(); all callers already handle a NULL return.
--- fs/ntfs3/fslog.c | 3 +++ 1 file changed, 3 insertions(+)
fs/ntfs3/fslog.c +3 -0
@@ -875,6 +875,9 @@ static inline struct RESTART_TABLE *extend_rsttbl(struct RESTART_TABLE *tbl,u32 used =le16_to_cpu (tbl->used);struct RESTART_TABLE *rt; +if (used + add >U16_MAX ) +return NULL ; + rt =init_rsttbl (esize, used + add);if (!rt)return NULL ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 601/1518 iommu/tegra241-cmdqv: Publish an LVCMDQ only after it is fully initialized
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicolin Chen <[email protected]>
[ Upstream commit cbc41aacd49e695338940196e7084770365e1b68 ]
tegra241_vintf_init_lvcmdq() stores the freshly allocated vcmdq pointer to the vintf->lvcmdqs[] array, before tegra241_vcmdq_alloc_smmu_cmdq() builds the vcmdq->cmdq. The error ISR dereferences that cmdq, so a latched LVCMDQ error (e.g. one inherited across a kexec) firing in this window would make tegra241_vintf0_handle_error() pass the still-zeroed arm_smmu_cmdq down to __arm_smmu_cmdq_skip_err(), dereferencing NULL queue register pointers.
Drop the store from tegra241_vintf_init_lvcmdq() and publish the vcmdq at the end of the allocation instead, with an smp_store_release() that pairs with an smp_load_acquire() in the ISR, which can see a fully built LVCMDQ or NULL.
The user-owned LVCMDQ allocation moves accordingly, publishing the vcmdq once tegra241_vcmdq_hw_init_user() succeeds, using a plain store since a user VINTF's lvcmdqs[] has no lockless reader -- the error ISR only walks the VINTF0 array.
--- .../iommu/arm/arm-smmu-v3/tegra241-cmdqv.c | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-)
drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c +17 -8
@@ -322,12 +322,19 @@ static void tegra241_vintf0_handle_error(struct tegra241_vintf *vintf)while (map) {unsigned long lidx =__ffs64 (map); -struct tegra241_vcmdq *vcmdq = vintf->lvcmdqs[lidx]; -u32 gerror =readl_relaxed (REG_VCMDQ_PAGE0 (vcmdq,GERROR )); +struct tegra241_vcmdq *vcmdq; +u32 gerror; + map &= ~BIT_ULL (lidx); + +/* Pairs with smp_store_release() publishing it */ + vcmdq =smp_load_acquire (&vintf->lvcmdqs[lidx]); +if (!vcmdq) +continue ; + + gerror =readl_relaxed (REG_VCMDQ_PAGE0 (vcmdq,GERROR ));__arm_smmu_cmdq_skip_err (&vintf->cmdqv->smmu, &vcmdq->cmdq);writel (gerror,REG_VCMDQ_PAGE0 (vcmdq,GERRORN )); - map &= ~BIT_ULL (lidx); } } }
@@ -670,7 +677,6 @@ static int tegra241_vintf_init_lvcmdq(struct tegra241_vintf *vintf, u16 lidx, vcmdq->page0 = cmdqv->base +TEGRA241_VINTFi_LVCMDQ_PAGE0 (idx, lidx); vcmdq->page1 = cmdqv->base +TEGRA241_VINTFi_LVCMDQ_PAGE1 (idx, lidx); - vintf->lvcmdqs[lidx] = vcmdq;return 0 ; }
@@ -709,14 +715,15 @@ tegra241_vintf_alloc_lvcmdq(struct tegra241_vintf *vintf, u16 lidx)/* Build an arm_smmu_cmdq for each LVCMDQ */ ret =tegra241_vcmdq_alloc_smmu_cmdq (vcmdq);if (ret) - goto deinit_lvcmdq; + goto free_vcmdq; + +/* Pairs with the smp_load_acquire() in the error ISR */ +smp_store_release (&vintf->lvcmdqs[lidx], vcmdq);dev_dbg (cmdqv->dev,"%sallocated\n" ,lvcmdq_error_header (vcmdq, header,64 ));return vcmdq; -deinit_lvcmdq: -tegra241_vintf_deinit_lvcmdq (vintf, lidx); free_vcmdq:kfree (vcmdq);return ERR_PTR (ret);
@@ -1202,13 +1209,15 @@ static int tegra241_vintf_alloc_lvcmdq_user(struct iommufd_hw_queue *hw_queue,if (ret) goto unmap_lvcmdq; +/* No lockless reader of a user VINTF's lvcmdqs[]; mutex-serialized */ + vintf->lvcmdqs[lidx] = vcmdq; + hw_queue->destroy = &tegra241_vintf_destroy_lvcmdq_user;mutex_unlock (&vintf->lvcmdq_mutex);return 0 ; unmap_lvcmdq:tegra241_vcmdq_unmap_lvcmdq (vcmdq); -tegra241_vintf_deinit_lvcmdq (vintf, lidx); undepend_vcmdq:if (vcmdq->prev)iommufd_hw_queue_undepend (vcmdq, vcmdq->prev, core);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 602/1518 iommu/tegra241-cmdqv: Synchronize the error ISR against VINTF (de)init
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicolin Chen <[email protected]>
[ Upstream commit a491be376abd1c80a314cdd658632c85cd660b73 ]
A user VINTF is torn down by tegra241_cmdqv_deinit_vintf(), which runs from the destroy callback and from the init-failure unwind in the alloc handler. It clears the cmdqv->vintfs[] slot and lets the iommufd core free it, but nothing serializes that against the error interrupt: tegra241_cmdqv_isr() reads cmdqv->vintfs[idx] and dereferences the vintf. A concurrent error can make the ISR read a slot mid-clear (a NULL deref) or use a vintf which is about to be freed (a use-after-free).
deinit_vintf() also returns idx to the IDA before clearing the slot, so a concurrent create that reuses idx can publish its new vintf into the slot, only for this teardown to erase it again with the stale NULL store.
On the other end, tegra241_cmdqv_init_vintf() publishes a new vintf with a plain store to the cmdqv->vintfs[] slot, and the ISR dereferences fields of a published vintf such as vintf->base. A plain store gives no ordering on a weakly-ordered CPU, and a stale VINTF_ERR_MAP bit on a reused idx can make the ISR pick a vintf the moment it is published, before its fields are set or tegra241_vintf_hw_init() runs.
The cmdqv->vintfs[0] slot stays NULL until tegra241_cmdqv_init_structures() first creates VINTF0, so the slot 0 read needs the same NULL check.
Publish every slot with an smp_store_release(), and read each slot in the ISR with an smp_load_acquire() under a NULL check, so the ISR always sees a fully built vintf or NULL. Also make deinit_vintf() clear the slot, and synchronize_irq() prior to returning idx to the IDA, so no vintf is freed under a running handler and no reused idx is clobbered.
--- .../iommu/arm/arm-smmu-v3/tegra241-cmdqv.c | 37 +++++++++++++++++-- 1 file changed, 33 insertions(+), 4 deletions(-)
drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c +33 -4
@@ -339,6 +339,13 @@ static void tegra241_vintf0_handle_error(struct tegra241_vintf *vintf) } } +/* +* The CMDQV error interrupt is edge-triggered, so a pending VINTF error fires +* this ISR once and does not re-assert. An unacked guest therefore cannot +* storm the host. The HW latches and forwards each new error event on its +* own, so an already-set ERR_MAP bit does not suppress the interrupt for a +* new error. +*/ static irqreturn_t tegra241_cmdqv_isr (int irq,void *devid) {struct tegra241_cmdqv *cmdqv = (struct tegra241_cmdqv *)devid;
@@ -361,16 +368,27 @@ static irqreturn_t tegra241_cmdqv_isr(int irq, void *devid)/* Handle VINTF0 and its LVCMDQs */ if (vintf_map &BIT_ULL (0 )) { -tegra241_vintf0_handle_error (cmdqv->vintfs[0 ]); +struct tegra241_vintf *vintf0; + vintf_map &= ~BIT_ULL (0 ); + +/* NULL until tegra241_cmdqv_init_structures() publishes it */ + vintf0 =smp_load_acquire (&cmdqv->vintfs[0 ]); +if (vintf0) +tegra241_vintf0_handle_error (vintf0); }/* Handle other user VINTFs and their LVCMDQs */ while (vintf_map) {unsigned long idx =__ffs64 (vintf_map); +struct tegra241_vintf *vintf; -tegra241_vintf_user_handle_error (cmdqv->vintfs[idx]); vintf_map &= ~BIT_ULL (idx); + +/* The slot may be published or torn down (NULL'd) concurrently */ + vintf =smp_load_acquire (&cmdqv->vintfs[idx]); +if (vintf) +tegra241_vintf_user_handle_error (vintf); }return IRQ_HANDLED ;
@@ -734,8 +752,18 @@ tegra241_vintf_alloc_lvcmdq(struct tegra241_vintf *vintf, u16 lidx)static void tegra241_cmdqv_deinit_vintf (struct tegra241_cmdqv *cmdqv,u16 idx) {kfree (cmdqv->vintfs[idx]->lvcmdqs); +/* +* Clear the slot and drain any in-flight ISR before returning idx to +* the IDA, so a concurrent create that reuses idx cannot have its +* freshly published VINTF erased here. A plain WRITE_ONCE() suffices +* since clearing the slot publishes no data. This also covers the +* init-failure unwind, which reaches deinit_vintf() without the +* destroy callback. +*/ +WRITE_ONCE (cmdqv->vintfs[idx],NULL ); +if (cmdqv->irq >0 ) +synchronize_irq (cmdqv->irq);ida_free (&cmdqv->vintf_ids, idx); - cmdqv->vintfs[idx] =NULL ; } static int tegra241_cmdqv_init_vintf(struct tegra241_cmdqv *cmdqv, u16 max_idx,
@@ -761,7 +789,8 @@ static int tegra241_cmdqv_init_vintf(struct tegra241_cmdqv *cmdqv, u16 max_idx,return -ENOMEM ; } - cmdqv->vintfs[idx] = vintf; +/* Pairs with the smp_load_acquire() in tegra241_cmdqv_isr() */ +smp_store_release (&cmdqv->vintfs[idx], vintf);return ret; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 603/1518 iommu/tegra241-cmdqv: Dont run the error ISR before probe sets up vintfs
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicolin Chen <[email protected]>
[ Upstream commit 5acd67ceb38debe2fbf70ea35e2dec9f7ab01bbd ]
__tegra241_cmdqv_probe() requests the error IRQ before it has allocated the cmdqv->vintfs array and set cmdqv->num_vintfs. A CMDQV left enabled with a latched error across a kexec fires the IRQ as soon as it is requested, and tegra241_cmdqv_isr() then walks the uninitialized cmdqv->vintfs array.
Request the IRQ only after cmdqv->vintfs is allocated and zeroed, so that a latched interrupt firing early runs the ISR against a valid array of NULL slots that it safely skips.
--- .../iommu/arm/arm-smmu-v3/tegra241-cmdqv.c | 34 +++++++++++-------- 1 file changed, 19 insertions(+), 15 deletions(-)
drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c +19 -15
@@ -1042,17 +1042,6 @@ __tegra241_cmdqv_probe(struct arm_smmu_device *smmu, struct resource *res, cmdqv->dev = smmu->impl_dev; cmdqv->base_phys = res->start; -if (cmdqv->irq >0 ) { - ret =request_threaded_irq (irq,NULL , tegra241_cmdqv_isr, -IRQF_ONESHOT ,"tegra241-cmdqv" , - cmdqv); -if (ret) { -dev_err (cmdqv->dev,"failed to request irq (%d): %d\n" , - cmdqv->irq, ret); - goto iounmap; - } - } - regval =readl_relaxed (REG_CMDQV (cmdqv,PARAM )); cmdqv->num_vintfs =1 <<FIELD_GET (CMDQV_NUM_VINTF_LOG2 , regval); cmdqv->num_vcmdqs =1 <<FIELD_GET (CMDQV_NUM_VCMDQ_LOG2 , regval);
@@ -1063,10 +1052,25 @@ __tegra241_cmdqv_probe(struct arm_smmu_device *smmu, struct resource *res, cmdqv->vintfs =kcalloc (cmdqv->num_vintfs,sizeof (*cmdqv->vintfs),GFP_KERNEL );if (!cmdqv->vintfs) - goto free_irq; + goto iounmap;ida_init (&cmdqv->vintf_ids); +/* +* Request the IRQ only after cmdqv->vintfs is allocated and zeroed, so +* the ISR would not walk an uninitialized array. +*/ +if (cmdqv->irq >0 ) { + ret =request_threaded_irq (irq,NULL , tegra241_cmdqv_isr, +IRQF_ONESHOT ,"tegra241-cmdqv" , + cmdqv); +if (ret) { +dev_err (cmdqv->dev,"failed to request irq (%d): %d\n" , + cmdqv->irq, ret); + goto free_vintfs; + } + } +#ifdef CONFIG_IOMMU_DEBUGFS if (!cmdqv_debugfs_dir) { cmdqv_debugfs_dir =
@@ -1081,9 +1085,9 @@ __tegra241_cmdqv_probe(struct arm_smmu_device *smmu, struct resource *res,return new_smmu; -free_irq: -if (cmdqv->irq >0 ) -free_irq (cmdqv->irq, cmdqv); +free_vintfs: +ida_destroy (&cmdqv->vintf_ids); +kfree (cmdqv->vintfs); iounmap:iounmap (base);return NULL ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 604/1518 iommu/tegra241-cmdqv: Free the error IRQ before tearing down VINTFs
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicolin Chen <[email protected]>
[ Upstream commit 61f0d437988e5730b04442f6a7d30a9907339f2a ]
tegra241_cmdqv_remove() tears each VINTF down first, then calls free_irq(). Tearing a VINTF down frees vintf0 and clears cmdqv->vintfs[0]. An error in that window makes tegra241_cmdqv_isr() read the stale slot and hand it to tegra241_vintf0_handle_error(), which dereferences a NULL or freed pointer.
Free the IRQ before tearing the VINTFs down. free_irq() waits for in-flight handlers to finish and blocks new ones, so no ISR can observe a VINTF as it is torn down.
Note: a user-owned VINTF (viommu) could outlive this teardown, which unmaps cmdqv->base and frees cmdqv->vintfs, so a later viommu close then touches freed memory. This is neither introduced nor fixed here: a physical IOMMU is not a pluggable device, so iommufd by design holds no reference on the one behind a viommu, and this teardown is not expected while that viommu is still alive.
--- drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c +8 -2
@@ -834,6 +834,14 @@ static void tegra241_cmdqv_remove(struct arm_smmu_device *smmu) container_of(smmu, struct tegra241_cmdqv, smmu);u16 idx; +/* +* Free the IRQ before tearing down the VINTFs. free_irq() waits for any +* in-flight tegra241_cmdqv_isr() to finish and blocks new ones, so the +* ISR cannot dereference a VINTF that is freed by the loop below. +*/ +if (cmdqv->irq >0 ) +free_irq (cmdqv->irq, cmdqv); +/* Remove VINTF resources */ for (idx =0 ; idx < cmdqv->num_vintfs; idx++) {if (cmdqv->vintfs[idx]) {
@@ -846,8 +854,6 @@ static void tegra241_cmdqv_remove(struct arm_smmu_device *smmu)/* Remove cmdqv resources */ ida_destroy (&cmdqv->vintf_ids); -if (cmdqv->irq >0 ) -free_irq (cmdqv->irq, cmdqv);iounmap (cmdqv->base);kfree (cmdqv->vintfs);put_device (cmdqv->dev);/* smmu->impl_dev */
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 605/1518 iommu/tegra241-cmdqv: Require exactly one Stream ID for a vSID
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicolin Chen <[email protected]>
[ Upstream commit fb292bfc9be936dade7eef7ec5762de1201983d8 ]
tegra241_vintf_init_vsid() maps a guest vSID to a single physical Stream ID taken from master->streams[0], and only warns when the device does not have exactly one stream. A device with several streams gets only its first one mapped, so a guest vSID invalidation cannot reach the others' ATC and IOTLB entries; a device with none makes master->streams a ZERO_SIZE_PTR, read out of bounds.
Reject the mapping with -EOPNOTSUPP if master->num_streams is not one.
--- drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c +2 -1
@@ -1302,7 +1302,8 @@ static int tegra241_vintf_init_vsid(struct iommufd_vdevice *vdev)if (virt_sid >FIELD_MAX (VINTF_SID_MATCH_VIRT_SID ))return -EINVAL ; -WARN_ON_ONCE (master->num_streams !=1 ); +if (master->num_streams !=1 ) +return -EOPNOTSUPP ;/* Find an empty pair of SID_REPLACE and SID_MATCH */ sidx = ida_alloc_max(&vintf->sids, vintf->cmdqv->num_sids_per_vintf - 1,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 606/1518 iommu/tegra241-cmdqv: Fix VINTF0 leak on the init-failure path
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicolin Chen <[email protected]>
[ Upstream commit f40f3144477314b489e4bc209c06cb51679fe82b ]
tegra241_cmdqv_init_structures() allocates VINTF0 with kzalloc_obj(), inits it, and preallocates its logical VCMDQs. Two of its error paths leak.
When tegra241_cmdqv_init_vintf() fails it returns before VINTF0 reaches the cmdqv->vintfs[] array, so the devres unwind on probe failure cannot reach it; free it directly there.
A later VCMDQ preallocation failure instead leaves VINTF0 published, and so this time the unwind does reach tegra241_cmdqv_remove_vintf(), which then frees it from vintf->hyp_own. But tegra241_vintf_hw_init() sets that flag only afterward, from a HW read-back, so the still-uninited VINTF0 reads as guest-owned and leaks, with mutex_destroy() and ida_destroy() run on fields it never set up.
Decide ownership from vintf->idx instead, the index assigned when its id is
allocated: idx 0 is the kernel-owned VINTF0, while idx >= 1 marks a guest VINTF. So the in-kernel free decision in tegra241_cmdqv_remove_vintf() and tegra241_vintf_free_lvcmdq() now keys on idx too, and hyp_own stays a pure HW-readback state.
--- drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c +8 -2
@@ -710,7 +710,7 @@ static void tegra241_vintf_free_lvcmdq(struct tegra241_vintf *vintf, u16 lidx)dev_dbg (vintf->cmdqv->dev,"%sdeallocated\n" ,lvcmdq_error_header (vcmdq, header,64 ));/* Guest-owned VCMDQ is free-ed with hw_queue by iommufd core */ -if (vcmdq->vintf->hyp_own) +if (!vcmdq->vintf->idx)kfree (vcmdq); }
@@ -808,7 +808,7 @@ static void tegra241_cmdqv_remove_vintf(struct tegra241_cmdqv *cmdqv, u16 idx)dev_dbg (cmdqv->dev,"VINTF%u: deallocated\n" , vintf->idx);tegra241_cmdqv_deinit_vintf (cmdqv, idx); -if (!vintf->hyp_own) { +if (vintf->idx) {mutex_destroy (&vintf->lvcmdq_mutex);ida_destroy (&vintf->sids);/* Guest-owned VINTF is free-ed with viommu by iommufd core */
@@ -988,6 +988,12 @@ static int tegra241_cmdqv_init_structures(struct arm_smmu_device *smmu) ret =tegra241_cmdqv_init_vintf (cmdqv,0 , vintf);if (ret) {dev_err (cmdqv->dev,"failed to init vintf0: %d\n" , ret); +/* +* tegra241_cmdqv_init_vintf() failed to publish the vintf0 to +* cmdqv->vintfs[], so the probe unwind path that goes through +* cmdqv->vintfs[] would miss it. Free it here. +*/ +kfree (vintf);return ret; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 607/1518 RDMA/rxe: Fix UAF in ODP init error-handling path
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peiyang He <[email protected]>
[ Upstream commit 51f2c8d2c99fc1f452f7113c08a35edcc4bf8732 ]
rxe_odp_mr_init_user() stores &umem_odp->umem in mr->umem before calling rxe_odp_init_pages(). If rxe_odp_init_pages() fails, rxe_odp_mr_init_user() releases umem_odp and returns an error.
rxe_reg_user_mr() then unwinds the error through rxe_cleanup(), rxe_mr_cleanup(), ib_umem_release(mr->umem). There is an IS_ERR_OR_NULL(umem) check at the start of ib_umem_release(). But since mr->umem is NOT reset to NULL in the error handling path of rxe_odp_mr_init_user(), the check passes and it reads already-freed fields like umem->is_dmabuf, causing UAF.
Fix the UAF by clearing mr->umem after releasing the failed ODP umem so the MR cleanup path does not release it again.
--- drivers/infiniband/sw/rxe/rxe_odp.c | 1 + 1 file changed, 1 insertion(+)
drivers/infiniband/sw/rxe/rxe_odp.c +1 -0
@@ -115,6 +115,7 @@ int rxe_odp_mr_init_user(struct rxe_dev *rxe, u64 start, u64 length, err =rxe_odp_init_pages (mr);if (err) {ib_umem_odp_release (umem_odp); + mr->umem =NULL ;return err; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 608/1518 RDMA/efa: Fix PBL chunk length computation
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yonatan Nachum <[email protected]>
[ Upstream commit 229b42d7450c1cf96f45ec39ebb69211b06bc036 ]
On register MR, when creating the PBL, if it's an indirect PBL we create a chunk list to hold the PBL pages pointers. Each chunk is 4KB in size and can hold 510 addresses (EFA_PTRS_PER_CHUNK) and has a 12-byte control buffer at the end of it holding the next chunk's pointer and its length.
If the PBL number of pages is a multiple of EFA_PTRS_PER_CHUNK, the calculated last chunk length is wrongly computed as 0, even though that chunk is fully populated with 510 real page pointers. This wrong length is used both to DMA map the chunk and is propagated to the device, causing the device to see the chunk as empty and reject the memory registration.
Fix the calculation so it will be performed only if the number of pages isn't a multiple of EFA_PTRS_PER_CHUNK, if it is, its already handled in the above loop correctly.
Also prevent out-of-bounds reach in the chunks array in such scenario.
--- drivers/infiniband/hw/efa/efa_verbs.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/infiniband/hw/efa/efa_verbs.c +9 -4
@@ -1392,9 +1392,11 @@ static int pbl_chunk_list_create(struct efa_dev *dev, struct pbl_context *pbl) chunk_list->chunks[i].length =EFA_CHUNK_USED_SIZE ; } - chunk_list->chunks[chunk_list_size -1 ].length = - ((page_cnt %EFA_PTRS_PER_CHUNK ) *EFA_CHUNK_PAYLOAD_PTR_SIZE ) + -EFA_CHUNK_PTR_SIZE ; + +if (page_cnt %EFA_PTRS_PER_CHUNK !=0 ) + chunk_list->chunks[chunk_list_size -1 ].length = + ((page_cnt %EFA_PTRS_PER_CHUNK ) *EFA_CHUNK_PAYLOAD_PTR_SIZE ) + +EFA_CHUNK_PTR_SIZE ;/* fill the dma addresses of sg list pages to chunks: */ chunk_idx =0 ;
@@ -1406,9 +1408,12 @@ static int pbl_chunk_list_create(struct efa_dev *dev, struct pbl_context *pbl)rdma_block_iter_dma_address (&biter);if (payload_idx ==EFA_PTRS_PER_CHUNK ) { + payload_idx =0 ; chunk_idx++; +if (chunk_idx >= chunk_list_size) +break ; + cur_chunk_buf = chunk_list->chunks[chunk_idx].buf; - payload_idx =0 ; } }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 609/1518 wifi: mac80211: fix per-STA profile length in cross-link CSA parsing
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhao Li <[email protected]>
[ Upstream commit 4a0bd262df757b25fc4e2a53c947317c119ced4e ]
ieee80211_mgd_check_cross_link_csa() starts parsing elements after the fixed per-STA profile header and the STA Info field, but subtracts only the STA Info length from the profile length. As a result, ieee802_11_parse_elems() is given sizeof(*prof) == 3 bytes beyond the current profile's element area, and data following the profile may be interpreted as belonging to it.
Subtract the fixed profile header as well. The preceding ieee80211_mle_basic_sta_prof_size_ok() check guarantees that the corrected calculation cannot underflow, and ieee80211_rx_uhr_link_reconfig_req() uses the same calculation.
The call site currently states that cross-link CSA parsing has no effect because the broader parsing is still incorrect. This patch does not address that broader problem; it only makes the per-STA profile parser stop at the end of that profile. No production allocation over-read or user-visible failure has been demonstrated.
--- net/mac80211/mlme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mac80211/mlme.c +1 -1
@@ -7303,7 +7303,7 @@ ieee80211_mgd_check_cross_link_csa(struct ieee80211_sub_if_data *sdata, prof = (void *)sta_profiles[link_id]; prof_elems =ieee802_11_parse_elems (prof->variable + (prof->sta_info_len -1 ), - len - + len -sizeof (*prof) - (prof->sta_info_len -1 ), false,NULL );
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 610/1518 arm64: dts: allwinner: sun50i-a64-pinephone: Fix mpu6050 mount matrix
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ondrej Jirman <[email protected]>
[ Upstream commit dfc735fd93e4814e65894916ec5f807f25a391d1 ]
The current mount matrix for mpu6050 is wrong. The mount matrix is a simple transform from the sensor coordinate space to the device coordinate space described in DT, where, looking at the screen, X points to the right, Y to the top, and Z towards the user.
The mpu6050 is mounted like this (looking at the screen from the front; the sensor is on the near side of the PCB, so its Z axis points towards the user; o marks the pin 1 corner):
+Xs
^
|
+------+
+Ys <--| |
| o |
+------+so this gives:
Xd = -Ys [0, -1, 0] Yd = Xs [1, 0, 0] Zd = Zs [0, 0, 1]
--- arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi +2 -2
@@ -230,8 +230,8 @@ accelerometer@68 { interrupts = <7 5 IRQ_TYPE_EDGE_RISING>; /* PH5 */ vdd-supply = <®_dldo1>; vddio-supply = <®_dldo1>; - mount-matrix = "0", "1", "0", - "-1", "0", "0", + mount-matrix = "0", "-1", "0", + "1", "0", "0", "0", "0", "1"; }; };
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 611/1518 clk: tegra: tegra124-emc: put EMC node on register failure
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guangshuo Li <[email protected]>
[ Upstream commit f726279f5eab813f9a8b6f38ddf2a4b062d038ff ]
tegra124_clk_register_emc() stores a device node reference returned by of_parse_phandle() in tegra->emc_node.
If clk_register() fails, the function returns an error before that reference can be consumed and released by the normal runtime path. The tegra_clk_emc object is freed on this failure path, but freeing the object does not drop the OF node reference stored in it.
Drop the EMC node reference before freeing the tegra_clk_emc object. of_node_put() is safe for a NULL node, so this also covers the case where the phandle is absent.
--- drivers/clk/tegra/clk-tegra124-emc.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/tegra/clk-tegra124-emc.c +1 -0
@@ -539,6 +539,7 @@ struct clk *tegra124_clk_register_emc(void __iomem *base, struct device_node *np clk =clk_register (NULL , &tegra->hw);if (IS_ERR (clk)) { +of_node_put (tegra->emc_node);kfree (tegra);return clk; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 612/1518 clk: mediatek: Refactor pll registration to pass device
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicolas Frattaroli <[email protected]>
[ Upstream commit c9ced38af56fe6411118c6bc6522eab80849326d ]
As it stands, mtk_clk_register_plls takes a struct device_node pointer as its first argument. This is a tragic happenstance, as it's trivial to get the device_node from a struct device, but the opposite not so much. The struct device is a much more useful thing to have passed down.
Refactor mtk_clk_register_plls to take a struct device pointer instead of a struct device_node pointer, and fix up all users of this function.
Stable-dep-of: 540d91480bcb ("clk: mediatek: pllfh: Fix IO remapping leak in register_pllfhs error path")
--- drivers/clk/mediatek/clk-mt2701.c | 2 +- drivers/clk/mediatek/clk-mt2712-apmixedsys.c | 2 +- drivers/clk/mediatek/clk-mt6735-apmixedsys.c | 4 ++-- drivers/clk/mediatek/clk-mt6765.c | 2 +- drivers/clk/mediatek/clk-mt6779.c | 2 +- drivers/clk/mediatek/clk-mt6797.c | 2 +- drivers/clk/mediatek/clk-mt7622-apmixedsys.c | 2 +- drivers/clk/mediatek/clk-mt7629.c | 2 +- drivers/clk/mediatek/clk-mt7981-apmixed.c | 2 +- drivers/clk/mediatek/clk-mt7986-apmixed.c | 2 +- drivers/clk/mediatek/clk-mt7988-apmixed.c | 2 +- drivers/clk/mediatek/clk-mt8135-apmixedsys.c | 3 ++- drivers/clk/mediatek/clk-mt8167-apmixedsys.c | 2 +- drivers/clk/mediatek/clk-mt8183-apmixedsys.c | 2 +- drivers/clk/mediatek/clk-mt8188-apmixedsys.c | 2 +- drivers/clk/mediatek/clk-mt8195-apusys_pll.c | 3 ++- drivers/clk/mediatek/clk-mt8196-apmixedsys.c | 3 ++- drivers/clk/mediatek/clk-mt8196-mcu.c | 2 +- drivers/clk/mediatek/clk-mt8196-mfg.c | 2 +- drivers/clk/mediatek/clk-mt8196-vlpckgen.c | 2 +- drivers/clk/mediatek/clk-mt8365-apmixedsys.c | 2 +- drivers/clk/mediatek/clk-mt8516-apmixedsys.c | 2 +- drivers/clk/mediatek/clk-pll.c | 7 ++++--- drivers/clk/mediatek/clk-pll.h | 10 ++++------ 24 files changed, 34 insertions(+), 32 deletions(-)
drivers/clk/mediatek/clk-mt2701.c +1 -1
@@ -978,7 +978,7 @@ static int mtk_apmixedsys_init(struct platform_device *pdev)if (!clk_data)return -ENOMEM ; -mtk_clk_register_plls (node, apmixed_plls,ARRAY_SIZE (apmixed_plls), +mtk_clk_register_plls (&pdev->dev, apmixed_plls,ARRAY_SIZE (apmixed_plls), clk_data);mtk_clk_register_factors (apmixed_fixed_divs,ARRAY_SIZE (apmixed_fixed_divs), clk_data);
drivers/clk/mediatek/clk-mt2712-apmixedsys.c +1 -1
@@ -119,7 +119,7 @@ static int clk_mt2712_apmixed_probe(struct platform_device *pdev)if (!clk_data)return -ENOMEM ; - r =mtk_clk_register_plls (node, plls,ARRAY_SIZE (plls), clk_data); + r =mtk_clk_register_plls (&pdev->dev, plls,ARRAY_SIZE (plls), clk_data);if (r) goto free_clk_data;
drivers/clk/mediatek/clk-mt6735-apmixedsys.c +2 -2
@@ -93,8 +93,8 @@ static int clk_mt6735_apmixed_probe(struct platform_device *pdev)return -ENOMEM ;platform_set_drvdata (pdev, clk_data); - ret =mtk_clk_register_plls (pdev->dev.of_node, apmixedsys_plls, -ARRAY_SIZE (apmixedsys_plls), clk_data); + ret =mtk_clk_register_plls (&pdev->dev, apmixedsys_plls, +ARRAY_SIZE (apmixedsys_plls), clk_data);if (ret) {dev_err (&pdev->dev,"Failed to register PLLs: %d\n" , ret);return ret;
drivers/clk/mediatek/clk-mt6765.c +1 -1
@@ -740,7 +740,7 @@ static int clk_mt6765_apmixed_probe(struct platform_device *pdev)if (!clk_data)return -ENOMEM ; -mtk_clk_register_plls (node, plls,ARRAY_SIZE (plls), clk_data); +mtk_clk_register_plls (&pdev->dev, plls,ARRAY_SIZE (plls), clk_data);mtk_clk_register_gates (&pdev->dev, node, apmixed_clks,ARRAY_SIZE (apmixed_clks), clk_data);
drivers/clk/mediatek/clk-mt6779.c +1 -1
@@ -1220,7 +1220,7 @@ static int clk_mt6779_apmixed_probe(struct platform_device *pdev)if (!clk_data)return -ENOMEM ; -mtk_clk_register_plls (node, plls,ARRAY_SIZE (plls), clk_data); +mtk_clk_register_plls (&pdev->dev, plls,ARRAY_SIZE (plls), clk_data);mtk_clk_register_gates (&pdev->dev, node, apmixed_clks,ARRAY_SIZE (apmixed_clks), clk_data);
drivers/clk/mediatek/clk-mt6797.c +1 -1
@@ -655,7 +655,7 @@ static int mtk_apmixedsys_init(struct platform_device *pdev)if (!clk_data)return -ENOMEM ; -mtk_clk_register_plls (node, plls,ARRAY_SIZE (plls), clk_data); +mtk_clk_register_plls (&pdev->dev, plls,ARRAY_SIZE (plls), clk_data);return of_clk_add_hw_provider (node, of_clk_hw_onecell_get, clk_data); }
drivers/clk/mediatek/clk-mt7622-apmixedsys.c +1 -1
@@ -96,7 +96,7 @@ static int clk_mt7622_apmixed_probe(struct platform_device *pdev)if (!clk_data)return -ENOMEM ; - ret =mtk_clk_register_plls (node, plls,ARRAY_SIZE (plls), clk_data); + ret =mtk_clk_register_plls (dev, plls,ARRAY_SIZE (plls), clk_data);if (ret)return ret;
drivers/clk/mediatek/clk-mt7629.c +1 -1
@@ -634,7 +634,7 @@ static int mtk_apmixedsys_init(struct platform_device *pdev)if (!clk_data)return -ENOMEM ; -mtk_clk_register_plls (node, plls,ARRAY_SIZE (plls), +mtk_clk_register_plls (&pdev->dev, plls,ARRAY_SIZE (plls), clk_data); mtk_clk_register_gates(&pdev->dev, node, apmixed_clks,
drivers/clk/mediatek/clk-mt7981-apmixed.c +1 -1
@@ -76,7 +76,7 @@ static int clk_mt7981_apmixed_probe(struct platform_device *pdev)if (!clk_data)return -ENOMEM ; -mtk_clk_register_plls (node, plls,ARRAY_SIZE (plls), clk_data); +mtk_clk_register_plls (&pdev->dev, plls,ARRAY_SIZE (plls), clk_data); r =of_clk_add_hw_provider (node, of_clk_hw_onecell_get, clk_data);if (r) {
drivers/clk/mediatek/clk-mt7986-apmixed.c +1 -1
@@ -74,7 +74,7 @@ static int clk_mt7986_apmixed_probe(struct platform_device *pdev)if (!clk_data)return -ENOMEM ; -mtk_clk_register_plls (node, plls,ARRAY_SIZE (plls), clk_data); +mtk_clk_register_plls (&pdev->dev, plls,ARRAY_SIZE (plls), clk_data); r =of_clk_add_hw_provider (node, of_clk_hw_onecell_get, clk_data);if (r) {
drivers/clk/mediatek/clk-mt7988-apmixed.c +1 -1
@@ -86,7 +86,7 @@ static int clk_mt7988_apmixed_probe(struct platform_device *pdev)if (!clk_data)return -ENOMEM ; - r =mtk_clk_register_plls (node, plls,ARRAY_SIZE (plls), clk_data); + r =mtk_clk_register_plls (&pdev->dev, plls,ARRAY_SIZE (plls), clk_data);if (r) goto free_apmixed_data;
drivers/clk/mediatek/clk-mt8135-apmixedsys.c +2 -1
@@ -57,7 +57,8 @@ static int clk_mt8135_apmixed_probe(struct platform_device *pdev)if (!clk_data)return -ENOMEM ; - ret =mtk_clk_register_plls (node, plls,ARRAY_SIZE (plls), clk_data); + ret =mtk_clk_register_plls (&pdev->dev, plls,ARRAY_SIZE (plls), + clk_data);if (ret) goto free_clk_data;
drivers/clk/mediatek/clk-mt8167-apmixedsys.c +1 -1
@@ -105,7 +105,7 @@ static int clk_mt8167_apmixed_probe(struct platform_device *pdev)if (!clk_data)return -ENOMEM ; - ret =mtk_clk_register_plls (node, plls,ARRAY_SIZE (plls), clk_data); + ret =mtk_clk_register_plls (dev, plls,ARRAY_SIZE (plls), clk_data);if (ret)return ret;
drivers/clk/mediatek/clk-mt8183-apmixedsys.c +1 -1
@@ -155,7 +155,7 @@ static int clk_mt8183_apmixed_probe(struct platform_device *pdev)if (!clk_data)return -ENOMEM ; - ret =mtk_clk_register_plls (node, plls,ARRAY_SIZE (plls), clk_data); + ret =mtk_clk_register_plls (dev, plls,ARRAY_SIZE (plls), clk_data);if (ret)return ret;
drivers/clk/mediatek/clk-mt8188-apmixedsys.c +1 -1
@@ -106,7 +106,7 @@ static int clk_mt8188_apmixed_probe(struct platform_device *pdev)if (!clk_data)return -ENOMEM ; - r =mtk_clk_register_plls (node, plls,ARRAY_SIZE (plls), clk_data); + r =mtk_clk_register_plls (&pdev->dev, plls,ARRAY_SIZE (plls), clk_data);if (r) goto free_apmixed_data;
drivers/clk/mediatek/clk-mt8195-apusys_pll.c +2 -1
@@ -66,7 +66,8 @@ static int clk_mt8195_apusys_pll_probe(struct platform_device *pdev)if (!clk_data)return -ENOMEM ; - r =mtk_clk_register_plls (node, apusys_plls,ARRAY_SIZE (apusys_plls), clk_data); + r =mtk_clk_register_plls (&pdev->dev, apusys_plls, +ARRAY_SIZE (apusys_plls), clk_data);if (r) goto free_apusys_pll_data;
drivers/clk/mediatek/clk-mt8196-apmixedsys.c +2 -1
@@ -152,7 +152,8 @@ static int clk_mt8196_apmixed_probe(struct platform_device *pdev)if (!clk_data)return -ENOMEM ; - r =mtk_clk_register_plls (node, mcd->clks, mcd->num_clks, clk_data); + r =mtk_clk_register_plls (&pdev->dev, mcd->clks, mcd->num_clks, + clk_data);if (r) goto free_apmixed_data;
drivers/clk/mediatek/clk-mt8196-mcu.c +1 -1
@@ -122,7 +122,7 @@ static int clk_mt8196_mcu_probe(struct platform_device *pdev)if (!clk_data)return -ENOMEM ; - r =mtk_clk_register_plls (node, plls, num_plls, clk_data); + r =mtk_clk_register_plls (&pdev->dev, plls, num_plls, clk_data);if (r) goto free_clk_data;
drivers/clk/mediatek/clk-mt8196-mfg.c +1 -1
@@ -106,7 +106,7 @@ static int clk_mt8196_mfg_probe(struct platform_device *pdev)if (!clk_data)return -ENOMEM ; - r =mtk_clk_register_plls (node, plls, num_plls, clk_data); + r =mtk_clk_register_plls (&pdev->dev, plls, num_plls, clk_data);if (r) goto free_clk_data;
drivers/clk/mediatek/clk-mt8196-vlpckgen.c +1 -1
@@ -664,7 +664,7 @@ static int clk_mt8196_vlp_probe(struct platform_device *pdev)if (r) goto unregister_factors; - r =mtk_clk_register_plls (node, vlp_plls,ARRAY_SIZE (vlp_plls), + r =mtk_clk_register_plls (dev, vlp_plls,ARRAY_SIZE (vlp_plls), clk_data);if (r) goto unregister_muxes;
drivers/clk/mediatek/clk-mt8365-apmixedsys.c +1 -1
@@ -133,7 +133,7 @@ static int clk_mt8365_apmixed_probe(struct platform_device *pdev)return PTR_ERR (hw); clk_data->hws[CLK_APMIXED_USB20_EN ] = hw; - ret =mtk_clk_register_plls (node, plls,ARRAY_SIZE (plls), clk_data); + ret =mtk_clk_register_plls (dev, plls,ARRAY_SIZE (plls), clk_data);if (ret)return ret;
drivers/clk/mediatek/clk-mt8516-apmixedsys.c +1 -1
@@ -87,7 +87,7 @@ static int clk_mt8516_apmixed_probe(struct platform_device *pdev)if (!clk_data)return -ENOMEM ; - ret =mtk_clk_register_plls (node, plls,ARRAY_SIZE (plls), clk_data); + ret =mtk_clk_register_plls (dev, plls,ARRAY_SIZE (plls), clk_data);if (ret)return ret;
drivers/clk/mediatek/clk-pll.c +4 -3
@@ -11,6 +11,7 @@#include <linux/io.h> #include <linux/module.h> #include <linux/of_address.h> +#include <linux/platform_device.h> #include <linux/slab.h> #include "clk-pll.h"
@@ -407,7 +408,7 @@ void mtk_clk_unregister_pll(struct clk_hw *hw)kfree (pll); } -int mtk_clk_register_plls (struct device_node *node, +int mtk_clk_register_plls (struct device *dev,const struct mtk_pll_data *plls,int num_plls,struct clk_hw_onecell_data *clk_data) {
@@ -415,7 +416,7 @@ int mtk_clk_register_plls(struct device_node *node,int i;struct clk_hw *hw; - base =of_iomap (node,0 ); + base =of_iomap (dev->of_node,0 );if (!base) {pr_err ("%s(): ioremap failed\n" , __func__);return -EINVAL ;
@@ -426,7 +427,7 @@ int mtk_clk_register_plls(struct device_node *node,if (!IS_ERR_OR_NULL (clk_data->hws[pll->id])) {pr_warn ("%pOF: Trying to register duplicate clock ID: %d\n" , - node, pll->id); + dev->of_node, pll->id);continue ; }
drivers/clk/mediatek/clk-pll.h +4 -6
@@ -10,9 +10,7 @@#include <linux/clk-provider.h> #include <linux/types.h> -struct clk_ops ; -struct clk_hw_onecell_data ; -struct device_node ; +struct device ;struct mtk_pll_div_table {u32 div;
@@ -79,9 +77,9 @@ struct mtk_clk_pll {const struct mtk_pll_data *data; }; -int mtk_clk_register_plls (struct device_node *node, -const struct mtk_pll_data *plls,int num_plls, -struct clk_hw_onecell_data *clk_data); +int mtk_clk_register_plls (struct device *dev,const struct mtk_pll_data *plls, +int num_plls,struct clk_hw_onecell_data *clk_data); +void mtk_clk_unregister_plls (const struct mtk_pll_data *plls,int num_plls,struct clk_hw_onecell_data *clk_data);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 613/1518 clk: mediatek: Pass device to clk_hw_register for PLLs
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicolas Frattaroli <[email protected]>
[ Upstream commit ecffd05839b32f17bde1f3701b68ab182a837b07 ]
Passing the struct device pointer to clk_hw_register allows for runtime power management to work for the registered clock controllers. However, the mediatek PLL clocks do not do this.
Change this by adding a struct device pointer argument to mtk_clk_register_pll, and fix up the only other user of it. Also add a new member to the struct mtk_clk_pll for the struct device pointer, which is set by mtk_clk_register_pll and is used by mtk_clk_register_pll_ops.
If mtk_clk_register_pll is called with a NULL struct device pointer, then everything still works as expected; the clock core will simply treat them as previously, i.e. without runtime power management.
Stable-dep-of: 540d91480bcb ("clk: mediatek: pllfh: Fix IO remapping leak in register_pllfhs error path")
--- drivers/clk/mediatek/clk-pll.c | 9 ++++++--- drivers/clk/mediatek/clk-pll.h | 4 +++- drivers/clk/mediatek/clk-pllfh.c | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-)
drivers/clk/mediatek/clk-pll.c +6 -3
@@ -369,7 +369,7 @@ struct clk_hw *mtk_clk_register_pll_ops(struct mtk_clk_pll *pll, init.parent_names = &parent_name; init.num_parents =1 ; - ret =clk_hw_register (NULL , &pll->hw); + ret =clk_hw_register (pll->dev, &pll->hw);if (ret)return ERR_PTR (ret);
@@ -377,7 +377,8 @@ struct clk_hw *mtk_clk_register_pll_ops(struct mtk_clk_pll *pll,return &pll->hw; } -struct clk_hw *mtk_clk_register_pll (const struct mtk_pll_data *data, +struct clk_hw *mtk_clk_register_pll (struct device *dev, +const struct mtk_pll_data *data,void __iomem *base) {struct mtk_clk_pll *pll;
@@ -388,6 +389,8 @@ struct clk_hw *mtk_clk_register_pll(const struct mtk_pll_data *data,if (!pll)return ERR_PTR (-ENOMEM ); + pll->dev = dev; + hw =mtk_clk_register_pll_ops (pll, data, base, pll_ops);if (IS_ERR (hw))kfree (pll);
@@ -431,7 +434,7 @@ int mtk_clk_register_plls(struct device *dev,continue ; } - hw =mtk_clk_register_pll (pll, base); + hw =mtk_clk_register_pll (dev, pll, base);if (IS_ERR (hw)) { pr_err("Failed to register clk %s: %pe\n", pll->name,
drivers/clk/mediatek/clk-pll.h +3 -1
@@ -62,6 +62,7 @@ struct mtk_pll_data {*/ struct mtk_clk_pll { +struct device *dev;struct clk_hw hw;void __iomem *base_addr;void __iomem *pd_addr;
@@ -109,7 +110,8 @@ struct clk_hw *mtk_clk_register_pll_ops(struct mtk_clk_pll *pll,const struct mtk_pll_data *data, void __iomem *base, const struct clk_ops *pll_ops); -struct clk_hw *mtk_clk_register_pll (const struct mtk_pll_data *data, +struct clk_hw *mtk_clk_register_pll (struct device *dev, +const struct mtk_pll_data *data,void __iomem *base);void mtk_clk_unregister_pll (struct clk_hw *hw);
drivers/clk/mediatek/clk-pllfh.c +1 -1
@@ -220,7 +220,7 @@ int mtk_clk_register_pllfhs(struct device_node *node,if (use_fhctl) hw =mtk_clk_register_pllfh (pll, pllfh, base);else - hw =mtk_clk_register_pll (pll, base); + hw =mtk_clk_register_pll (NULL , pll, base);if (IS_ERR (hw)) { pr_err("Failed to register %s clk %s: %ld\n",
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 614/1518 clk: mediatek: Refactor pllfh registration to pass device
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicolas Frattaroli <[email protected]>
[ Upstream commit 483f364bb0014495da19c1ccb1a6e2423fc37d95 ]
After refactoring all of PLL to pass the device, it's now fairly easy to refactor pllfh and its users, as pllfh registration wraps PLL registration.
Do this refactor and move all of the pllfh users to pass the device as well.
Stable-dep-of: 540d91480bcb ("clk: mediatek: pllfh: Fix IO remapping leak in register_pllfhs error path")
--- drivers/clk/mediatek/clk-mt6795-apmixedsys.c | 2 +- drivers/clk/mediatek/clk-mt8173-apmixedsys.c | 14 +++++++------- drivers/clk/mediatek/clk-mt8186-apmixedsys.c | 2 +- drivers/clk/mediatek/clk-mt8192-apmixedsys.c | 2 +- drivers/clk/mediatek/clk-mt8195-apmixedsys.c | 2 +- drivers/clk/mediatek/clk-pllfh.c | 13 ++++++++----- drivers/clk/mediatek/clk-pllfh.h | 2 +- 7 files changed, 20 insertions(+), 17 deletions(-)
drivers/clk/mediatek/clk-mt6795-apmixedsys.c +1 -1
@@ -152,7 +152,7 @@ static int clk_mt6795_apmixed_probe(struct platform_device *pdev)return -ENOMEM ;fhctl_parse_dt (fhctl_node, pllfhs,ARRAY_SIZE (pllfhs)); - ret =mtk_clk_register_pllfhs (node, plls,ARRAY_SIZE (plls), + ret =mtk_clk_register_pllfhs (dev, plls,ARRAY_SIZE (plls), pllfhs,ARRAY_SIZE (pllfhs), clk_data);if (ret) goto free_clk_data;
drivers/clk/mediatek/clk-mt8173-apmixedsys.c +7 -7
@@ -140,13 +140,13 @@ MODULE_DEVICE_TABLE(of, of_match_clk_mt8173_apmixed);static int clk_mt8173_apmixed_probe (struct platform_device *pdev) {const u8 *fhctl_node ="mediatek,mt8173-fhctl" ; -struct device_node *node = pdev->dev.of_node;struct clk_hw_onecell_data *clk_data; +struct device *dev = &pdev->dev;void __iomem *base;struct clk_hw *hw;int r; - base =of_iomap (node,0 ); + base =of_iomap (dev->of_node,0 );if (!base)return -ENOMEM ;
@@ -157,25 +157,25 @@ static int clk_mt8173_apmixed_probe(struct platform_device *pdev) }fhctl_parse_dt (fhctl_node, pllfhs,ARRAY_SIZE (pllfhs)); - r =mtk_clk_register_pllfhs (node, plls,ARRAY_SIZE (plls), - pllfhs,ARRAY_SIZE (pllfhs), clk_data); + r =mtk_clk_register_pllfhs (dev, plls,ARRAY_SIZE (plls), pllfhs, +ARRAY_SIZE (pllfhs), clk_data);if (r) goto free_clk_data; hw =mtk_clk_register_ref2usb_tx ("ref2usb_tx" ,"clk26m" , base +REGOFF_REF2USB );if (IS_ERR (hw)) { r =PTR_ERR (hw); -dev_err (&pdev->dev,"Failed to register ref2usb_tx: %d\n" , r); +dev_err (dev,"Failed to register ref2usb_tx: %d\n" , r); goto unregister_plls; } clk_data->hws[CLK_APMIXED_REF2USB_TX ] = hw; - hw =devm_clk_hw_register_divider (&pdev->dev,"hdmi_ref" ,"tvdpll_594m" ,0 , + hw =devm_clk_hw_register_divider (dev,"hdmi_ref" ,"tvdpll_594m" ,0 , base +REGOFF_HDMI_REF ,16 ,3 ,CLK_DIVIDER_POWER_OF_TWO ,NULL ); clk_data->hws[CLK_APMIXED_HDMI_REF ] = hw; - r =of_clk_add_hw_provider (node, of_clk_hw_onecell_get, clk_data); + r =of_clk_add_hw_provider (dev->of_node, of_clk_hw_onecell_get, clk_data);if (r) goto unregister_ref2usb;
drivers/clk/mediatek/clk-mt8186-apmixedsys.c +1 -1
@@ -151,7 +151,7 @@ static int clk_mt8186_apmixed_probe(struct platform_device *pdev)fhctl_parse_dt (fhctl_node, pllfhs,ARRAY_SIZE (pllfhs)); - r =mtk_clk_register_pllfhs (node, plls,ARRAY_SIZE (plls), + r =mtk_clk_register_pllfhs (&pdev->dev, plls,ARRAY_SIZE (plls), pllfhs,ARRAY_SIZE (pllfhs), clk_data);if (r) goto free_apmixed_data;
drivers/clk/mediatek/clk-mt8192-apmixedsys.c +1 -1
@@ -162,7 +162,7 @@ static int clk_mt8192_apmixed_probe(struct platform_device *pdev)fhctl_parse_dt (fhctl_node, pllfhs,ARRAY_SIZE (pllfhs)); - r =mtk_clk_register_pllfhs (node, plls,ARRAY_SIZE (plls), + r =mtk_clk_register_pllfhs (&pdev->dev, plls,ARRAY_SIZE (plls), pllfhs,ARRAY_SIZE (pllfhs), clk_data);if (r) goto free_clk_data;
drivers/clk/mediatek/clk-mt8195-apmixedsys.c +1 -1
@@ -181,7 +181,7 @@ static int clk_mt8195_apmixed_probe(struct platform_device *pdev)fhctl_parse_dt (fhctl_node, pllfhs,ARRAY_SIZE (pllfhs)); - r =mtk_clk_register_pllfhs (node, plls,ARRAY_SIZE (plls), + r =mtk_clk_register_pllfhs (&pdev->dev, plls,ARRAY_SIZE (plls), pllfhs,ARRAY_SIZE (pllfhs), clk_data);if (r) goto free_apmixed_data;
drivers/clk/mediatek/clk-pllfh.c +8 -5
@@ -10,6 +10,7 @@#include <linux/slab.h> #include <linux/clkdev.h> #include <linux/delay.h> +#include <linux/device.h> #include "clk-mtk.h" #include "clk-pllfh.h"
@@ -149,7 +150,7 @@ static bool fhctl_is_supported_and_enabled(const struct mtk_pllfh_data *pllfh) }static struct clk_hw * -mtk_clk_register_pllfh (const struct mtk_pll_data *pll_data, +mtk_clk_register_pllfh (struct device *dev,const struct mtk_pll_data *pll_data,struct mtk_pllfh_data *pllfh_data,void __iomem *base) {struct clk_hw *hw;
@@ -166,6 +167,8 @@ mtk_clk_register_pllfh(const struct mtk_pll_data *pll_data, goto out; } + fh->clk_pll.dev = dev; + hw =mtk_clk_register_pll_ops (&fh->clk_pll, pll_data, base, &mtk_pllfh_ops);
@@ -194,7 +197,7 @@ static void mtk_clk_unregister_pllfh(struct clk_hw *hw)kfree (fh); } -int mtk_clk_register_pllfhs (struct device_node *node, +int mtk_clk_register_pllfhs (struct device *dev,const struct mtk_pll_data *plls,int num_plls,struct mtk_pllfh_data *pllfhs,int num_fhs,struct clk_hw_onecell_data *clk_data)
@@ -203,7 +206,7 @@ int mtk_clk_register_pllfhs(struct device_node *node,int i;struct clk_hw *hw; - base =of_iomap (node,0 ); + base =of_iomap (dev->of_node,0 );if (!base) {pr_err ("%s(): ioremap failed\n" , __func__);return -EINVAL ;
@@ -218,9 +221,9 @@ int mtk_clk_register_pllfhs(struct device_node *node, use_fhctl =fhctl_is_supported_and_enabled (pllfh);if (use_fhctl) - hw =mtk_clk_register_pllfh (pll, pllfh, base); + hw =mtk_clk_register_pllfh (dev, pll, pllfh, base);else - hw =mtk_clk_register_pll (NULL , pll, base); + hw =mtk_clk_register_pll (dev, pll, base);if (IS_ERR (hw)) { pr_err("Failed to register %s clk %s: %ld\n",
drivers/clk/mediatek/clk-pllfh.h +1 -1
@@ -68,7 +68,7 @@ struct fh_operation {int (*ssc_enable)(struct mtk_fh *fh,u32 rate); }; -int mtk_clk_register_pllfhs (struct device_node *node, +int mtk_clk_register_pllfhs (struct device *dev,const struct mtk_pll_data *plls,int num_plls,struct mtk_pllfh_data *pllfhs,int num_pllfhs,struct clk_hw_onecell_data *clk_data);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 615/1518 clk: mediatek: pllfh: Fix IO remapping leak in register_pllfhs error path
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Louis-Alexis Eyraud <[email protected]>
[ Upstream commit 540d91480bcb1b28a62d7023aa70947ea44c55b9 ]
When mtk_clk_register_pllfhs function fails to register a PLL, it unregisters all PLLs and cleans up itself in its error path before returning, so the function callers don't need to do it.
But contrary to mtk_clk_unregister_pllfhs function, that does almost the same sequence, it does not free the IO memory mapped on fhctl node, leading to a leak.
Fix this leak by factorizing the cleanup sequence in a new private function and use it both mtk_clk_register_pllfhs and mtk_clk_unregister_pllfhs functions.
Also, change the loop index start value to avoid the -1 operation on index at each loop.
--- drivers/clk/mediatek/clk-pllfh.c | 98 ++++++++++++++++---------------- 1 file changed, 49 insertions(+), 49 deletions(-)
drivers/clk/mediatek/clk-pllfh.c +49 -49
@@ -197,12 +197,56 @@ static void mtk_clk_unregister_pllfh(struct clk_hw *hw)kfree (fh); } +static void mtk_clk_cleanup_pllfhs (void __iomem *iomem_base, +const struct mtk_pll_data *plls,int num_plls, +void __iomem *iomem_fhctl_base, +struct mtk_pllfh_data *pllfhs,int num_fhs, +struct clk_hw_onecell_data *clk_data) +{ +void __iomem *base = iomem_base; +void __iomem *fhctl_base = iomem_fhctl_base; +int i; + +for (i = num_plls -1 ; i >=0 ; i--) { +const struct mtk_pll_data *pll = &plls[i]; +struct mtk_pllfh_data *pllfh; +bool use_fhctl; + +if (IS_ERR_OR_NULL (clk_data->hws[pll->id])) +continue ; + + pllfh =get_pllfh_by_id (pllfhs, num_fhs, pll->id); + use_fhctl =fhctl_is_supported_and_enabled (pllfh); + +if (!base) + base =mtk_clk_pll_get_base (clk_data->hws[pll->id], + pll); + +if (use_fhctl) { +if (!fhctl_base) + fhctl_base = pllfh->state.base; +mtk_clk_unregister_pllfh (clk_data->hws[pll->id]); + }else { +mtk_clk_unregister_pll (clk_data->hws[pll->id]); + } + + clk_data->hws[pll->id] =ERR_PTR (-ENOENT ); + } + +if (fhctl_base) +iounmap (fhctl_base); + +if (base) +iounmap (base); +} + +int mtk_clk_register_pllfhs (struct device *dev,const struct mtk_pll_data *plls,int num_plls,struct mtk_pllfh_data *pllfhs,int num_fhs,struct clk_hw_onecell_data *clk_data) { -void __iomem *base; +void __iomem *base, *fhctl_base =NULL ;int i;struct clk_hw *hw;
@@ -238,24 +282,8 @@ int mtk_clk_register_pllfhs(struct device *dev,return 0 ; err: -while (--i >=0 ) { -const struct mtk_pll_data *pll = &plls[i]; -struct mtk_pllfh_data *pllfh; -bool use_fhctl; - - pllfh =get_pllfh_by_id (pllfhs, num_fhs, pll->id); - use_fhctl =fhctl_is_supported_and_enabled (pllfh); - -if (use_fhctl) -mtk_clk_unregister_pllfh (clk_data->hws[pll->id]); -else -mtk_clk_unregister_pll (clk_data->hws[pll->id]); - - clk_data->hws[pll->id] =ERR_PTR (-ENOENT ); - } - -iounmap (base); - +mtk_clk_cleanup_pllfhs (base, plls, i, fhctl_base, pllfhs, num_fhs, + clk_data);return PTR_ERR (hw); }EXPORT_SYMBOL_GPL (mtk_clk_register_pllfhs);
@@ -264,38 +292,10 @@ void mtk_clk_unregister_pllfhs(const struct mtk_pll_data *plls, int num_plls, struct mtk_pllfh_data *pllfhs, int num_fhs, struct clk_hw_onecell_data *clk_data) { - void __iomem *base = NULL, *fhctl_base = NULL; -int i; - if (!clk_data) return; -for (i = num_plls; i >0 ; i--) { -const struct mtk_pll_data *pll = &plls[i -1 ]; -struct mtk_pllfh_data *pllfh; -bool use_fhctl; - -if (IS_ERR_OR_NULL (clk_data->hws[pll->id])) -continue ; - - pllfh =get_pllfh_by_id (pllfhs, num_fhs, pll->id); - use_fhctl =fhctl_is_supported_and_enabled (pllfh); - -if (use_fhctl) { - fhctl_base = pllfh->state.base; -mtk_clk_unregister_pllfh (clk_data->hws[pll->id]); - }else { - base =mtk_clk_pll_get_base (clk_data->hws[pll->id], - pll); -mtk_clk_unregister_pll (clk_data->hws[pll->id]); - } - - clk_data->hws[pll->id] =ERR_PTR (-ENOENT ); - } - -if (fhctl_base) -iounmap (fhctl_base); - -iounmap (base); +mtk_clk_cleanup_pllfhs (NULL ,plls ,num_plls ,NULL ,pllfhs , +num_fhs ,clk_data ); }EXPORT_SYMBOL_GPL (mtk_clk_unregister_pllfhs);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 616/1518 clk: palmas: Manage external-control prepare with devm
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Myeonghun Pak <[email protected]>
[ Upstream commit ccda84fcbf3a972973f772384935928f41817b3a ]
palmas_clks_init_configure() prepares the clock when an external control pin is configured. The current driver only drops that prepare reference when external control configuration fails.
If provider registration fails after that point, or if the driver is later removed, the prepare reference remains held.
Register a device-managed action after clk_prepare() succeeds. This balances the prepare reference on subsequent probe failure and driver removal.
--- drivers/clk/clk-palmas.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
drivers/clk/clk-palmas.c +13 -1
@@ -194,6 +194,13 @@ static void palmas_clks_get_clk_data(struct platform_device *pdev, cinfo->ext_control_pin = prop; } +static void palmas_clks_unprepare_ext_control (void *data) +{ +struct palmas_clock_info *cinfo = data; + +clk_unprepare (cinfo->hw.clk); +} +static int palmas_clks_init_configure (struct palmas_clock_info *cinfo) {int ret;
@@ -214,13 +221,18 @@ static int palmas_clks_init_configure(struct palmas_clock_info *cinfo)return ret; } + ret =devm_add_action_or_reset (cinfo->dev, + palmas_clks_unprepare_ext_control, + cinfo); +if (ret) +return ret; + ret =palmas_ext_control_req_config (cinfo->palmas, cinfo->clk_desc->sleep_reqstr_id, cinfo->ext_control_pin, true);if (ret <0 ) {dev_err (cinfo->dev,"Ext config for %s failed, %d\n" , cinfo->clk_desc->clk_name, ret); -clk_unprepare (cinfo->hw.clk);return ret; } }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 617/1518 clk/x86: pmc_atom: add kasprintf return value check
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: longlong yan <[email protected]>
[ Upstream commit 18e9d14cbac33db1c1fb933c26a736eef53dd538 ]
The kasprintf() function returns NULL on memory allocation failure, but the code in plt_clk_register() was not checking this return value. If kasprintf fails, init.name would be NULL and could cause NULL pointer dereference when clkdev_hw_create() uses it.
Add proper error checking for the kasprintf() return value and return ERR_PTR(-ENOMEM) on failure.
--- drivers/clk/x86/clk-pmc-atom.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/clk/x86/clk-pmc-atom.c +3 -0
@@ -160,6 +160,9 @@ static struct clk_plt *plt_clk_register(struct platform_device *pdev, int id,return ERR_PTR (-ENOMEM ); init.name =kasprintf (GFP_KERNEL ,"%s_%d" ,PLT_CLK_NAME_BASE , id); +if (!init.name) +return ERR_PTR (-ENOMEM ); + init.ops = &plt_clk_ops; init.flags =0 ; init.parent_names = parent_names;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 618/1518 clk: mediatek: mt8135: Fix inverted gate control for devapc_ck
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Akari Tsuyukusa <[email protected]>
[ Upstream commit fd0e3e4edea6a3e4da91be608ca2fb9b348f9e32 ]
The devapc_ck (CLK_INFRA_DEVAPC) on MT8135 is currently using "mtk_clk_gate_ops_setclr". However, checking the downstream kernel reveals that this clock is configured with set:enable and clr:disable making "mtk_clk_gate_ops_setclr_inv" the appropriate choice.
But, it is strange that some downstream kernels are not like that.
Amazon: INV
ChromiumOS (early): not INV
ChromiumOS 3.16 to 3.18-revew-v2: INV
ChromiumOS 3.18-review-v3 and later (sent to kernel.org): not INV
--- drivers/clk/mediatek/clk-mt8135.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/clk/mediatek/clk-mt8135.c +4 -1
@@ -409,6 +409,9 @@ static const struct mtk_gate_regs infra_cg_regs = {GATE_MTK_FLAGS (_id, _name, _parent, &infra_cg_regs, _shift, \ &mtk_clk_gate_ops_setclr, CLK_IS_CRITICAL) +#define GATE_ICG_INV (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &infra_cg_regs, _shift, &mtk_clk_gate_ops_setclr_inv) +static const struct mtk_gate infra_clks[] = {GATE_DUMMY (CLK_DUMMY ,"infra_dummy" ),GATE_ICG (CLK_INFRA_PMIC_WRAP ,"pmic_wrap_ck" ,"axi_sel" ,23 ),
@@ -419,7 +422,7 @@ static const struct mtk_gate infra_clks[] = {GATE_ICG (CLK_INFRA_CPUM ,"cpum_ck" ,"cpum_tck_in" ,15 ),GATE_ICG_AO (CLK_INFRA_M4U ,"m4u_ck" ,"mem_sel" ,8 ),GATE_ICG (CLK_INFRA_MFGAXI ,"mfgaxi_ck" ,"axi_sel" ,7 ), -GATE_ICG (CLK_INFRA_DEVAPC ,"devapc_ck" ,"axi_sel" ,6 ), +GATE_ICG_INV (CLK_INFRA_DEVAPC ,"devapc_ck" ,"axi_sel" ,6 ),GATE_ICG (CLK_INFRA_AUDIO ,"audio_ck" ,"aud_intbus_sel" ,5 ),GATE_ICG (CLK_INFRA_MFG_BUS ,"mfg_bus_ck" ,"axi_sel" ,2 ), GATE_ICG(CLK_INFRA_SMI, "smi_ck", "smi_sel", 1),
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 619/1518 clk: rockchip: Fix the fractional part denominator on RK3588/RK3576 PLLs
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexey Charkov <[email protected]>
[ Upstream commit 52aef653c3d0c24013dfa9eccf692594eacdbe17 ]
According to the TRM, the fractional PLL coefficient should be divided by 65536 rather than 65535 to obtain the output rate.
Fix the denominator and add a comment with the TRM provided clock formulae for future reference.
See RK3576 TRM Part 1 V1.2 section 2.13.1.4 Setting Guide on P, M, S and K or equivalently RK3588 TRM part 1 V1.0 section 2.17.1.4 Setting Guide on P, M, S and K.
Fractional PLL rates don't seem to be used by any current mainline consumers, so this is purely a correctness fix. It will also be important to properly support DisplayPort output going forward, as the video output controller derives its pixel clock from system PLLs with no dedicated PHY PLL option for DP unlike HDMI, and some display modes are only achievable with fractional PLL rates.
--- drivers/clk/rockchip/clk-pll.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/clk/rockchip/clk-pll.c +8 -1
@@ -900,6 +900,13 @@ static void rockchip_rk3588_pll_get_params(struct rockchip_clk_pll *pll, rate->k = ((pllcon >>RK3588_PLLCON2_K_SHIFT ) &RK3588_PLLCON2_K_MASK ); } +/* +* 2250 MHz <= Fvco <= 4500 MHz +* For Fvco > 3 GHz: period jitter +-1% frac PLL, +-0.75% int PLL +* For Fvco < 3 GHz: period jitter +-2% frac PLL, +-1.50% int PLL +* Fvco = ((m + k / 65536) * Fin) / p +* Fout = ((m + k / 65536) * Fin) / (p * 2^s) +*/ static unsigned long rockchip_rk3588_pll_recalc_rate (struct clk_hw *hw,unsigned long prate) {struct rockchip_clk_pll *pll =to_rockchip_clk_pll (hw);
@@ -915,7 +922,7 @@ static unsigned long rockchip_rk3588_pll_recalc_rate(struct clk_hw *hw, unsigned/* fractional mode */ u64 frac_rate64 = prate * cur.k; - postdiv = cur.p *65535 ; + postdiv = cur.p *65536 ;do_div (frac_rate64, postdiv); rate64 += frac_rate64; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 620/1518 nilfs2: fix infinite loop in nilfs_clean_segments()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joshua Crofts <[email protected]>
[ Upstream commit ce5a5ad1a8330a2fcfdd9ec2ab341be739e89a18 ]
syzbot reported a hung task in nilfs_transaction_begin(). This occurs because the cleaner ioctl falls into an infinite loop if nilfs_segctor_construct() repeatedly returns -EROFS (e.g. the device is remounted as read-only after an I/O error).
Currently in nilfs_clean_segments(), if err is non-zero, it logs the error and sleeps but doesn't abort when it encounters a terminal error like -EROFS. This causes the thread to loop forever.
Fix this by breaking out of the loop if nilfs_segctor_construct() returns -EROFS. This matches the behaviour in nilfs_segctor_write_out(), which also handles -EROFS.
--- fs/nilfs2/segment.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/nilfs2/segment.c +4 -0
@@ -2561,6 +2561,10 @@ int nilfs_clean_segments(struct super_block *sb, struct nilfs_argv *argv,break ;nilfs_warn (sb,"error %d cleaning segments" , err); + +if (unlikely (err == -EROFS )) + goto out_unlock; +set_current_state (TASK_INTERRUPTIBLE );schedule_timeout (sci->sc_interval); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 621/1518 nilfs2: prevent out-of-bounds read in super root block parsing
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Lee <[email protected]>
[ Upstream commit 7cb2f76a6a2ba2130b577cb8ac13e1e46c4fc689 ]
super-root inode metadata size is trusted before nilfs_read_inode_common().
Reject super-root inode sizes whose computed on-disk footprint exceeds the filesystem block size. This prevents malformed filesystem images from making nilfs_read_inode_common() read past the end of the super-root block.
[ryusuke: clarify the commit title]
--- fs/nilfs2/the_nilfs.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/nilfs2/the_nilfs.c +6 -0
@@ -461,6 +461,12 @@ static int nilfs_store_disk_layout(struct the_nilfs *nilfs, nilfs->ns_inode_size);return -EINVAL ; } +if (NILFS_SR_BYTES (nilfs->ns_inode_size) > nilfs->ns_blocksize) { +nilfs_err (nilfs->ns_sb, +"too large inode size for super root: %d bytes" , + nilfs->ns_inode_size); +return -EINVAL ; + } nilfs->ns_first_ino =le32_to_cpu (sbp->s_first_ino);if (nilfs->ns_first_ino <NILFS_USER_INO ) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 622/1518 nilfs2: fix BUG in nilfs_copy_dirty_pages() on dirty state mismatch
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryusuke Konishi <[email protected]>
[ Upstream commit 66f4ad3ce158902e5f98afea93189972ed8750c2 ]
Syzbot reported a kernel BUG triggered within nilfs_copy_dirty_pages(), which copies dirty DAT file folios/pages to its shadow page cache. The BUG occurs when a retrieved dirty folio/page unexpectedly loses its 'dirty' status.
This issue arises because, since the commit referenced below, the 'dirty' flag of a folio/page can be cleared asynchronously after the filesystem detects metadata corruption and transitions to read-only mode.
Resolve the issue by returning an -EROFS error if the filesystem has transitioned to read-only mode. Also change the behavior to issue a kernel warning only once instead of triggering a kernel BUG when this unexpected 'dirty' state is detected while the filesystem is not in read-only mode.
--- fs/nilfs2/page.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
fs/nilfs2/page.c +15 -2
@@ -243,6 +243,7 @@ static void nilfs_copy_folio(struct folio *dst, struct folio *src,int nilfs_copy_dirty_pages (struct address_space *dmap,struct address_space *smap) { +struct inode *smap_inode = smap->host;struct folio_batch fbatch;unsigned int i;pgoff_t index =0 ;
@@ -258,8 +259,19 @@ int nilfs_copy_dirty_pages(struct address_space *dmap,struct folio *folio = fbatch.folios[i], *dfolio;folio_lock (folio); -if (unlikely (!folio_test_dirty (folio))) -NILFS_FOLIO_BUG (folio,"inconsistent dirty state" ); +if (unlikely (!folio_test_dirty (folio))) { +if (WARN_ONCE (!sb_rdonly (smap_inode->i_sb), +"inconsistent dirty state\n" )) + goto unlock_folio; + +/* +* If the filesystem has been forced to read-only +* due to metadata corruption. +*/ +folio_unlock (folio); + err = -EROFS ; +break ; + } dfolio =filemap_grab_folio (dmap, folio->index);if (IS_ERR (dfolio)) {
@@ -277,6 +289,7 @@ int nilfs_copy_dirty_pages(struct address_space *dmap,folio_unlock (dfolio);folio_put (dfolio); +unlock_folio:folio_unlock (folio); }folio_batch_release (&fbatch);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 623/1518 scsi: smartpqi: Fix AIO retry marker cleared by SCSI core between dispatches.
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Strahan <[email protected]>
[ Upstream commit 225548863f0a2350c6f34231ca56710c3dd1a5d5 ]
On recent Linux kernels the driver can enter a retry loop on the AIO fast path when a request is retried, looping until timeout. A diagnostic path that takes a physical drive offline on AIO-bypass failure is also never entered on affected kernels.
Register a per-command initialization callback with the SCSI core. Its presence causes the core to skip the per-dispatch clear, so the retry marker now survives across the requeue and the AIO-to-RAID fallback proceeds as intended. The driver takes over the marker's lifetime: it is zeroed at tag allocation, preserved across the retry requeue so the error path can act on it, and cleared on terminal completion so the tag starts clean on its next use.
--- drivers/scsi/smartpqi/smartpqi_init.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/scsi/smartpqi/smartpqi_init.c +18 -0
@@ -66,6 +66,12 @@ static struct pqi_cmd_priv *pqi_cmd_priv(struct scsi_cmnd *cmd)return scsi_cmd_priv (cmd); } +static int pqi_init_cmd_priv (struct Scsi_Host *shost,struct scsi_cmnd *cmd) +{ +memset (pqi_cmd_priv (cmd),0 ,sizeof (struct pqi_cmd_priv )); +return 0 ; +} +static void pqi_verify_structures (void );static void pqi_take_ctrl_offline (struct pqi_ctrl_info *ctrl_info,enum pqi_ctrl_shutdown_reason ctrl_shutdown_reason);
@@ -5943,6 +5949,17 @@ void pqi_prep_for_scsi_done(struct scsi_cmnd *scmd)struct pqi_scsi_dev *device;struct completion *wait; +/* +* Clear the AIO-retry marker on final completion so the tag +* starts clean on its next dispatch. On DID_IMM_RETRY leave +* it intact: pqi_aio_io_complete() sets DID_IMM_RETRY and +* bumps the marker to steer the requeue onto the RAID path, +* and pqi_process_raid_io_error() consumes the non-zero +* marker to offline a misbehaving drive. +*/ +if (host_byte (scmd->result) !=DID_IMM_RETRY ) +pqi_cmd_priv (scmd)->this_residual =0 ; +if (!scmd->device) {set_host_byte (scmd,DID_NO_CONNECT );return ;
@@ -7596,6 +7613,7 @@ static const struct scsi_host_template pqi_driver_template = { .sdev_groups = pqi_sdev_groups, .shost_groups = pqi_shost_groups, .cmd_size = sizeof(struct pqi_cmd_priv), + .init_cmd_priv = pqi_init_cmd_priv, };static int pqi_register_scsi (struct pqi_ctrl_info *ctrl_info)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 624/1518 RDMA/mlx5: Fix stack out-of-bounds read in cc_params debugfs
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leon Romanovsky <[email protected]>
[ Upstream commit 03826bc1fa6c90405bf05831f2b501a8368dcd27 ]
get_param() reads a congestion parameter as a u32 but formats it with the signed "%d" into an 11-byte stack buffer. A value with bit 31 set, such as 0x80000000, renders as "-2147483648\n" whose full length is 12. snprintf() stores only 11 bytes yet returns 12, so simple_read_from_buffer() treats 12 bytes as valid and reads one byte past lbuf[].
Size the buffer for the widest unsigned decimal, format with "%u" to match the u32, and use scnprintf() so the length passed to simple_read_from_buffer() reflects the bytes actually stored.
--- drivers/infiniband/hw/mlx5/cong.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/infiniband/hw/mlx5/cong.c +2 -4
@@ -399,15 +399,13 @@ static ssize_t get_param(struct file *filp, char __user *buf, size_t count,int offset = param->offset;u32 var =0 ;int ret; -char lbuf[11 ]; +char lbuf[12 ]; ret =mlx5_ib_get_cc_params (param->dev, param->port_num, offset, &var);if (ret)return ret; - ret =snprintf (lbuf,sizeof (lbuf),"%d\n" , var); -if (ret <0 ) -return ret; + ret =scnprintf (lbuf,sizeof (lbuf),"%u\n" , var);return simple_read_from_buffer (buf, count, pos, lbuf, ret); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 625/1518 RDMA/mlx5: Send cong param changes to the resolved port mdev
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leon Romanovsky <[email protected]>
[ Upstream commit 033a79e308e4fe832b0924347eda8c4364055174 ]
mlx5_ib_set_cc_params() resolves the port-specific mlx5_core_dev via mlx5_ib_get_native_port_mdev() but issued MLX5_CMD_OP_MODIFY_CONG_PARAMS through dev->mdev. On an affiliated secondary RoCE port those pointers refer to different devices, so a write to the secondary port's cc_params debugfs file either altered the master port or failed with a master-side command error, while the read path already used the resolved mdev and returned the unchanged secondary value.
Issue the command to the resolved mdev, the same device whose capabilities were checked when its debugfs directory was created. It is already referenced by the get/put pair, so its lifetime is safe.
--- drivers/infiniband/hw/mlx5/cong.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/mlx5/cong.c +1 -1
@@ -361,7 +361,7 @@ static int mlx5_ib_set_cc_params(struct mlx5_ib_dev *dev, u32 port_num,MLX5_SET (field_select_r_roce_rp, field, field_select_r_roce_rp, attr_mask); - err =mlx5_cmd_exec_in (dev->mdev, modify_cong_params, in); + err =mlx5_cmd_exec_in (mdev, modify_cong_params, in);kvfree (in); alloc_err:mlx5_ib_put_native_port_mdev (dev, port_num +1 );
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 626/1518 RDMA/cxgb4: free STAG index when TPT entry write fails
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leon Romanovsky <[email protected]>
[ Upstream commit fdfb5cea4bf070cdb31d997efd87bb684df041fd ]
write_tpt_entry() allocates a new STAG index with c4iw_get_resource() and bumps stats.stag.cur before programming the entry. When write_adapter_mem() fails, it returns the error without releasing the index or reversing the statistic. No MR is inserted into rhp->mrs, so deregistration never reclaims it, leaking the index until device teardown.
Record whether this call allocated the index and, on a failed write, return it to tpt_table and decrement stats.stag.cur. Key the rollback on both the write error and that flag, not the error alone: a non-reset update carries a caller-owned STAG that this call did not allocate and must not free.
--- drivers/infiniband/hw/cxgb4/mem.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/infiniband/hw/cxgb4/mem.c +3 -1
@@ -277,6 +277,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,int err;struct fw_ri_tpte *tpt;u32 stag_idx; +bool stag_idx_allocated = false;static atomic_t key;if (c4iw_fatal_error (rdev))
@@ -299,6 +300,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,return -ENOMEM ; }mutex_lock (&rdev->stats.lock); + stag_idx_allocated = true; rdev->stats.stag.cur +=32 ;if (rdev->stats.stag.cur > rdev->stats.stag.max) rdev->stats.stag.max = rdev->stats.stag.cur;
@@ -333,7 +335,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry, (rdev->lldi.vr->stag.start >>5 ), sizeof(*tpt), tpt, skb, wr_waitp); -if (reset_tpt_entry) { +if (reset_tpt_entry || (err && stag_idx_allocated)) {c4iw_put_resource (&rdev->resource.tpt_table, stag_idx);mutex_lock (&rdev->stats.lock); rdev->stats.stag.cur -=32 ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 627/1518 media: staging/ipu7: fix async notifier leak on init error
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cong Nguyen <[email protected]>
[ Upstream commit 11ccf31a657f9f95260a22848b7d324d3c6cf113 ]
isys_notifier_init() initialises a v4l2 async notifier and then, for each CSI-2 port, adds a remote sensor subdev to the notifier's waiting_list via v4l2_async_nf_add_fwnode_remote(), which allocates a sensor_async_sd descriptor and takes a fwnode reference.
If parsing or adding a later port fails, the code jumps to the "err_parse" label, which only drops the current endpoint fwnode reference and returns, without calling v4l2_async_nf_cleanup(). Any descriptors already added to the notifier for earlier ports are therefore leaked, and the caller's error path does not clean up the notifier either.
Call v4l2_async_nf_cleanup() on the error path, matching the cleanup already performed when v4l2_async_nf_register() fails. This is safe as the notifier is always initialised before the loop is entered.
--- drivers/staging/media/ipu7/ipu7-isys.c | 1 + 1 file changed, 1 insertion(+)
drivers/staging/media/ipu7/ipu7-isys.c +1 -0
@@ -233,6 +233,7 @@ static int isys_notifier_init(struct ipu7_isys *isys) err_parse:fwnode_handle_put (ep); +v4l2_async_nf_cleanup (&isys->notifier);return ret; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 628/1518 IB/isert: reject PDUs declaring more data than was received
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yehyeong Lee <[email protected]>
[ Upstream commit 957f92ea4022fb6af4618271615a2a21a7b5bef9 ]
isert_recv_done() hands each received PDU to the opcode handlers without ever looking at wc->byte_len, the number of bytes the HCA actually placed in the receive descriptor. The handlers then copy that many bytes - the data-segment length the initiator declared in the BHS (ntoh24(hdr->dlength), via the derived unsol_data_len / imm_data_len) - out of the fixed-size descriptor:
isert_handle_iscsi_dataout():
sg_copy_from_buffer(sg_start, sg_nents, isert_get_data(rx_desc),
unsol_data_len);
isert_handle_scsi_cmd():
sg_copy_from_buffer(cmd->se_cmd.t_data_sg, sg_nents,
isert_get_data(rx_desc), imm_data_len);Because the declared length is never checked against wc->byte_len, an initiator can declare a data segment larger than the bytes it actually sent (and larger than the descriptor) and cause an out-of-bounds read of the receive buffer.
Nothing upstream of isert closes this door:
- __iscsit_check_dataout_hdr() bounds the inbound payload against conn_ops->MaxXmitDataSegmentLength (MXDSL) - a transmit parameter, used here for the inbound check.
- iscsi_set_connection_parameters() sets ops->MaxXmitDataSegmentLength = ops->TargetRecvDataSegmentLength; and TARGETRECVDATASEGMENTLENGTH is absent from the min()-clamp list in iscsi_check_acceptor_state(), so the value the initiator declares is adopted verbatim (type range 512..16777215). The initiator effectively raises its own ceiling.
- isert never clamps the negotiated value to its own fixed receive descriptor (ISER_RX_SIZE, 9216 bytes), so the target core's bound and the descriptor size are unrelated.
The imm_data_len == data_len path is more than an over-read: it aliases the receive descriptor via sg_set_buf() and passes it to the backend as the data source for the SCSI WRITE, so an over-declared length causes heap contents past the descriptor to be written through the backend to the backing store. The backend is the victim of the oversized scatterlist isert hands it, not the cause; no read-back of the written bytes was demonstrated.
Trigger: after login completes (full feature phase), an initiator that has declared a large TargetRecvDataSegmentLength and a FirstBurstLength that permits unsolicited/immediate data sends a PDU whose declared data-segment length exceeds what was received. With KASAN:
BUG: KASAN: slab-out-of-bounds in sg_copy_buffer+0x150/0x1c0 Read of size 4096 at addr ffff888109720800 by task kworker/1:0H/25 Workqueue: ib-comp-wq ib_cq_poll_work Call Trace: sg_copy_buffer+0x150/0x1c0 isert_recv_done+0xba6/0x2390 __ib_process_cq+0xe1/0x390 ib_cq_poll_work+0x46/0x150
isert_recv_done+0xba6 resolves to isert_handle_iscsi_dataout() (ib_isert.c:1160), inlined through isert_rx_opcode().
Validate wc->byte_len against the framing in isert_recv_done() before the PDU reaches any handler, and reinstate the connection if it is short. Because the test compares without subtracting the header length, it also rejects PDUs shorter than the iSER and iSCSI headers, which would otherwise be parsed out of stale descriptor contents. The login handler rejects PDUs shorter than ISER_HEADERS_LEN (commit 29e7b925ae6d ("IB/isert: Reject login PDUs shorter than ISER_HEADERS_LEN")) but does not bound the declared length either; that is fixed in the next patch. The data handlers had no length check at all.
isert reads the data segment from a fixed offset: isert_get_data() returns the iSER header plus ISER_HEADERS_LEN and makes no adjustment for an AHS. The bytes the handlers touch are therefore exactly [ISER_HEADERS_LEN, ISER_HEADERS_LEN + dlength), and comparing that sum against wc->byte_len bounds precisely the region that is read. An AHS term would only make the test stricter without bounding anything further, and cannot cause a false reject: a PDU carrying an AHS is longer, not shorter.
This is a memory-safety fix that verifies the bytes that were actually received; it does not touch RFC 7145 length negotiation and is not the MaxXmitDataSegmentLength negotiation redesign raised in the 2017 "[Query]
iSER-Target: QP errors observed on increasing MaxXmitDataSegmentLength" discussion. That redesign is explicitly out of scope here.
The patched kernel rejects the malformed DataOut PDU and both immediate-data variants with "PDU declares ... bytes were received" and continues to pass normal traffic with no regression.
Reproduced with soft-RoCE (rdma_rxe) and a raw rdma_cm/ibv initiator; no kernel-side test hooks were needed.
--- drivers/infiniband/ulp/isert/ib_isert.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/infiniband/ulp/isert/ib_isert.c +15 -0
@@ -1335,6 +1335,21 @@ isert_recv_done(struct ib_cq *cq, struct ib_wc *wc)ib_dma_sync_single_for_cpu (ib_dev, rx_desc->dma_addr,ISER_RX_SIZE ,DMA_FROM_DEVICE ); +/* +* The data segment length declared in the BHS is attacker controlled +* and is used further down to read that many bytes out of the fixed +* size receive descriptor, so it has to be checked against the number +* of bytes that were actually received. Comparing without subtracting +* also rejects PDUs shorter than the iSER and iSCSI headers, which +* would otherwise be parsed out of stale descriptor contents. +*/ +if (unlikely (wc->byte_len <ISER_HEADERS_LEN +ntoh24 (hdr->dlength))) { +isert_err ("PDU declares %u data bytes but only %u bytes were received\n" , +ntoh24 (hdr->dlength), wc->byte_len); +iscsit_cause_connection_reinstatement (isert_conn->conn,0 ); +return ; + } +isert_dbg ("DMA: 0x%llx, iSCSI opcode: 0x%02x, ITT: 0x%08x, flags: 0x%02x dlen: %d\n" , rx_desc->dma_addr, hdr->opcode, hdr->itt, hdr->flags, (int )(wc->byte_len -ISER_HEADERS_LEN ));
Signature · 1 line
2.53.0