6.12.97-rc1 review
Subsystems (12)
Greg Kroah-Hartman
maintainerPATCH 261/1276 riscv: stacktrace: Remove bogus -0x4 offset in non-FP walk_stackframe
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rui Qi <[email protected]>
[ Upstream commit 8ac35bac70e7e581d673b76878f7691cdadc33b8 ]
In the non-frame-pointer version of walk_stackframe, each value read from the stack is treated as a potential return address and has 0x4 subtracted before being used as the program counter. This was intended to convert the return address (the instruction after a call) back to the call site, but it is incorrect:
1. RISC-V has variable-length instructions due to the RVC (compressed instruction) extension. A call instruction can be either 4 bytes (regular) or 2 bytes (compressed, e.g. c.jal). Subtracting a fixed 0x4 assumes all call instructions are 4 bytes, which is wrong for compressed instructions.
2. Stack traces conventionally report return addresses, not call sites. Other architectures (ARM64, x86, ARM) do not subtract instruction size from return addresses in their stack unwinding code.
3. The frame-pointer version of walk_stackframe already dropped the -0x4 offset. Commit b785ec129bd9 ("riscv/ftrace: Add HAVE_FUNCTION_GRAPH_RET_ADDR_PTR support") replaced "pc = frame->ra - 0x4" with ftrace_graph_ret_addr(), and the commit message explicitly noted that "the original calculation, pc = frame->ra - 4, is buggy when the instruction at the return address happened to be a compressed inst." The non-FP version was simply overlooked.
Remove the bogus -0x4 offset to match the FP version and the conventions used by other architectures.
--- arch/riscv/kernel/stacktrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/riscv/kernel/stacktrace.c +1 -1
@@ -129,7 +129,7 @@ void notrace walk_stackframe(struct task_struct *task,while (!kstack_end (ksp)) {if (__kernel_text_address (pc) &&unlikely (!fn (arg, pc)))break ; - pc =READ_ONCE_NOCHECK (*ksp++) -0x4 ; + pc =READ_ONCE_NOCHECK (*ksp++); } }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 262/1276 ALSA: seq: Clear variable event pointer on read
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kyle Zeng <[email protected]>
[ Upstream commit 705dd6dcbc0ea87351c660c1a6443f85f1001c76 ]
snd_seq_read() copies a queued variable-length event header to userspace before expanding the payload. Queued variable-length events use SNDRV_SEQ_EXT_CHAINED internally, and data.ext.ptr points at the first extension cell.
The read side strips SNDRV_SEQ_EXT_* bits from data.ext.len before the copy, but it leaves data.ext.ptr untouched. A userspace sequencer client can therefore write a direct variable event to itself and read back the extension-cell kernel address from the returned header.
Clear the temporary header pointer before copy_to_user(). The original queued event remains unchanged and is still passed to snd_seq_expand_var_event(), so payload expansion keeps using the internal chain.
--- sound/core/seq/seq_clientmgr.c | 1 + 1 file changed, 1 insertion(+)
sound/core/seq/seq_clientmgr.c +1 -0
@@ -488,6 +488,7 @@ static ssize_t snd_seq_read(struct file *file, char __user *buf, size_t count,memcpy (&tmpev, &cell->event, aligned_size); tmpev.data.ext.len &= ~SNDRV_SEQ_EXT_MASK ; + tmpev.data.ext.ptr =NULL ;if (copy_to_user (buf, &tmpev, aligned_size)) { err = -EFAULT ;break ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 263/1276 ACPI: IPMI: Fix message kref handling on dead device
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yuho Choi <[email protected]>
[ Upstream commit 63320db6a5d84ec3fed8b3d36ba5244d07ddd108 ]
acpi_ipmi_space_handler() takes an extra reference on tx_msg before checking whether the selected IPMI device is dead. The reference belongs to the tx_msg_list entry and is normally dropped by ipmi_cancel_tx_msg() or ipmi_flush_tx_msg() after the message is removed from the list.
On the dead-device path, the message has not been queued yet, but the error path still calls ipmi_msg_release() directly. That bypasses kref_put() and frees tx_msg while the queued-message reference is still recorded in the kref count.
Take the queued-message reference only after the dead-device check succeeds, immediately before adding tx_msg to the list.
--- drivers/acpi/acpi_ipmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/acpi/acpi_ipmi.c +1 -1
@@ -550,7 +550,6 @@ acpi_ipmi_space_handler(u32 function, acpi_physical_address address,return AE_TYPE ; } -acpi_ipmi_msg_get (tx_msg);mutex_lock (&driver_data.ipmi_lock);/* Do not add a tx_msg that can not be flushed. */ if (ipmi_device->dead) {
@@ -558,6 +557,7 @@ acpi_ipmi_space_handler(u32 function, acpi_physical_address address,ipmi_msg_release (tx_msg);return AE_NOT_EXIST ; } +acpi_ipmi_msg_get (tx_msg);spin_lock_irqsave (&ipmi_device->tx_msg_lock, flags);list_add_tail (&tx_msg->head, &ipmi_device->tx_msg_list);spin_unlock_irqrestore (&ipmi_device->tx_msg_lock, flags);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 264/1276 cpufreq: Documentation: fix conservative governor freq_step description
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pengjie Zhang <[email protected]>
[ Upstream commit 03120e1425262c7d11f93362a88e579a1720390b ]
The conservative governor documentation incorrectly states that setting freq_step to 0 will use the default 5% frequency step. In reality, since at least commit 8e677ce83bf4 ("[CPUFREQ] conservative: fixup governor to function more like ondemand logic"), freq_step=0 has always caused the governor to skip frequency updates entirely.
Correct the documentation to reflect the actual behavior: freq_step=0 disables frequency changes by the governor entirely.
--- Documentation/admin-guide/pm/cpufreq.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Documentation/admin-guide/pm/cpufreq.rst +2 -2
@@ -573,8 +573,8 @@ This governor exposes the following tunables: 100 (5 by default). This is how much the frequency is allowed to change in one go. Setting - it to 0 will cause the default frequency step (5 percent) to be used - and setting it to 100 effectively causes the governor to periodically + it to 0 disables frequency changes by the governor entirely and setting + it to 100 effectively causes the governor to periodically switch the frequency between the ``scaling_min_freq`` and ``scaling_max_freq`` policy limits.
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 265/1276 thermal: testing: reject missing command arguments
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Samuel Moelius <[email protected]>
[ Upstream commit ef3e98b0aa4b348f44065d7130251273c83bd204 ]
The thermal testing debugfs command parser splits commands at ':' and passes the right-hand side to the command implementation. Commands such as deltz, tzaddtrip, tzreg, and tzunreg require a zone id, but writing one of those command names without ':' leaves the argument pointer NULL.
The command implementations parse the id with sscanf(arg, "%d", ...), so the missing-argument form dereferences a NULL pointer from the debugfs write path.
Reject missing arguments in tt_command_exec() before calling handlers that require an id.
--- drivers/thermal/testing/command.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/thermal/testing/command.c +12 -0
@@ -116,18 +116,30 @@ static int tt_command_exec(int index, const char *arg)break ;case TT_CMD_DELTZ : +if (!arg || !*arg) +return -EINVAL ; + ret =tt_del_tz (arg);break ;case TT_CMD_TZADDTRIP : +if (!arg || !*arg) +return -EINVAL ; + ret =tt_zone_add_trip (arg);break ;case TT_CMD_TZREG : +if (!arg || !*arg) +return -EINVAL ; + ret =tt_zone_reg (arg);break ;case TT_CMD_TZUNREG : +if (!arg || !*arg) +return -EINVAL ; + ret =tt_zone_unreg (arg);break ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 266/1276 IB/mlx5: Dont take the rereg_mr fallback without a new translation
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason Gunthorpe <[email protected]>
[ Upstream commit 55d339d200c908de83a408d023cfb7be779b0dd7 ]
Jumping to mlx5_ib_reg_user_mr() without IB_MR_REREG_TRANS set will use garbage values for start, length, and iova. Recovering the original mr parameters for ODP and DMABUF to properly recreate it is too hard in this flow, so just fail it.
--- drivers/infiniband/hw/mlx5/mr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/mlx5/mr.c +1 -1
@@ -1852,7 +1852,7 @@ struct ib_mr *mlx5_ib_rereg_user_mr(struct ib_mr *ib_mr, int flags, u64 start, }/* DM or ODP MR's don't have a normal umem so we can't re-use it */ if (!mr->umem ||is_odp_mr (mr) ||is_dmabuf_mr (mr)) - goto recreate; +return ERR_PTR (-EOPNOTSUPP );/* * Only one active MR can refer to a umem at one time, revoke
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 267/1276 IB/mlx5: Properly support implicit ODP rereg_mr
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason Gunthorpe <[email protected]>
[ Upstream commit ee7a8335069150c3f1893a697ab30bbeca00d796 ]
Due to all the child mkeys in the implicit ODP configuration we cannot change anything in place for the parent mkey. Instead the whole thing needs to be rebuilt if any change is requested. If the user does not specify a translation then force the implicit values which will then fall through the logic into mlx5_ib_reg_user_mr() to allocate a completely new MR.
Since implicit children were also touching the mr->pd, this removes another case where the access was racy.
--- drivers/infiniband/hw/mlx5/mr.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/infiniband/hw/mlx5/mr.c +15 -0
@@ -1838,6 +1838,21 @@ struct ib_mr *mlx5_ib_rereg_user_mr(struct ib_mr *ib_mr, int flags, u64 start,if (!(flags &IB_MR_REREG_PD )) new_pd = ib_mr->pd; +if (mr->is_odp_implicit && !(flags &IB_MR_REREG_TRANS )) { +if (!(new_access_flags &IB_ACCESS_ON_DEMAND )) +return ERR_PTR (-EOPNOTSUPP ); + +/* +* Due to all the child mkeys we cannot actually change an +* implicit MR in place. If the user did not specify a new +* translation then force the fixed implicit MR values. +*/ + start =0 ; + iova =0 ; + length =U64_MAX ; + flags |=IB_MR_REREG_TRANS ; + } +if (!(flags &IB_MR_REREG_TRANS )) {struct ib_umem *umem;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 268/1276 spi: ep93xx: fix double-free of zeropage on DMA setup failure
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Felix Gu <[email protected]>
[ Upstream commit 7886054b06f762f62054957a8f6de0f14e6b7541 ]
If DMA setup fails after allocating the zeropage, the error path frees the page but leaves espi->zeropage dangling. A subsequent call to ep93xx_spi_release_dma() sees the non-NULL pointer and frees the page again.
Clear the pointer after freeing in the error path of ep93xx_spi_setup_dma().
--- drivers/spi/spi-ep93xx.c | 1 + 1 file changed, 1 insertion(+)
drivers/spi/spi-ep93xx.c +1 -0
@@ -600,6 +600,7 @@ static int ep93xx_spi_setup_dma(struct device *dev, struct ep93xx_spi *espi) espi->dma_rx =NULL ; fail_free_page:free_page ((unsigned long )espi->zeropage); + espi->zeropage =NULL ;return ret; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 269/1276 ASoC: amd: acp-sdw-sof: Bound DAI link iteration
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aaron Ma <[email protected]>
[ Upstream commit 4d992e63f52d58f52b724606c60ae7b37a1c582f ]
create_sdw_dailinks() walks sof_dais until it finds an entry with initialised cleared, but sof_dais is allocated with exactly num_ends entries. If all entries are initialised, the loop reads past the end of the array.
Pass the allocated entry count to create_sdw_dailinks() and stop before reading past the array.
--- sound/soc/amd/acp/acp-sdw-sof-mach.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
sound/soc/amd/acp/acp-sdw-sof-mach.c +4 -3
@@ -260,13 +260,14 @@ static int create_sdw_dailink(struct snd_soc_card *card,static int create_sdw_dailinks (struct snd_soc_card *card,struct snd_soc_dai_link **dai_links,int *be_id, -struct asoc_sdw_dailink *sof_dais, +struct asoc_sdw_dailink *sof_dais,int num_dais,struct snd_soc_codec_conf **codec_conf) { +int i;int ret;/* generate DAI links by each sdw link */ -while (sof_dais->initialised) { +for (i =0 ; i < num_dais && sof_dais->initialised; i++) {int current_be_id =0 ; ret = create_sdw_dailink(card, sof_dais, dai_links,
@@ -373,7 +374,7 @@ static int sof_card_dai_links_create(struct snd_soc_card *card)/* SDW */ if (sdw_be_num) { ret =create_sdw_dailinks (card, &dai_links, &be_id, - sof_dais, &codec_conf); + sof_dais, num_ends, &codec_conf);if (ret) goto err_end; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 270/1276 firmware_loader: Fix recursive lock in device_cache_fw_images()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Vyukov <[email protected]>
[ Upstream commit d3ec78f8f8d48a04a9fac38d47275c34645e5103 ]
A recursive locking deadlock can occur in the firmware loader's power management notification handler.
During system suspend or hibernation preparation, fw_pm_notify() calls device_cache_fw_images(). This function acquires fw_lock to set the firmware cache state to FW_LOADER_START_CACHE and then iterates over all devices using dpm_for_each_dev() while still holding the lock.
For each device, dev_cache_fw_image() schedules asynchronous work to cache the firmware. If memory allocation for the async work entry fails (e.g., in out-of-memory conditions), async_schedule_node_domain() falls back to executing the work function synchronously in the current thread.
The synchronous execution path (__async_dev_cache_fw_image() -> cache_firmware() -> request_firmware() -> assign_fw()) attempts to acquire fw_lock again. Since the current thread already holds fw_lock, this results in a recursive locking deadlock.
Fix this by releasing fw_lock immediately after updating the cache state and before calling dpm_for_each_dev(). The lock is only needed to protect the state update. Concurrent firmware requests will correctly see the FW_LOADER_START_CACHE state and use the piggyback mechanism, which is independently protected by its own fwc->name_lock.
--- drivers/base/firmware_loader/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/base/firmware_loader/main.c +2 -1
@@ -1547,9 +1547,10 @@ static void device_cache_fw_images(void)mutex_lock (&fw_lock); fwc->state =FW_LOADER_START_CACHE ; -dpm_for_each_dev (NULL , dev_cache_fw_image);mutex_unlock (&fw_lock); +dpm_for_each_dev (NULL , dev_cache_fw_image); +/* wait for completion of caching firmware for all devices */ async_synchronize_full_domain (&fw_cache_domain);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 271/1276 configfs: fix lockless traversals of ->s_children
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Al Viro <[email protected]>
[ Upstream commit 9b9e8bb81c41fd27e7b57a1c936fde140548535f ]
Having the parent directory locked protects entries from removal by another thread, but it does *not* protect cursors from being moved around by lseek() - or freed, for that matter.
--- fs/configfs/dir.c | 54 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 41 insertions(+), 13 deletions(-)
fs/configfs/dir.c +41 -13
@@ -225,15 +225,16 @@ static int configfs_dirent_exists(struct configfs_dirent *parent_sd, {struct configfs_dirent * sd; +spin_lock (&configfs_dirent_lock);list_for_each_entry (sd, &parent_sd->s_children, s_sibling) {if (sd->s_element) { -const unsigned char *existing =configfs_get_name (sd); -if (strcmp (existing, new)) -continue ; -else +if (strcmp (configfs_get_name (sd), new) ==0 ) { +spin_unlock (&configfs_dirent_lock);return -EEXIST ; + } } } +spin_unlock (&configfs_dirent_lock);return 0 ; }
@@ -551,11 +552,28 @@ static void configfs_detach_rollback(struct dentry *dentry)configfs_detach_rollback (sd->s_dentry); } +/* +* Find the next non-cursor. configfs_dirent_lock held by caller. +*/ +static struct configfs_dirent *next_dirent (struct configfs_dirent *parent, +struct configfs_dirent *last) +{ +struct configfs_dirent *s; + + s =list_prepare_entry (last, &parent->s_children, s_sibling); + +list_for_each_entry_continue (s, &parent->s_children, s_sibling) { +if (s->s_element) +return s; + } +return NULL ; +} +static void detach_attrs (struct config_item * item) {struct dentry * dentry =dget (item->ci_dentry); -struct configfs_dirent * parent_sd; -struct configfs_dirent * sd, * tmp; +struct configfs_dirent *parent_sd; +struct configfs_dirent *sd, *next;if (!dentry)return ;
@@ -564,15 +582,19 @@ static void detach_attrs(struct config_item * item) dentry->d_name.name); parent_sd = dentry->d_fsdata; -list_for_each_entry_safe (sd, tmp, &parent_sd->s_children, s_sibling) { -if (!sd->s_element || !(sd->s_type &CONFIGFS_NOT_PINNED )) + +spin_lock (&configfs_dirent_lock); +for (sd =next_dirent (parent_sd,NULL ); sd; sd = next) { + next =next_dirent (parent_sd, sd); +if (!(sd->s_type &CONFIGFS_NOT_PINNED ))continue ; -spin_lock (&configfs_dirent_lock);list_del_init (&sd->s_sibling);spin_unlock (&configfs_dirent_lock);configfs_drop_dentry (sd, dentry);configfs_put (sd); +spin_lock (&configfs_dirent_lock); } +spin_unlock (&configfs_dirent_lock);/** * Drop reference from dget() on entrance.
@@ -631,18 +653,20 @@ static void detach_groups(struct config_group *group)struct dentry * dentry =dget (group->cg_item.ci_dentry);struct dentry *child;struct configfs_dirent *parent_sd; -struct configfs_dirent *sd, *tmp; +struct configfs_dirent *sd, *next;if (!dentry)return ; parent_sd = dentry->d_fsdata; -list_for_each_entry_safe (sd, tmp, &parent_sd->s_children, s_sibling) { -if (!sd->s_element || - !(sd->s_type &CONFIGFS_USET_DEFAULT )) +spin_lock (&configfs_dirent_lock); +for (sd =next_dirent (parent_sd,NULL ); sd; sd = next) { + next =next_dirent (parent_sd, sd); +if (!(sd->s_type &CONFIGFS_USET_DEFAULT ))continue ; child = sd->s_dentry; +spin_unlock (&configfs_dirent_lock);inode_lock (d_inode (child));
@@ -654,7 +678,9 @@ static void detach_groups(struct config_group *group)d_delete (child);dput (child); +spin_lock (&configfs_dirent_lock); } +spin_unlock (&configfs_dirent_lock);/** * Drop reference from dget() on entrance.
@@ -1106,6 +1132,7 @@ configfs_find_subsys_dentry(struct configfs_dirent *root_sd,struct configfs_dirent *p;struct configfs_dirent *ret =NULL ; +spin_lock (&configfs_dirent_lock);list_for_each_entry (p, &root_sd->s_children, s_sibling) {if (p->s_type &CONFIGFS_DIR && p->s_element == subsys_item) {
@@ -1113,6 +1140,7 @@ configfs_find_subsys_dentry(struct configfs_dirent *root_sd,break ; } } +spin_unlock (&configfs_dirent_lock);return ret; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 272/1276 watchdog: unregister PM notifier on watchdog unregister
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yuho Choi <[email protected]>
[ Upstream commit a298c7302ee9584a7a1ac1e8acbede8d98ab51a4 ]
watchdog_register_device() registers wdd->pm_nb when WDOG_NO_PING_ON_SUSPEND is set, but watchdog_unregister_device() does not remove it. This leaves an embedded notifier block on the PM notifier chain after the watchdog device has been unregistered.
A later suspend/resume notification can then call watchdog_pm_notifier() with a stale watchdog_device pointer, or at minimum after wdd->wd_data has been cleared by watchdog_dev_unregister().
Unregister the PM notifier before tearing down the watchdog device.
--- drivers/watchdog/watchdog_core.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/watchdog/watchdog_core.c +3 -0
@@ -382,6 +382,9 @@ static void __watchdog_unregister_device(struct watchdog_device *wdd)if (test_bit (WDOG_STOP_ON_REBOOT , &wdd->status))unregister_reboot_notifier (&wdd->reboot_nb); +if (test_bit (WDOG_NO_PING_ON_SUSPEND , &wdd->status)) +unregister_pm_notifier (&wdd->pm_nb); +watchdog_dev_unregister (wdd);ida_free (&watchdog_ida, wdd->id); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 273/1276 scsi: target: Fix hexadecimal CHAP_I handling
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Disseldorp <[email protected]>
[ Upstream commit 7e161211f1dd5288b4ea802b30e70ef919ebc3da ]
A mutual CHAP handshake requires target processing of an initiator-sent CHAP_I identifier. The RFC 3720 specification states:
11.1.4. Challenge Handshake Authentication Protocol (CHAP)
...
CHAP_A=<A> CHAP_I=<I> CHAP_C=<C>
...
Where N, (A,A1,A2), I, C, and R are (correspondingly) the Name, Algorithm, Identifier, Challenge, and Response as defined in [RFC1994], N is a text string, A,A1,A2, and I are numbers
CHAP_I parsing currently calls extract_param(), which returns the @identifier string (stripped of any 0b/0B or 0x/0X prefix) and a @type which indicates DECIMAL, HEX, or BASE64 encoding (based on any stripped prefix).
Any HEX encoded CHAP_I string is further processed via:
ret = kstrtoul(&identifier[2], 0, &id);
This is incorrect for two reasons:
* The @identifier string has already been stripped of the 0x/0X prefix, so skipping the first two bytes omits part of the number.
* The kstrtoul() call specifies a base of 0, which will see &identifier[2] parsed as a decimal, unless a '0x' or (octal) '0' is erroneously present at that offset.
Fix this by passing the (zero-offset) identifier string to kstrtoul() along with a base=16 parameter. Also add an explicit error handler for BASE64 encoding.
Hex-encoded CHAP_I handling can be testing using the libiscsi EncodedI test linked below.
--- drivers/target/iscsi/iscsi_target_auth.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/target/iscsi/iscsi_target_auth.c +4 -2
@@ -437,9 +437,11 @@ static int chap_server_compute_hash( }if (type ==HEX ) - ret =kstrtoul (&identifier[2 ],0 , &id); + ret =kstrtoul (identifier,16 , &id); +else if (type ==DECIMAL ) + ret =kstrtoul (identifier,10 , &id);else - ret =kstrtoul (identifier,0 , &id); + ret = -EINVAL ;if (ret <0 ) {pr_err ("kstrtoul() failed for CHAP identifier: %d\n" , ret);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 274/1276 scsi: target: Remove tcm_loop target reset handling
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mike Christie <[email protected]>
[ Upstream commit 7c08d430835a90414cd962e3a9602e5b002dee3b ]
tcm_loop_target_reset is supposed to handle all the LUNs on a target but it's only doing a TMR_LUN_RESET so only that one LUN is handled. This will cause us to return early while IOs to other LUNs are still hung in lower layers. This just removes the target reset handler for the driver because LIO doesn't support target resets and for the common case where this is run from the scsi-ml error hamdler we have already tried an abort and lun reset so waiting again is most likely useless.
--- drivers/target/loopback/tcm_loop.c | 64 ------------------------------ 1 file changed, 64 deletions(-)
drivers/target/loopback/tcm_loop.c +0 -64
@@ -268,69 +268,6 @@ static int tcm_loop_device_reset(struct scsi_cmnd *sc)return (ret ==TMR_FUNCTION_COMPLETE ) ?SUCCESS :FAILED ; } -static bool tcm_loop_flush_work_iter (struct request *rq,void *data) -{ -struct scsi_cmnd *sc =blk_mq_rq_to_pdu (rq); -struct tcm_loop_cmd *tl_cmd =scsi_cmd_priv (sc); -struct se_cmd *se_cmd = &tl_cmd->tl_se_cmd; - -flush_work (&se_cmd->work); -return true; -} - -static int tcm_loop_target_reset (struct scsi_cmnd *sc) -{ -struct tcm_loop_hba *tl_hba; -struct tcm_loop_tpg *tl_tpg; -struct Scsi_Host *sh = sc->device->host; -int ret; - -/* -* Locate the tcm_loop_hba_t pointer -*/ - tl_hba = *(struct tcm_loop_hba **)shost_priv (sh); -if (!tl_hba) { -pr_err ("Unable to perform device reset without active I_T Nexus\n" ); -return FAILED ; - } -/* -* Locate the tl_tpg pointer from TargetID in sc->device->id -*/ - tl_tpg = &tl_hba->tl_hba_tpgs[sc->device->id]; -if (!tl_tpg) -return FAILED ; - -/* -* Issue a LUN_RESET to drain all commands that the target core -* knows about. This handles commands not yet marked CMD_T_COMPLETE. -*/ - ret =tcm_loop_issue_tmr (tl_tpg, sc->device->lun,0 ,TMR_LUN_RESET ); -if (ret !=TMR_FUNCTION_COMPLETE ) -return FAILED ; - -/* -* Flush any deferred target core completion work that may still be -* queued. Commands that already had CMD_T_COMPLETE set before the TMR -* are skipped by the TMR drain, but their async completion work -* (transport_lun_remove_cmd → percpu_ref_put, release_cmd → scsi_done) -* may still be pending in target_completion_wq. -* -* The SCSI EH will reuse in-flight scsi_cmnd structures for recovery -* commands (e.g. TUR) immediately after this handler returns SUCCESS — -* if deferred work is still pending, the memset in queuecommand would -* zero the se_cmd while the work accesses it, leaking the LUN -* percpu_ref and hanging configfs unlink forever. -* -* Use blk_mq_tagset_busy_iter() to find all started requests and -* flush_work() on each — the same pattern used by mpi3mr, scsi_debug, -* and other SCSI drivers to drain outstanding commands during reset. -*/ -blk_mq_tagset_busy_iter (&sh->tag_set, tcm_loop_flush_work_iter,NULL ); - - tl_tpg->tl_transport_status =TCM_TRANSPORT_ONLINE ; -return SUCCESS ; -} -static const struct scsi_host_template tcm_loop_driver_template = { .show_info = tcm_loop_show_info, .proc_name ="tcm_loopback" ,
@@ -339,7 +276,6 @@ static const struct scsi_host_template tcm_loop_driver_template = { .change_queue_depth = scsi_change_queue_depth, .eh_abort_handler = tcm_loop_abort_task, .eh_device_reset_handler = tcm_loop_device_reset, - .eh_target_reset_handler = tcm_loop_target_reset, .this_id = -1, .sg_tablesize = 256, .max_sectors = 0xFFFF,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 275/1276 pinctrl: mediatek: mt8516: Fix Schmitt trigger register offset of pins 34-39
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luca Leonardo Scorcia <[email protected]>
[ Upstream commit 1c3044cab23a056ea28da47da1cdd667a39df0b8 ]
The correct Schmitt trigger register offset for pins 34-39 is 0xA00.
--- drivers/pinctrl/mediatek/pinctrl-mt8516.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/mediatek/pinctrl-mt8516.c +1 -1
@@ -244,7 +244,7 @@ static const struct mtk_pin_ies_smt_set mt8516_smt_set[] = {MTK_PIN_IES_SMT_SPEC (24 ,25 ,0xA00 ,12 ),MTK_PIN_IES_SMT_SPEC (26 ,30 ,0xA00 ,0 ),MTK_PIN_IES_SMT_SPEC (31 ,33 ,0xA00 ,1 ), -MTK_PIN_IES_SMT_SPEC (34 ,39 ,0xA900 ,2 ), +MTK_PIN_IES_SMT_SPEC (34 ,39 ,0xA00 ,2 ),MTK_PIN_IES_SMT_SPEC (40 ,40 ,0xA10 ,11 ),MTK_PIN_IES_SMT_SPEC (41 ,43 ,0xA00 ,10 ), MTK_PIN_IES_SMT_SPEC(44, 47, 0xA00, 11),
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 276/1276 pinctrl: mediatek: mt8167: Fix Schmitt trigger register offset of pins 34-39
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luca Leonardo Scorcia <[email protected]>
[ Upstream commit 439bc91d20188901dac698bed4921caac76d9074 ]
The correct Schmitt trigger register offset for pins 34-39 is 0xA00. Value was verified with SoC data sheet.
--- drivers/pinctrl/mediatek/pinctrl-mt8167.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/mediatek/pinctrl-mt8167.c +1 -1
@@ -244,7 +244,7 @@ static const struct mtk_pin_ies_smt_set mt8167_smt_set[] = {MTK_PIN_IES_SMT_SPEC (24 ,25 ,0xA00 ,12 ),MTK_PIN_IES_SMT_SPEC (26 ,30 ,0xA00 ,0 ),MTK_PIN_IES_SMT_SPEC (31 ,33 ,0xA00 ,1 ), -MTK_PIN_IES_SMT_SPEC (34 ,39 ,0xA900 ,2 ), +MTK_PIN_IES_SMT_SPEC (34 ,39 ,0xA00 ,2 ),MTK_PIN_IES_SMT_SPEC (40 ,40 ,0xA10 ,11 ),MTK_PIN_IES_SMT_SPEC (41 ,43 ,0xA00 ,10 ), MTK_PIN_IES_SMT_SPEC(44, 47, 0xA00, 11),
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 277/1276 vmalloc: fix NULL pointer dereference in is_vm_area_hugepages()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hui Zhu <[email protected]>
[ Upstream commit c55dd3b46c1208d6d2ea737a8aefef4aa4c70cb8 ]
find_vm_area() can return NULL if the given address is not a valid vmalloc area. Check the return value before dereferencing it to avoid a kernel crash.
--- include/linux/vmalloc.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
include/linux/vmalloc.h +3 -1
@@ -245,7 +245,9 @@ static inline bool is_vm_area_hugepages(const void *addr)* allocated in the vmalloc layer. */ #ifdef CONFIG_HAVE_ARCH_HUGE_VMALLOC -return find_vm_area (addr)->page_order >0 ; +struct vm_struct *area =find_vm_area (addr); + +return area && area->page_order >0 ;#else return false;#endif
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 278/1276 hwspinlock: qcom: avoid uninitialized struct members
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wolfram Sang <[email protected]>
[ Upstream commit 8752c396ce3b2136b3d4c906fe103f6efb6782d9 ]
The reg_field is allocated on stack, so using the REG_FIELD macro will ensure that unused members do not have uninitialized values.
--- drivers/hwspinlock/qcom_hwspinlock.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/hwspinlock/qcom_hwspinlock.c +1 -4
@@ -202,7 +202,6 @@ static struct regmap *qcom_hwspinlock_probe_mmio(struct platform_device *pdev,static int qcom_hwspinlock_probe (struct platform_device *pdev) {struct hwspinlock_device *bank; -struct reg_field field;struct regmap *regmap;size_t array_size;u32 stride;
@@ -224,9 +223,7 @@ static int qcom_hwspinlock_probe(struct platform_device *pdev)platform_set_drvdata (pdev, bank);for (i =0 ; i <QCOM_MUTEX_NUM_LOCKS ; i++) { - field.reg = base + i * stride; - field.lsb =0 ; - field.msb =31 ; +struct reg_field field =REG_FIELD (base + i * stride,0 ,31 ); bank->lock[i].priv =devm_regmap_field_alloc (&pdev->dev, regmap, field);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 279/1276 sched/fair: Fix cpu_util runnable_avg arithmetic
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hongyan Xia <[email protected]>
[ Upstream commit 29922fdfc2a4008d66418bedd0ebf5038fc54efa ]
If we take runnable_avg in max(runnable_avg, util_avg) in cpu_util(), we should then add or subtract task runnable_avg, but the arithmetic below is still with task util_avg. This mixes runnable_avg with util_avg which is incorrect.
Fix by always doing arithmetic with runnable_avg and only take max(runnable_avg, util_avg) at the last step.
--- kernel/sched/fair.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-)
kernel/sched/fair.c +15 -8
@@ -8101,25 +8101,32 @@ static int select_idle_sibling(struct task_struct *p, int prev, int target)static unsigned long cpu_util (int cpu,struct task_struct *p,int dst_cpu,int boost) { +bool add_task = p &&task_cpu (p) != cpu && dst_cpu == cpu; +bool sub_task = p &&task_cpu (p) == cpu && dst_cpu != cpu;struct cfs_rq *cfs_rq = &cpu_rq (cpu)->cfs;unsigned long util =READ_ONCE (cfs_rq->avg.util_avg);unsigned long runnable; -if (boost) { - runnable =READ_ONCE (cfs_rq->avg.runnable_avg); - util =max (util, runnable); - } -/* * If @dst_cpu is -1 or @p migrates from @cpu to @dst_cpu remove its * contribution. If @p migrates from another CPU to @cpu add its * contribution. In all the other cases @cpu is not impacted by the * migration so its util_avg is already correct. */ -if (p &&task_cpu (p) == cpu && dst_cpu != cpu) -lsub_positive (&util,task_util (p)); -else if (p &&task_cpu (p) != cpu && dst_cpu == cpu) +if (add_task) util +=task_util (p); +else if (sub_task) +lsub_positive (&util,task_util (p)); + +if (boost) { + runnable =READ_ONCE (cfs_rq->avg.runnable_avg); +if (add_task) + runnable +=READ_ONCE (p->se.avg.runnable_avg); +else if (sub_task) +lsub_positive (&runnable, +READ_ONCE (p->se.avg.runnable_avg)); + util =max (util, runnable); + }if (sched_feat (UTIL_EST )) {unsigned long util_est;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 280/1276 wifi: mt76: mt7925: clean up DMA on probe failure
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Myeonghun Pak <[email protected]>
[ Upstream commit 9629f31f505d74e76ac0d7a9492fd06c0316fc5d ]
mt7925_pci_probe() initializes DMA before registering the device. If mt7925_register_device() fails, probe returns through err_free_irq without tearing down DMA state.
That leaves the TX NAPI instance enabled and skips the DMA queue cleanup that the normal remove path performs through mt7925e_unregister_device(). Add a dedicated unwind label for failures after mt7925_dma_init() succeeds.
--- drivers/net/wireless/mediatek/mt76/mt7925/pci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7925/pci.c +3 -1
@@ -410,10 +410,12 @@ static int mt7925_pci_probe(struct pci_dev *pdev, ret =mt7925_register_device (dev);if (ret) - goto err_free_irq; + goto err_free_dma;return 0 ; +err_free_dma: +mt792x_dma_cleanup (dev); err_free_irq:devm_free_irq (&pdev->dev, pdev->irq, dev); err_free_dev:
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 281/1276 wifi: mt76: mt7925: fix stale pointer comparisons in change_vif_links
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Javier Tia <[email protected]>
[ Upstream commit 9f1accf3069a0cd42c14ca6c7d44d5b17cc48a80 ]
In the error path of mt7925_change_vif_links(), the free: label iterates over link_ids to clean up, but compares against mconf and mlink which hold stale values from the last loop iteration rather than the current link_id being freed.
Use array-indexed access (mconfs[link_id] / mlinks[link_id]) to compare against the correct per-link pointers.
--- drivers/net/wireless/mediatek/mt76/mt7925/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7925/main.c +2 -2
@@ -2063,9 +2063,9 @@ mt7925_change_vif_links(struct ieee80211_hw *hw, struct ieee80211_vif *vif,rcu_assign_pointer (mvif->link_conf[link_id],NULL );rcu_assign_pointer (mvif->sta.link[link_id],NULL ); -if (mconf != &mvif->bss_conf) +if (mconfs[link_id] != &mvif->bss_conf)devm_kfree (dev->mt76.dev, mconfs[link_id]); -if (mlink != &mvif->sta.deflink) +if (mlinks[link_id] != &mvif->sta.deflink)devm_kfree (dev->mt76.dev, mlinks[link_id]); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 282/1276 wifi: mt76: mt7925: keep TX BA state in the primary WCID
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Wang <[email protected]>
[ Upstream commit d3c854068bad22a25db6515f12784f64c663fed2 ]
For MLO, the same TID can run over different links. Keeping TX BA state in a link WCID makes the state depend on which link starts aggregation first.
Store it in the primary WCID instead, so the BA state stays stable across links.
--- drivers/net/wireless/mediatek/mt76/mt7925/mac.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7925/mac.c +7 -8
@@ -844,7 +844,6 @@ static void mt7925_tx_check_aggr(struct ieee80211_sta *sta, struct sk_buff *skb, {struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb);struct ieee80211_link_sta *link_sta; -struct mt792x_link_sta *mlink;struct mt792x_sta *msta;bool is_8023;u16 fc, tid;
@@ -883,14 +882,14 @@ static void mt7925_tx_check_aggr(struct ieee80211_sta *sta, struct sk_buff *skb, msta = (struct mt792x_sta *)sta->drv_priv; -if (sta->mlo && msta->deflink_id !=IEEE80211_LINK_UNSPECIFIED ) - mlink =rcu_dereference (msta->link[msta->deflink_id]); -else - mlink = &msta->deflink; - -if (!test_and_set_bit (tid, &mlink->wcid.ampdu_state)) { +/* Packets belonging to the same TID can be transmitted over multiple +* links. Keep the TX BA session state in the primary link so all links +* share the same AMPDU bookkeeping. +*/ +if (!test_and_set_bit (tid, &msta->deflink.wcid.ampdu_state)) {if (ieee80211_start_tx_ba_session (sta, tid,0 )) -clear_bit (tid, &mlink->wcid.ampdu_state); +clear_bit (tid, &msta->deflink.wcid.ampdu_state); + } }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 283/1276 wifi: mt76: mt792x: skip MLD header rewrite for 802.3 encap TX
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Wang <[email protected]>
[ Upstream commit a1152244702bb31b64650e5ca8308142286c0e4a ]
mt792x_tx() rewrites addr1/addr2/addr3 by treating skb->data as an 802.11 header for MLD traffic.
That is only valid for native 802.11 frames. Direct 802.3 TX can also reach this path with IEEE80211_TX_CTL_HW_80211_ENCAP set, where skb->data is not an 802.11 header.
Skip the MLD header rewrite for HW-encap packets to avoid corrupting 802.3 frame contents.
--- drivers/net/wireless/mediatek/mt76/mt792x_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt792x_core.c +2 -1
@@ -79,7 +79,8 @@ void mt792x_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control, wcid = &mvif->sta.deflink.wcid; } -if (vif && control->sta &&ieee80211_vif_is_mld (vif)) { +if (vif && control->sta &&ieee80211_vif_is_mld (vif) && + !(info->flags &IEEE80211_TX_CTL_HW_80211_ENCAP )) {struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;struct ieee80211_link_sta *link_sta;struct ieee80211_bss_conf *conf;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 284/1276 wifi: mt76: fix argument to ieee80211_is_first_frag()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bjoern A. Zeeb <[email protected]>
[ Upstream commit 5832743279da8c6ae72f715bad2f7141eca6f4b8 ]
ieee80211_is_first_frag() operates on the seq_ctrl not the frame_control header field. Pass the correct one in; otherwise the results may vary.
Sponsored by: The FreeBSD Foundation
--- drivers/net/wireless/mediatek/mt76/mac80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mac80211.c +1 -1
@@ -1188,7 +1188,7 @@ mt76_check_ccmp_pn(struct sk_buff *skb)* All further fragments will be validated by mac80211 only. */ if (ieee80211_is_frag (hdr) && - !ieee80211_is_first_frag (hdr->frame_control)) + !ieee80211_is_first_frag (hdr->seq_ctrl))return ; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 285/1276 wifi: mt76: mt7915: fix potential tx_retries underflow
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryder Lee <[email protected]>
[ Upstream commit 05e72b6167970043348bfbe8f72a3b67a38a9f1c ]
When FIELD_GET returns 0 for the retry count, subtracting 1 causes an unsigned integer underflow, resulting in tx_retries becoming a very large value (0xFFFFFFFF for u32).
Fix by checking if count is non-zero before subtracting 1.
--- drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +5 -5
@@ -923,16 +923,16 @@ mt7915_mac_tx_free(struct mt7915_dev *dev, void *data, int len) }if (!mtk_wed_device_active (&mdev->mmio.wed) && wcid) { -u32 tx_retries =0 , tx_failed =0 ; +u32 tx_retries =0 , tx_failed =0 , count;if (v3 && (info &MT_TX_FREE_MPDU_HEADER_V3 )) { - tx_retries = -FIELD_GET (MT_TX_FREE_COUNT_V3 , info) -1 ; + count =FIELD_GET (MT_TX_FREE_COUNT_V3 , info); + tx_retries = count ? count -1 :0 ; tx_failed = tx_retries + !!FIELD_GET (MT_TX_FREE_STAT_V3 , info); }else if (!v3 && (info &MT_TX_FREE_MPDU_HEADER )) { - tx_retries = -FIELD_GET (MT_TX_FREE_COUNT , info) -1 ; + count =FIELD_GET (MT_TX_FREE_COUNT , info); + tx_retries = count ? count -1 :0 ; tx_failed = tx_retries + !!FIELD_GET (MT_TX_FREE_STAT , info); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 286/1276 wifi: mt76: mt7921: fix potential tx_retries underflow
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryder Lee <[email protected]>
[ Upstream commit 3c5671ed81b1fff97fa868dae771690599db94f7 ]
When FIELD_GET returns 0 for the retry count, subtracting 1 causes an unsigned integer underflow, resulting in tx_retries becoming a very large value (0xFFFFFFFF for u32).
Fix by checking if count is non-zero before subtracting 1.
--- drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7921/mac.c +3 -2
@@ -541,8 +541,9 @@ static void mt7921_mac_tx_free(struct mt792x_dev *dev, void *data, int len) stat =FIELD_GET (MT_TX_FREE_STATUS , info);if (wcid) { - wcid->stats.tx_retries += -FIELD_GET (MT_TX_FREE_COUNT , info) -1 ; +u32 count =FIELD_GET (MT_TX_FREE_COUNT , info); + + wcid->stats.tx_retries += count ? count -1 :0 ; wcid->stats.tx_failed += !!stat; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 287/1276 wifi: mt76: mt7925: fix potential tx_retries underflow
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryder Lee <[email protected]>
[ Upstream commit 1e1fd84571e62a2961cea44c053340ec5c99b2cb ]
When FIELD_GET returns 0 for the retry count, subtracting 1 causes an unsigned integer underflow, resulting in tx_retries becoming a very large value (0xFFFFFFFF for u32).
Fix by checking if count is non-zero before subtracting 1.
--- drivers/net/wireless/mediatek/mt76/mt7925/mac.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7925/mac.c +3 -2
@@ -1150,8 +1150,9 @@ mt7925_mac_tx_free(struct mt792x_dev *dev, void *data, int len)if (info &MT_TXFREE_INFO_HEADER ) {if (wcid) { - wcid->stats.tx_retries += -FIELD_GET (MT_TXFREE_INFO_COUNT , info) -1 ; +u32 count =FIELD_GET (MT_TXFREE_INFO_COUNT , info); + + wcid->stats.tx_retries += count ? count -1 :0 ; wcid->stats.tx_failed += !!FIELD_GET (MT_TXFREE_INFO_STAT , info); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 288/1276 wifi: mt76: mt7996: fix potential tx_retries underflow
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryder Lee <[email protected]>
[ Upstream commit 4d8bba99d645bcb46a442b18eb42402610cba03a ]
When FIELD_GET returns 0 for the retry count, subtracting 1 causes an unsigned integer underflow, resulting in tx_retries becoming a very large value (0xFFFFFFFF for u32).
Fix by checking if count is non-zero before subtracting 1.
--- drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/mac.c +3 -3
@@ -1155,13 +1155,13 @@ mt7996_mac_tx_free(struct mt7996_dev *dev, void *data, int len)spin_unlock_bh (&mdev->sta_poll_lock);continue ; }else if (info &MT_TXFREE_INFO_HEADER ) { -u32 tx_retries =0 , tx_failed =0 ; +u32 tx_retries =0 , tx_failed =0 , count;if (!wcid)continue ; - tx_retries = -FIELD_GET (MT_TXFREE_INFO_COUNT , info) -1 ; + count =FIELD_GET (MT_TXFREE_INFO_COUNT , info); + tx_retries = count ? count -1 :0 ; tx_failed = tx_retries + !!FIELD_GET (MT_TXFREE_INFO_STAT , info);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 289/1276 btrfs: fix invalid pointer dereference in __btrfs_run_delayed_refs()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Filipe Manana <[email protected]>
[ Upstream commit 486f8298b6188ff11ef1f4be7f1d5d2e4d1b1fae ]
In the beginning of the loop, we try to obtain a locked delayed ref head, if 'locked_ref' is currently NULL, by calling btrfs_select_ref_head(), which can return an error pointer. If the error pointer is -EAGAIN we do a continue and go back to the beginning of the loop, which will not try again to call btrfs_select_ref_head() since 'locked_ref' is no longer NULL but it's ERR_PTR(-EAGAIN), and then we do:
spin_lock(&locked_ref->lock);
against a ERR_PTR(-EAGAIN) value, generating an invalid pointer dereference.
Fix this by ensuring that 'locked_ref' is set to NULL when btrfs_select_ref_head() returns ERR_PTR(-EAGAIN) and incrementing 'count' as well, to prevent infinite looping. We do this by doing a goto to the bottom of the loop that already sets 'locked_ref' to NULL and does a cond_resched(), with an increment to 'count' right before the goto. These measures were in place before the refactoring in commit 0110a4c43451 ("btrfs: refactor __btrfs_run_delayed_refs loop") but were unintentionally lost afterwards.
--- fs/btrfs/extent-tree.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/btrfs/extent-tree.c +3 -2
@@ -2075,7 +2075,8 @@ static noinline int __btrfs_run_delayed_refs(struct btrfs_trans_handle *trans, locked_ref =btrfs_obtain_ref_head (trans);if (IS_ERR_OR_NULL (locked_ref)) {if (PTR_ERR (locked_ref) == -EAGAIN ) { -continue ; + count++; + goto again; }else {break ; }
@@ -2123,7 +2124,7 @@ static noinline int __btrfs_run_delayed_refs(struct btrfs_trans_handle *trans,* Either success case or btrfs_run_delayed_refs_for_head * returned -EAGAIN, meaning we need to select another head */ - +again: locked_ref =NULL ;cond_resched (); } while ((min_bytes != U64_MAX && bytes_processed < min_bytes) ||
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 290/1276 fbdev: sm501fb: Fix buffer errors in OF binding code
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Laight <[email protected]>
[ Upstream commit d8421e09382cfe0bd2a044c8b0a822f64855dd4e ]
The code that gets the frame buffer mode from OF has 'use after free', 'buffer overrun' and memory leaks.
info->edid_data isn't free if the probe functions fail or if pd->def_mode is set.
If both the CRT and PANEL are enabled info->edid_data is used after being freed and is freed twice.
The string returned by of_get_property(np, "mode", &len) is just written over either the static "640x480-16@60" or the module parameter string without any regard for the length (which is most likely longer).
Use kstrump() for the OF mode and free everything before freeing 'info.
--- drivers/video/fbdev/sm501fb.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/video/fbdev/sm501fb.c +12 -4
@@ -95,6 +95,7 @@ struct sm501fb_info {void __iomem *fbmem;/* remapped framebuffer */ size_t fbmem_len;/* length of remapped region */ u8 *edid_data; +char *fb_mode; };/* per-framebuffer private data */
@@ -1792,12 +1793,11 @@ static int sm501fb_init_fb(struct fb_info *fb, enum sm501_controller head, fb->var.yres_virtual = fb->var.yres; }else {if (info->edid_data) { - ret =fb_find_mode (&fb->var, fb, fb_mode, + ret =fb_find_mode (&fb->var, fb, + info->fb_mode ?: fb_mode, fb->monspecs.modedb, fb->monspecs.modedb_len, &sm501_default_mode, default_bpp); -/* edid_data is no longer needed, free it */ -kfree (info->edid_data); }else { ret =fb_find_mode (&fb->var, fb,NULL ,NULL ,0 ,NULL ,8 );
@@ -1973,7 +1973,7 @@ static int sm501fb_probe(struct platform_device *pdev)/* Get EDID */ cp =of_get_property (np,"mode" , &len);if (cp) -strcpy (fb_mode, cp); + info->fb_mode =kstrdup (cp,GFP_KERNEL ); prop =of_get_property (np,"edid" , &len);if (prop && len ==EDID_LENGTH ) { info->edid_data = kmemdup(prop, EDID_LENGTH,
@@ -2030,6 +2030,12 @@ static int sm501fb_probe(struct platform_device *pdev) goto err_started_crt; } +/* These aren't needed any more */ +kfree (info->edid_data); +kfree (info->fb_mode); + info->edid_data =NULL ; + info->fb_mode =NULL ; +/* we registered, return ok */ return 0 ;
@@ -2047,6 +2053,8 @@ static int sm501fb_probe(struct platform_device *pdev)framebuffer_release (info->fb[HEAD_CRT ]); err_alloc: +kfree (info->edid_data); +kfree (info->fb_mode);kfree (info);return ret;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 291/1276 hwmon: (it87) Clamp negative values to zero in set_fan()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nikita Zhandarovich <[email protected]>
[ Upstream commit 7f8581c70a3bd50a932d3d2d253e99c5ec3eda74 ]
set_fan() parses user input with kstrtol() and passes the resulting value to FAN16_TO_REG() on chips with 16-bit fan support.
Negative fan speeds are not meaningful and should be rejected before conversion. Worst scenario, one may be able to abuse undefined behaviour of signed overflow to possibly induce rpm * 2 == 0 in FAN16_TO_REG(), thus causing a division by zero.
Instead, clamp val < 0 to zero and keep the conversion in its valid input domain, avoiding unsafe arithmetic in the register conversion path.
Found by Linux Verification Center (linuxtesting.org) with static analysis tool SVACE.
--- drivers/hwmon/it87.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/hwmon/it87.c +3 -0
@@ -1401,6 +1401,9 @@ static ssize_t set_fan(struct device *dev, struct device_attribute *attr,if (kstrtol (buf,10 , &val) <0 )return -EINVAL ; +if (val <0 ) + val =0 ; + err =it87_lock (data);if (err)return err;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 292/1276 btrfs: zoned: dont account data relocation space-info in statfs free space
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Thumshirn <[email protected]>
[ Upstream commit 52416a27aabc43eab3792fd0ca9f5dabeab58f31 ]
Don't account the free space in a data relocation space-info sub-group as usable free space in statfs.
This is misleading as no user allocations can be made in this space-info sub-group. It is only a target for relocation.
--- fs/btrfs/super.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/btrfs/super.c +2 -1
@@ -1732,7 +1732,8 @@ static int btrfs_statfs(struct dentry *dentry, struct kstatfs *buf)int mixed =0 ;list_for_each_entry (found, &fs_info->space_info, list) { -if (found->flags &BTRFS_BLOCK_GROUP_DATA ) { +if (found->flags &BTRFS_BLOCK_GROUP_DATA && + found->subgroup_id !=BTRFS_SUB_GROUP_DATA_RELOC ) {int i; total_free_data += found->disk_total - found->disk_used;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 293/1276 btrfs: fix deadlock cloning inline extent when using flushoncommit
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Filipe Manana <[email protected]>
[ Upstream commit 532085d00eb54c074bdeae648b194765239f4d11 ]
In commit b48c980b6a7e ("btrfs: fix deadlock between reflink and transaction commit when using flushoncommit") a deadlock was fixed between reflinks and transaction commits when the fs is mounted with the flushoncommit option. This happened when we had to copy an inline extent's data to the destination file. However the issue was fixed only for the case where the destination offset is 0, it missed the case when the offset is greater than zero.
Fix this by ensuring we get i_size update whenever we copied an inline extent's data into the destination file.
Syzbot reported this with the following trace:
INFO: task kworker/u8:3:57 blocked for more than 143 seconds.
Not tainted syzkaller #0
"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
task:kworker/u8:3 state:D stack:21600 pid:57 tgid:57 ppid:2 task_flags:0x4208160 flags:0x00080000
Workqueue: writeback wb_workfn (flush-btrfs-129)
Call Trace:
<TASK>
context_switch kernel/sched/core.c:5402 [inline]
__schedule+0x16f9/0x5500 kernel/sched/core.c:7204
__schedule_loop kernel/sched/core.c:7283 [inline]
schedule+0x164/0x360 kernel/sched/core.c:7298
wait_extent_bit fs/btrfs/extent-io-tree.c:905 [inline]
btrfs_lock_extent_bits+0x59c/0x700 fs/btrfs/extent-io-tree.c:2008
btrfs_lock_extent fs/btrfs/extent-io-tree.h:152 [inline]
btrfs_invalidate_folio+0x440/0xc00 fs/btrfs/inode.c:7718
extent_writepage fs/btrfs/extent_io.c:1848 [inline]
extent_write_cache_pages fs/btrfs/extent_io.c:2552 [inline]
btrfs_writepages+0x12f3/0x2410 fs/btrfs/extent_io.c:2684
do_writepages+0x32e/0x550 mm/page-writeback.c:2571
__writeback_single_inode+0x133/0x10e0 fs/fs-writeback.c:1764
writeback_sb_inodes+0x97f/0x1980 fs/fs-writeback.c:2056
wb_writeback+0x445/0xb00 fs/fs-writeback.c:2241
wb_do_writeback fs/fs-writeback.c:2388 [inline]
wb_workfn+0x3fd/0xf20 fs/fs-writeback.c:2428
process_one_work+0x98b/0x1630 kernel/workqueue.c:3318
process_scheduled_works kernel/workqueue.c:3401 [inline]
worker_thread+0xb49/0x1140 kernel/workqueue.c:3482
kthread+0x388/0x470 kernel/kthread.c:436
ret_from_fork+0x514/0xb70 arch/x86/kernel/process.c:158
ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:245
</TASK>
INFO: task syz.0.145:8523 blocked for more than 143 seconds.
Not tainted syzkaller #0
"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
task:syz.0.145 state:D stack:22752 pid:8523 tgid:8522 ppid:5850 task_flags:0x400140 flags:0x00080002
Call Trace:
<TASK>
context_switch kernel/sched/core.c:5402 [inline]
__schedule+0x16f9/0x5500 kernel/sched/core.c:7204
__schedule_loop kernel/sched/core.c:7283 [inline]
schedule+0x164/0x360 kernel/sched/core.c:7298
wb_wait_for_completion+0x3e8/0x790 fs/fs-writeback.c:227
__writeback_inodes_sb_nr+0x24c/0x2d0 fs/fs-writeback.c:2847
try_to_writeback_inodes_sb+0x9a/0xc0 fs/fs-writeback.c:2895
btrfs_start_delalloc_flush fs/btrfs/transaction.c:2182 [inline]
btrfs_commit_transaction+0x813/0x2fc0 fs/btrfs/transaction.c:2371
btrfs_sync_file+0xdf4/0x1230 fs/btrfs/file.c:1822
generic_write_sync include/linux/fs.h:2663 [inline]
btrfs_do_write_iter+0x6a9/0x840 fs/btrfs/file.c:1473
new_sync_write fs/read_write.c:595 [inline]
vfs_write+0x629/0xba0 fs/read_write.c:688
ksys_write+0x156/0x270 fs/read_write.c:740
do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline]
do_syscall_64+0x15f/0x560 arch/x86/entry/syscall_64.c:94
entry_SYSCALL_64_after_hwframe+0x77/0x7f
RIP: 0033:0x7f5a0bdece59
RSP: 002b:00007f5a0b446028 EFLAGS: 00000246 ORIG_RAX: 0000000000000001
RAX: ffffffffffffffda RBX: 00007f5a0c065fa0 RCX: 00007f5a0bdece59
RDX: 000000000000029f RSI: 0000200000000200 RDI: 0000000000000004
RBP: 00007f5a0be82d6f R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000
R13: 00007f5a0c066038 R14: 00007f5a0c065fa0 R15: 00007ffe149206b8
</TASK>
INFO: task syz.0.145:8539 blocked for more than 143 seconds.
Not tainted syzkaller #0
"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
task:syz.0.145 state:D stack:23704 pid:8539 tgid:8522 ppid:5850 task_flags:0x400140 flags:0x00080002
Call Trace:
<TASK>
context_switch kernel/sched/core.c:5402 [inline]
__schedule+0x16f9/0x5500 kernel/sched/core.c:7204
__schedule_loop kernel/sched/core.c:7283 [inline]
schedule+0x164/0x360 kernel/sched/core.c:7298
wait_current_trans+0x39f/0x590 fs/btrfs/transaction.c:536
start_transaction+0xbd8/0x1820 fs/btrfs/transaction.c:716
clone_copy_inline_extent fs/btrfs/reflink.c:299 [inline]
btrfs_clone+0x1316/0x2540 fs/btrfs/reflink.c:574
btrfs_clone_files+0x271/0x3f0 fs/btrfs/reflink.c:795
btrfs_remap_file_range+0x76b/0x1320 fs/btrfs/reflink.c:948
vfs_clone_file_range+0x435/0x7b0 fs/remap_range.c:403
ioctl_file_clone fs/ioctl.c:239 [inline]
ioctl_file_clone_range fs/ioctl.c:257 [inline]
do_vfs_ioctl+0xe15/0x1540 fs/ioctl.c:544
__do_sys_ioctl fs/ioctl.c:595 [inline]
__se_sys_ioctl+0x82/0x170 fs/ioctl.c:583
do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline]
do_syscall_64+0x15f/0x560 arch/x86/entry/syscall_64.c:94
entry_SYSCALL_64_after_hwframe+0x77/0x7f
RIP: 0033:0x7f5a0bdece59
RSP: 002b:00007f5a0b425028 EFLAGS: 00000246 ORIG_RAX: 0000000000000010
RAX: ffffffffffffffda RBX: 00007f5a0c066090 RCX: 00007f5a0bdece59
RDX: 00002000000000c0 RSI: 000000004020940d RDI: 0000000000000004
RBP: 00007f5a0be82d6f R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000
R13: 00007f5a0c066128 R14: 00007f5a0c066090 R15: 00007ffe149206b8
</TASK>--- fs/btrfs/reflink.c | 101 +++++++++++++++++++++++++-------------------- 1 file changed, 57 insertions(+), 44 deletions(-)
fs/btrfs/reflink.c +57 -44
@@ -183,10 +183,12 @@ static int clone_copy_inline_extent(struct btrfs_inode *inode,struct btrfs_drop_extents_args drop_args = {0 };int ret;struct btrfs_key key; +bool copied_inline_to_page = false;if (new_key->offset >0 ) { ret =copy_inline_to_page (inode, new_key->offset, inline_data, size, datal, comp_type); + copied_inline_to_page = (ret ==0 ); goto out; }
@@ -286,6 +288,60 @@ static int clone_copy_inline_extent(struct btrfs_inode *inode, ret =btrfs_inode_set_file_extent_range (inode,0 , aligned_end); out:if (!ret && !trans) { +if (copied_inline_to_page && + new_key->offset + datal >i_size_read (&inode->vfs_inode)) { +/* +* If we copied the inline extent data to a page/folio +* beyond the i_size of the destination inode, then we +* need to increase the i_size before we start a +* transaction to update the inode item. This is to +* prevent a deadlock when the flushoncommit mount +* option is used, which happens like this: +* +* 1) Task A clones an inline extent from inode X to an +* offset of inode Y that is beyond Y's current +* i_size. This means we copied the inline extent's +* data to a folio of inode Y that is beyond its EOF, +* using the call above to copy_inline_to_page(); +* +* 2) Task B starts a transaction commit and calls +* btrfs_start_delalloc_flush() to flush delalloc; +* +* 3) The delalloc flushing sees the new dirty folio of +* inode Y and when it attempts to flush it, it ends +* up at extent_writepage() and sees that the offset +* of the folio is beyond the i_size of inode Y, so +* it attempts to invalidate the folio by calling +* folio_invalidate(), which ends up at btrfs' folio +* invalidate callback - btrfs_invalidate_folio(). +* There it tries to lock the folio's range in inode +* Y's extent io tree, but it blocks since it's +* currently locked by task A - during reflink we +* lock the inodes and the source and destination +* ranges after flushing all delalloc and waiting for +* ordered extent completion - after that we don't +* expect to have dirty folios in the ranges, the +* exception is if we have to copy an inline extent's +* data (because the destination offset is not zero); +* +* 4) Task A then does the 'goto out' below and attempts +* to start a transaction to update the inode item, +* and then it's blocked since the current +* transaction is in the TRANS_STATE_COMMIT_START +* state. Therefore task A has to wait for the +* current transaction to become unblocked (its +* state >= TRANS_STATE_UNBLOCKED). +* +* This leads to a deadlock - the task committing the +* transaction waiting for the delalloc flushing which +* is blocked during folio invalidation on the inode's +* extent lock and the reflink task waiting for the +* current transaction to be unblocked so that it can +* start a new one to update the inode item (while +* holding the extent lock). +*/ +i_size_write (&inode->vfs_inode, new_key->offset + datal); + }/* * No transaction here means we copied the inline extent into a * page of the destination inode.
@@ -320,50 +376,7 @@ static int clone_copy_inline_extent(struct btrfs_inode *inode, ret =copy_inline_to_page (inode, new_key->offset, inline_data, size, datal, comp_type); - -/* -* If we copied the inline extent data to a page/folio beyond the i_size -* of the destination inode, then we need to increase the i_size before -* we start a transaction to update the inode item. This is to prevent a -* deadlock when the flushoncommit mount option is used, which happens -* like this: -* -* 1) Task A clones an inline extent from inode X to an offset of inode -* Y that is beyond Y's current i_size. This means we copied the -* inline extent's data to a folio of inode Y that is beyond its EOF, -* using the call above to copy_inline_to_page(); -* -* 2) Task B starts a transaction commit and calls -* btrfs_start_delalloc_flush() to flush delalloc; -* -* 3) The delalloc flushing sees the new dirty folio of inode Y and when -* it attempts to flush it, it ends up at extent_writepage() and sees -* that the offset of the folio is beyond the i_size of inode Y, so -* it attempts to invalidate the folio by calling folio_invalidate(), -* which ends up at btrfs' folio invalidate callback - -* btrfs_invalidate_folio(). There it tries to lock the folio's range -* in inode Y's extent io tree, but it blocks since it's currently -* locked by task A - during reflink we lock the inodes and the -* source and destination ranges after flushing all delalloc and -* waiting for ordered extent completion - after that we don't expect -* to have dirty folios in the ranges, the exception is if we have to -* copy an inline extent's data (because the destination offset is -* not zero); -* -* 4) Task A then does the 'goto out' below and attempts to start a -* transaction to update the inode item, and then it's blocked since -* the current transaction is in the TRANS_STATE_COMMIT_START state. -* Therefore task A has to wait for the current transaction to become -* unblocked (its state >= TRANS_STATE_UNBLOCKED). -* -* This leads to a deadlock - the task committing the transaction -* waiting for the delalloc flushing which is blocked during folio -* invalidation on the inode's extent lock and the reflink task waiting -* for the current transaction to be unblocked so that it can start a -* a new one to update the inode item (while holding the extent lock). -*/ -if (ret ==0 && new_key->offset + datal >i_size_read (&inode->vfs_inode)) -i_size_write (&inode->vfs_inode, new_key->offset + datal); + copied_inline_to_page = (ret ==0 ); goto out; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 294/1276 IB/mlx4: Fill in the access_flags if IB_MR_REREG_ACCESS is not specified
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason Gunthorpe <[email protected]>
[ Upstream commit bade9a3150d44ed20b8c6484c4c8a943b7289abb ]
Sashiko noticed mlx4 was using whatever random access flags were provided when IB_MR_REREG_ACCESS is not used. Since IB_MR_REREG_TRANS needs access_flags it used the random ones which means it doesn't work sensibly if userspace provides only IB_MR_REREG_TRANS.
Keep track of the current access_flag of the MR and use it if the user does not specify one.
Also fixup a little confusion around mmr.access, it is the HW access flags so the convert_access() was missing. But nothing reads this by the time rereg_mr can happen.
--- drivers/infiniband/hw/mlx4/mlx4_ib.h | 1 + drivers/infiniband/hw/mlx4/mr.c | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-)
drivers/infiniband/hw/mlx4/mlx4_ib.h +1 -0
@@ -137,6 +137,7 @@ struct mlx4_ib_mr {dma_addr_t page_map;u32 npages;u32 max_pages; +int access_flags;struct mlx4_mr mmr;struct ib_umem *umem;size_t page_map_size;
drivers/infiniband/hw/mlx4/mr.c +7 -2
@@ -439,6 +439,7 @@ struct ib_mr *mlx4_ib_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,if (err) goto err_mr; + mr->access_flags = access_flags; mr->ibmr.rkey = mr->ibmr.lkey = mr->mmr.key; mr->ibmr.page_size =1U << shift;
@@ -499,6 +500,8 @@ struct ib_mr *mlx4_ib_rereg_user_mr(struct ib_mr *mr, int flags, u64 start,if (err) goto release_mpt_entry; + }else { + mr_access_flags = mmr->access_flags; }if (flags &IB_MR_REREG_TRANS ) {
@@ -540,8 +543,10 @@ struct ib_mr *mlx4_ib_rereg_user_mr(struct ib_mr *mr, int flags, u64 start,* return a failure. But dereg_mr will free the resources. */ err =mlx4_mr_hw_write_mpt (dev->dev, &mmr->mmr, pmpt_entry); -if (!err && flags &IB_MR_REREG_ACCESS ) - mmr->mmr.access = mr_access_flags; +if (!err && flags &IB_MR_REREG_ACCESS ) { + mmr->access_flags = mr_access_flags; + mmr->mmr.access =convert_access (mr_access_flags); + } release_mpt_entry:mlx4_mr_hw_put_mpt (dev->dev, pmpt_entry);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 295/1276 NFSD: Handle layout stid in nfsd4_drop_revoked_stid()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chuck Lever <[email protected]>
[ Upstream commit 86b9898920a6d02b4149f4fef9efd77b8aa3b9ca ]
nfsd4_drop_revoked_stid() has no SC_TYPE_LAYOUT case, so when a client sends FREE_STATEID for an admin-revoked layout stid, the default branch releases cl_lock and returns without unhashing or releasing the stid. The stid remains in the IDR and on the per-client list until the client is destroyed.
Remove the layout stid from the per-client list and call nfs4_put_stid() to drop the creation reference. When the refcount reaches zero, nfsd4_free_layout_stateid() handles the remaining cleanup: cancelling the fence worker, removing from the per-file list, and freeing the slab object.
--- fs/nfsd/nfs4state.c | 7 +++++++ 1 file changed, 7 insertions(+)
fs/nfsd/nfs4state.c +7 -0
@@ -4858,6 +4858,7 @@ static void nfsd4_drop_revoked_stid(struct nfs4_stid *s) {struct nfs4_client *cl = s->sc_client;LIST_HEAD (reaplist); +struct nfs4_layout_stateid *ls;struct nfs4_ol_stateid *stp;struct nfs4_delegation *dp;bool unhashed;
@@ -4883,6 +4884,12 @@ static void nfsd4_drop_revoked_stid(struct nfs4_stid *s)spin_unlock (&cl->cl_lock);nfs4_put_stid (s);break ; +case SC_TYPE_LAYOUT : + ls =layoutstateid (s); +list_del_init (&ls->ls_perclnt); +spin_unlock (&cl->cl_lock); +nfs4_put_stid (s); +break ;default :spin_unlock (&cl->cl_lock); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 296/1276 spi: meson-spifc: fix runtime PM leak on remove
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ruoyu Wang <[email protected]>
[ Upstream commit 606c0826bd90384a54571c0c5475ca41f50164ea ]
pm_runtime_get_sync() increments the runtime PM usage counter even when it returns an error. meson_spifc_remove() uses it to resume the controller before disabling runtime PM, but never drops the usage counter again.
Balance the get with pm_runtime_put_noidle() after disabling runtime PM, matching the teardown pattern used by other SPI controller drivers.
Found by static analysis. I do not have hardware to test this.
--- drivers/spi/spi-meson-spifc.c | 1 + 1 file changed, 1 insertion(+)
drivers/spi/spi-meson-spifc.c +1 -0
@@ -352,6 +352,7 @@ static void meson_spifc_remove(struct platform_device *pdev) {pm_runtime_get_sync (&pdev->dev);pm_runtime_disable (&pdev->dev); +pm_runtime_put_noidle (&pdev->dev); }#ifdef CONFIG_PM_SLEEP
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 297/1276 ASoC: codecs: aw88261: fix incorrect masks for boost regs
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Val Packett <[email protected]>
[ Upstream commit 79c053a1ff9d3ab31cefbc791e8d7816ba830491 ]
The boost-related register fields used in aw88261_reg_force_set use the exact same definitions as the rest of the fields, where the mask must be inverted when passing it to regmap_update_bits, but they weren't inverted here.
--- sound/soc/codecs/aw88261.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
sound/soc/codecs/aw88261.c +6 -6
@@ -283,22 +283,22 @@ static void aw88261_reg_force_set(struct aw88261 *aw88261)if (aw88261->frcset_en ==AW88261_FRCSET_ENABLE ) {/* set FORCE_PWM */ regmap_update_bits (aw88261->regmap,AW88261_BSTCTRL3_REG , -AW88261_FORCE_PWM_MASK ,AW88261_FORCE_PWM_FORCEMINUS_PWM_VALUE ); + ~AW88261_FORCE_PWM_MASK ,AW88261_FORCE_PWM_FORCEMINUS_PWM_VALUE );/* set BOOST_OS_WIDTH */ regmap_update_bits (aw88261->regmap,AW88261_BSTCTRL5_REG , -AW88261_BST_OS_WIDTH_MASK ,AW88261_BST_OS_WIDTH_50NS_VALUE ); + ~AW88261_BST_OS_WIDTH_MASK ,AW88261_BST_OS_WIDTH_50NS_VALUE );/* set BURST_LOOPR */ regmap_update_bits (aw88261->regmap,AW88261_BSTCTRL6_REG , -AW88261_BST_LOOPR_MASK ,AW88261_BST_LOOPR_340K_VALUE ); + ~AW88261_BST_LOOPR_MASK ,AW88261_BST_LOOPR_340K_VALUE );/* set RSQN_DLY */ regmap_update_bits (aw88261->regmap,AW88261_BSTCTRL7_REG , -AW88261_RSQN_DLY_MASK ,AW88261_RSQN_DLY_35NS_VALUE ); + ~AW88261_RSQN_DLY_MASK ,AW88261_RSQN_DLY_35NS_VALUE );/* set BURST_SSMODE */ regmap_update_bits (aw88261->regmap,AW88261_BSTCTRL8_REG , -AW88261_BURST_SSMODE_MASK ,AW88261_BURST_SSMODE_FAST_VALUE ); + ~AW88261_BURST_SSMODE_MASK ,AW88261_BURST_SSMODE_FAST_VALUE );/* set BST_BURST */ regmap_update_bits (aw88261->regmap,AW88261_BSTCTRL9_REG , -AW88261_BST_BURST_MASK ,AW88261_BST_BURST_30MA_VALUE ); + ~AW88261_BST_BURST_MASK ,AW88261_BST_BURST_30MA_VALUE ); }else {dev_dbg (aw88261->aw_pa->dev,"needn't set reg value" ); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 298/1276 vduse: hold vduse_lock across IDR lookup in open path
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qihang Tang <[email protected]>
[ Upstream commit e440e077748939839d9f76e24383b76b785f80ce ]
vduse_dev_open() looks up struct vduse_dev through the IDR and then acquires dev->lock only after vduse_lock has been dropped.
This leaves a window where a concurrent VDUSE_DESTROY_DEV can remove the same object from the IDR and free it before the open path locks the device, leading to a use-after-free.
Close this race by keeping vduse_lock held until dev->lock has been acquired in the open path, matching the lock ordering already used by the destroy path.
Message-ID: <[email protected]>
--- drivers/vdpa/vdpa_user/vduse_dev.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-)
drivers/vdpa/vdpa_user/vduse_dev.c +7 -14
@@ -1429,26 +1429,18 @@ static int vduse_dev_release(struct inode *inode, struct file *file)return 0 ; } -static struct vduse_dev *vduse_dev_get_from_minor (int minor) +static int vduse_dev_open (struct inode *inode,struct file *file) { +int ret = -EBUSY ;struct vduse_dev *dev;mutex_lock (&vduse_lock); - dev =idr_find (&vduse_idr, minor); -mutex_unlock (&vduse_lock); - -return dev; -} - -static int vduse_dev_open (struct inode *inode,struct file *file) -{ -int ret; -struct vduse_dev *dev =vduse_dev_get_from_minor (iminor (inode)); - -if (!dev) + dev =idr_find (&vduse_idr,iminor (inode)); +if (!dev) { +mutex_unlock (&vduse_lock);return -ENODEV ; + } - ret = -EBUSY ;mutex_lock (&dev->lock);if (dev->connected) goto unlock;
@@ -1458,6 +1450,7 @@ static int vduse_dev_open(struct inode *inode, struct file *file) file->private_data = dev; unlock:mutex_unlock (&dev->lock); +mutex_unlock (&vduse_lock);return ret; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 299/1276 vhost/vdpa: validate virtqueue index in mmap and fault paths
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qihang Tang <[email protected]>
[ Upstream commit 929e4f044621c8cc30b612fb74e1410bef09e41b ]
vhost_vdpa_mmap() and vhost_vdpa_fault() use vma->vm_pgoff as a virtqueue index for get_vq_notification(), but they do not validate that the index is smaller than v->nvqs.
The ioctl path already performs both a bounds check and array_index_nospec(), but the mmap/fault path only checks that the index fits in u16. This allows an out-of-range queue index to reach driver-specific get_vq_notification() callbacks.
Fix this by extracting a unified vhost_vdpa_get_vq_notification() helper that validates the queue index against v->nvqs and applies array_index_nospec() before calling the driver callback. Both the mmap and fault paths use this helper, and the bounds checking is consolidated into a single location.
Quoted 1 line
From source inspection, the most defensible impact is out-of-bounds
access in the callback path, potentially leading to invalid PFN remaps and crash/DoS.
Message-ID: <[email protected]>
--- drivers/vhost/vdpa.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-)
drivers/vhost/vdpa.c +22 -7
@@ -1480,16 +1480,32 @@ static int vhost_vdpa_release(struct inode *inode, struct file *filep) }#ifdef CONFIG_MMU -static vm_fault_t vhost_vdpa_fault (struct vm_fault *vmf) +static int +vhost_vdpa_get_vq_notification (struct vhost_vdpa *v,unsigned long index, +struct vdpa_notification_area *notify) { -struct vhost_vdpa *v = vmf->vma->vm_file->private_data;struct vdpa_device *vdpa = v->vdpa;const struct vdpa_config_ops *ops = vdpa->config; + +if (index >65535 || index >= v->nvqs) +return -EINVAL ; + + index =array_index_nospec (index, v->nvqs); + + *notify = ops->get_vq_notification (vdpa, index); + +return 0 ; +} + +static vm_fault_t vhost_vdpa_fault (struct vm_fault *vmf) +{ +struct vhost_vdpa *v = vmf->vma->vm_file->private_data;struct vdpa_notification_area notify;struct vm_area_struct *vma = vmf->vma; -u16 index = vma->vm_pgoff; +unsigned long index = vma->vm_pgoff; - notify = ops->get_vq_notification (vdpa, index); +if (vhost_vdpa_get_vq_notification (v, index, ¬ify)) +return VM_FAULT_SIGBUS ;return vmf_insert_pfn (vma, vmf->address &PAGE_MASK ,PFN_DOWN (notify.addr)); }
@@ -1512,8 +1528,6 @@ static int vhost_vdpa_mmap(struct file *file, struct vm_area_struct *vma)return -EINVAL ;if (vma->vm_flags &VM_READ )return -EINVAL ; -if (index >65535 ) -return -EINVAL ;if (!ops->get_vq_notification)return -ENOTSUPP ;
@@ -1521,7 +1535,8 @@ static int vhost_vdpa_mmap(struct file *file, struct vm_area_struct *vma)* support the doorbell which sits on the page boundary and * does not share the page with other registers. */ - notify = ops->get_vq_notification (vdpa, index); +if (vhost_vdpa_get_vq_notification (v, index, ¬ify)) +return -EINVAL ;if (notify.addr & (PAGE_SIZE -1 ))return -EINVAL ;if (vma->vm_end - vma->vm_start != notify.size)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 300/1276 virtio_console: read size from config space during device init
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Filip Hejsek <[email protected]>
[ Upstream commit b3592a32b34f37874dc94aa1a0d15c4334ed86ca ]
Previously, the size was only read upon receiving the config interrupt. This interrupt is sent when the size changes. However, we also need to read the initial size.
Also make sure to only read the size from config if F_SIZE is enabled.
Message-ID: <[email protected]>
--- drivers/char/virtio_console.c | 52 +++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 21 deletions(-)
drivers/char/virtio_console.c +31 -21
@@ -1774,32 +1774,40 @@ static void config_intr(struct virtio_device *vdev)schedule_work (&portdev->config_work); } -static void config_work_handler (struct work_struct *work) +static void update_size_from_config (struct ports_device *portdev) { -struct ports_device *portdev; +struct virtio_device *vdev; +struct port *port; +u16 rows, cols; - portdev = container_of(work, struct ports_device, config_work); -if (!use_multiport (portdev)) { -struct virtio_device *vdev; -struct port *port; -u16 rows, cols; + vdev = portdev->vdev; - vdev = portdev->vdev; - virtio_cread(vdev, struct virtio_console_config, cols, &cols); - virtio_cread(vdev, struct virtio_console_config, rows, &rows); +/* +* We'll use this way of resizing only for legacy support. +* For multiport devices, use control messages to indicate +* console size changes so that it can be done per-port. +* +* Don't test F_SIZE at all if we're rproc: not a valid feature. +*/ +if (is_rproc_serial (vdev) || +use_multiport (portdev) || + !virtio_has_feature (vdev,VIRTIO_CONSOLE_F_SIZE )) +return ; - port =find_port_by_id (portdev,0 ); -set_console_size (port, rows, cols); + virtio_cread(vdev, struct virtio_console_config, cols, &cols); + virtio_cread(vdev, struct virtio_console_config, rows, &rows); -/* -* We'll use this way of resizing only for legacy -* support. For newer userspace -* (VIRTIO_CONSOLE_F_MULTPORT+), use control messages -* to indicate console size changes so that it can be -* done per-port. -*/ -resize_console (port); - } + port =find_port_by_id (portdev,0 ); +set_console_size (port, rows, cols); +resize_console (port); +} + +static void config_work_handler (struct work_struct *work) +{ +struct ports_device *portdev; + + portdev = container_of(work, struct ports_device, config_work); +update_size_from_config (portdev); }static int init_vqs (struct ports_device *portdev)
@@ -2057,6 +2065,8 @@ static int virtcons_probe(struct virtio_device *vdev)__send_control_msg (portdev,VIRTIO_CONSOLE_BAD_ID ,VIRTIO_CONSOLE_DEVICE_READY ,1 ); +update_size_from_config (portdev); +return 0 ; free_chrdev:
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 301/1276 vduse: Requeue failed read to send_list head
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhang Tianci <[email protected]>
[ Upstream commit 373ec43ded742b2f3aecf14731ffe1a57f438f38 ]
When copy_to_iter() fails in vduse_dev_read_iter(), put the message back at the head of send_list to preserve FIFO ordering and retry the oldest pending request first.
Message-ID: <[email protected]>
--- drivers/vdpa/vdpa_user/vduse_dev.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/vdpa/vdpa_user/vduse_dev.c +7 -1
@@ -193,6 +193,12 @@ static void vduse_enqueue_msg(struct list_head *head,list_add_tail (&msg->list, head); } +static void vduse_enqueue_msg_head (struct list_head *head, +struct vduse_dev_msg *msg) +{ +list_add (&msg->list, head); +} +static void vduse_dev_broken (struct vduse_dev *dev) {struct vduse_dev_msg *msg, *tmp;
@@ -353,7 +359,7 @@ static ssize_t vduse_dev_read_iter(struct kiocb *iocb, struct iov_iter *to)spin_lock (&dev->msg_lock);if (ret != size) { ret = -EFAULT ; -vduse_enqueue_msg (&dev->send_list, msg); +vduse_enqueue_msg_head (&dev->send_list, msg); goto unlock; }vduse_enqueue_msg (&dev->recv_list, msg);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 302/1276 vhost/net: complete zerocopy ubufs only once
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qing Ming <[email protected]>
[ Upstream commit 8f6898fe80794f2d7c3d38c1158c806e4074a1c4 ]
vhost-net initializes one ubuf_info per outstanding zerocopy TX descriptor and hands it to the backend socket. The networking stack may then clone a zerocopy skb before all skb references are released. For example, batman-adv fragmentation reaches skb_split(), which calls skb_zerocopy_clone() and increments the same ubuf_info refcount.
vhost_zerocopy_complete() currently treats every ubuf callback as a completed vhost descriptor. It dereferences ubuf->ctx, writes the descriptor completion state, and drops the vhost_net_ubuf_ref even when the callback only releases a cloned skb reference. A backend reset can therefore wait for and free the vhost_net_ubuf_ref while another cloned skb still carries the same ubuf_info. A later completion then dereferences the freed ubufs pointer.
KASAN reports the stale completion as:
BUG: KASAN: slab-use-after-free in vhost_zerocopy_complete+0x1d7/0x1f0 BUG: KASAN: slab-use-after-free in vhost_zerocopy_complete+0x101/0x1f0 vhost_zerocopy_complete skb_copy_ubufs __dev_forward_skb2 veth_xmit
The freed object was allocated from vhost_net_ioctl() while setting the backend and freed through kfree_rcu()/kvfree_rcu_bulk after backend removal, while delayed skb completion still reached vhost_zerocopy_complete().
Honor the generic ubuf_info refcount before touching vhost state, and run the vhost descriptor completion only for the final ubuf reference. This matches the msg_zerocopy_complete() ownership rule for cloned zerocopy skbs.
Message-ID: <[email protected]>
--- drivers/vhost/net.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/vhost/net.c +11 -4
@@ -388,13 +388,20 @@ static void vhost_zerocopy_signal_used(struct vhost_net *net,static void vhost_zerocopy_complete (struct sk_buff *skb,struct ubuf_info *ubuf_base,bool success) { -struct ubuf_info_msgzc *ubuf =uarg_to_msgzc (ubuf_base); -struct vhost_net_ubuf_ref *ubufs = ubuf->ctx; -struct vhost_virtqueue *vq = ubufs->vq; +struct ubuf_info_msgzc *ubuf; +struct vhost_net_ubuf_ref *ubufs; +struct vhost_virtqueue *vq;int cnt; -rcu_read_lock_bh (); +/* Only the final cloned skb reference completes the vhost descriptor. */ +if (!refcount_dec_and_test (&ubuf_base->refcnt)) +return ; + + ubuf =uarg_to_msgzc (ubuf_base); + ubufs = ubuf->ctx; + vq = ubufs->vq; +rcu_read_lock_bh ();/* set len to mark this desc buffers done DMA */ vq->heads[ubuf->desc].len = success ?VHOST_DMA_DONE_LEN :VHOST_DMA_FAILED_LEN ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 303/1276 tools/virtio: check mmap return value in vringh_test
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: longlong yan <[email protected]>
[ Upstream commit ec6177dfe98b9be1c3ede6c0dfe4394ea2a76959 ]
In parallel_test(), the return values of mmap() for both host_map and guest_map are not checked against MAP_FAILED. If mmap() fails, the subsequent code will dereference the invalid pointer, leading to a segmentation fault.
Add MAP_FAILED checks after both mmap() calls, using err() to report the error and exit, consistent with the existing error handling style in this file (e.g., the open() call on line 149).
Message-ID: <[email protected]>
--- tools/virtio/vringh_test.c | 5 +++++ 1 file changed, 5 insertions(+)
tools/virtio/vringh_test.c +5 -0
@@ -159,7 +159,12 @@ static int parallel_test(u64 features,/* Parent and child use separate addresses, to check our mapping logic! */ host_map =mmap (NULL , mapsize,PROT_READ |PROT_WRITE ,MAP_SHARED , fd,0 ); +if (host_map ==MAP_FAILED ) +err (1 ,"mmap host_map" ); + guest_map =mmap (NULL , mapsize,PROT_READ |PROT_WRITE ,MAP_SHARED , fd,0 ); +if (guest_map ==MAP_FAILED ) +err (1 ,"mmap guest_map" ); pipe_ret =pipe (to_guest);assert (!pipe_ret);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 304/1276 vdpa/octeon_ep: Fix PF->VF mailbox data address calculation
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Srujana Challa <[email protected]>
[ Upstream commit 74dc530f4c505d61f0f3620e59fe56c325ae3437 ]
The mailbox address was computed assuming 1 ring per VF. Read the actual rings-per-VF from OCTEP_EPF_RINFO and use it when calculating OCTEP_PF_MBOX_DATA offsets, fixing VF initialization when rings per VF > 1.
Message-ID: <[email protected]>
--- drivers/vdpa/octeon_ep/octep_vdpa_main.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/vdpa/octeon_ep/octep_vdpa_main.c +6 -1
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0-only /* Copyright (C) 2024 Marvell. */ +#include <linux/bitfield.h> #include <linux/interrupt.h> #include <linux/io-64-nonatomic-lo-hi.h> #include <linux/module.h>
@@ -678,6 +679,8 @@ static int octep_sriov_enable(struct pci_dev *pdev, int num_vfs)bool done = false;int index =0 ;int ret, i; +u8 rpvf; +u64 val; ret =pci_enable_sriov (pdev, num_vfs);if (ret)
@@ -697,9 +700,11 @@ static int octep_sriov_enable(struct pci_dev *pdev, int num_vfs) } } + val =readq (addr +OCTEP_EPF_RINFO (0 )); + rpvf =FIELD_GET (GENMASK_ULL (35 ,32 ), val);if (done) {for (i =0 ; i < pf->enabled_vfs; i++) -writeq (OCTEP_DEV_READY_SIGNATURE , addr +OCTEP_PF_MBOX_DATA (i)); +writeq (OCTEP_DEV_READY_SIGNATURE , addr +OCTEP_PF_MBOX_DATA (i * rpvf)); }return num_vfs;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 305/1276 ASoC: cs35l56: Fix missing calls to wm_adsp2_remove()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Richard Fitzgerald <[email protected]>
[ Upstream commit 85f7bf03632bfcdd6cedfb3945b7e387d9487d73 ]
Call wm_adsp2_remove() in cs35l56_remove() and the error path of cs35l56_common_probe().
Depends on commit 7d3fb78b5503 ("ASoC: wm_adsp: Fix NULL dereference when removing firmware controls").
The call to wm_halo_init() during driver probe should be paired with a call to wm_adsp2_remove() but this was missing. The consequence would be a memory leak of the control lists in the cs_dsp driver.
--- sound/soc/codecs/cs35l56.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
sound/soc/codecs/cs35l56.c +6 -1
@@ -1330,11 +1330,14 @@ int cs35l56_common_probe(struct cs35l56_private *cs35l56) cs35l56_dai, ARRAY_SIZE(cs35l56_dai));if (ret <0 ) {dev_err_probe (cs35l56->base.dev, ret,"Register codec failed\n" ); - goto err; + goto err_remove_wm_adsp; }return 0 ; +err_remove_wm_adsp: +wm_adsp2_remove (&cs35l56->dsp); + err:gpiod_set_value_cansleep (cs35l56->base.reset_gpio,0 );regulator_bulk_disable (ARRAY_SIZE (cs35l56->supplies), cs35l56->supplies);
@@ -1438,6 +1441,8 @@ void cs35l56_remove(struct cs35l56_private *cs35l56)flush_workqueue (cs35l56->dsp_wq);destroy_workqueue (cs35l56->dsp_wq); +wm_adsp2_remove (&cs35l56->dsp); +pm_runtime_dont_use_autosuspend (cs35l56->base.dev);pm_runtime_suspend (cs35l56->base.dev);pm_runtime_disable (cs35l56->base.dev);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 306/1276 ASoC: cs35l56: Dont leave parent IRQ disabled if system_suspend fails
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Richard Fitzgerald <[email protected]>
[ Upstream commit 53cebeb017164254cde5e31c94d8deef9e4fff97 ]
In cs35l56_system_suspend() re-enable the parent IRQ if the call to pm_runtime_force_suspend() returns an error.
--- sound/soc/codecs/cs35l56.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
sound/soc/codecs/cs35l56.c +6 -1
@@ -950,6 +950,7 @@ static int __maybe_unused cs35l56_runtime_resume_i2c_spi(struct device *dev)int cs35l56_system_suspend (struct device *dev) {struct cs35l56_private *cs35l56 =dev_get_drvdata (dev); +int ret;dev_dbg (dev,"system_suspend\n" );
@@ -965,7 +966,11 @@ int cs35l56_system_suspend(struct device *dev)if (cs35l56->base.irq)disable_irq (cs35l56->base.irq); -return pm_runtime_force_suspend (dev); + ret =pm_runtime_force_suspend (dev); +if ((ret <0 ) && cs35l56->base.irq) +enable_irq (cs35l56->base.irq); + +return ret; }EXPORT_SYMBOL_GPL (cs35l56_system_suspend);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 307/1276 bonding: 3ad: fix mux port state on oper down
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Louis Scalbert <[email protected]>
[ Upstream commit 807afc7544b865d4d09068a415fd5b71bf5665cc ]
When the bonding interface has carrier down due to the absence of usable slaves and a slave transitions from down to up, the bonding interface briefly goes carrier up, then down again, and finally up once LACP negotiates collecting and distributing on the port.
When lacp_strict mode is on, the interface should not transition to carrier up until LACP negotiation is complete.
This happens because the actor and partner port states remain in Collecting_Distributing when the port goes down. When the port comes back up, it temporarily remains in this state until LACP renegotiation occurs.
Previously this was mostly cosmetic, but since the bonding carrier state may depend on the LACP negotiation state, it causes the interface to flap.
According to IEEE 802.3ad-2000 and IEEE 802.1ax-2014, Collecting and Distributing should be reset when a port goes down:
- In the Receive state machine, port_enabled == FALSE causes a transition to the PORT_DISABLED state, which is expected to clear Partner_Oper_Port_State.Synchronization.
- In the Mux state machine, Partner_Oper_Port_State.Synchronization == FALSE causes a transition to the ATTACHED state, which disables Collecting and Distributing.
However, Partner_Oper_Port_State.Synchronization is not cleared in the PORT_DISABLED state.
Clear Partner_Oper_Port_State.Synchronization in the Receive PORT_DISABLED state.
--- drivers/net/bonding/bond_3ad.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/bonding/bond_3ad.c +1 -0
@@ -1284,6 +1284,7 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port) fallthrough;case AD_RX_PORT_DISABLED : port->sm_vars &= ~AD_PORT_MATCHED ; + port->partner_oper.port_state &= ~LACP_STATE_SYNCHRONIZATION ;break ;case AD_RX_LACP_DISABLED : port->sm_vars &= ~AD_PORT_SELECTED ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 308/1276 ext4: fix kernel BUG in ext4_write_inline_data_end
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aditya Prakash Srivastava <[email protected]>
[ Upstream commit ad09aa45965d3fafaf9963bc78109b73c0f9ac8d ]
When the data=journal mount option is used, the ext4_journalled_write_end() function incorrectly calls ext4_write_inline_data_end() without checking if the EXT4_STATE_MAY_INLINE_DATA flag is still set on the inode.
If a previous attempt to convert the inline data to an extent failed (e.g. due to ENOSPC), the EXT4_STATE_MAY_INLINE_DATA flag is cleared, but the EXT4_INODE_INLINE_DATA flag remains set. In this scenario, the next call to ext4_write_begin() will not prepare the inline data xattr for writing, but ext4_journalled_write_end() will incorrectly attempt to write to it, triggering a BUG_ON(pos + len > EXT4_I(inode)->i_inline_size) in ext4_write_inline_data() since i_inline_size was not expanded.
Fix this by ensuring that ext4_journalled_write_end() only calls ext4_write_inline_data_end() if the EXT4_STATE_MAY_INLINE_DATA flag is set, mirroring the behavior of ext4_write_end() and ext4_da_write_end().
--- fs/ext4/inode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/ext4/inode.c +2 -1
@@ -1410,7 +1410,8 @@ static int ext4_journalled_write_end(struct file *file,BUG_ON (!ext4_handle_valid (handle)); -if (ext4_has_inline_data (inode)) +if (ext4_has_inline_data (inode) && +ext4_test_inode_state (inode,EXT4_STATE_MAY_INLINE_DATA ))return ext4_write_inline_data_end (inode, pos, len, copied, folio);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 309/1276 ext4: validate donor file superblock early in EXT4_IOC_MOVE_EXT
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yun Zhou <[email protected]>
[ Upstream commit c143957520c6c9b5cd72e0de8b52b814f0c576fe ]
Reject the EXT4_IOC_MOVE_EXT ioctl early if the donor file does not belong to the same superblock as the original file. Currently, this validation is performed inside ext4_move_extents() by mext_check_validity(), but only after lock_two_nondirectories() has already acquired the inode locks. When the donor fd refers to a file on a different filesystem (e.g., overlayfs), this late validation creates a circular lock dependency:
CPU0 (overlayfs write) CPU1 (ext4 ioctl)
---- ----
inode_lock(ovl_inode)
mnt_want_write_file(filp)
sb_start_write(ext4_sb) [sb_writers]
backing_file_write_iter()
vfs_iter_write(real_file)
file_start_write(real_file)
sb_start_write(ext4_sb) [blocked by freeze]
lock_two_nondirectories()
inode_lock(ovl_inode) [blocked]
With a concurrent freeze operation holding sb_writers write side, this forms a deadlock cycle: CPU0 waits for freeze to complete, freeze waits for CPU1's sb_writers reader to exit, CPU1 waits for CPU0's inode lock.
Since EXT4_IOC_MOVE_EXT exchanges physical extents between two files, it fundamentally requires both files to reside on the same ext4 filesystem. Moving the superblock check before any lock acquisition is both semantically correct and eliminates the circular dependency by ensuring that cross-filesystem donor fds are rejected before sb_writers or inode locks are taken.
--- fs/ext4/ioctl.c | 3 +++ 1 file changed, 3 insertions(+)
fs/ext4/ioctl.c +3 -0
@@ -1372,6 +1372,9 @@ static long __ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) goto mext_out; } +if (file_inode (filp)->i_sb !=file_inode (fd_file (donor))->i_sb) +return -EXDEV ; + err =mnt_want_write_file (filp);if (err) goto mext_out;
Signature · 1 line
2.53.0
Re: [PATCH 6.12 0309/1276] ext4: validate donor file superblock early in EXT4_IOC_MOVE_EXT
Hi Greg/Sasha,
Quoted 57 lines · Greg Kroah-Hartman
6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yun Zhou <[email protected]>
[ Upstream commit
c143957520c6c9b5cd72e0de8b52b814f0c576fe]Reject the
EXT4_IOC_MOVE_EXTioctl early if the donor file does not belong to the same superblock as the original file. Currently, this validation is performed insideext4_move_extents()bymext_check_validity(), but only afterlock_two_nondirectories()has already acquired the inode locks. When the donor fd refers to a file on a different filesystem (e.g., overlayfs), this late validation creates a circular lock dependency:CPU0 (overlayfs write) CPU1 (ext4 ioctl)
---- ----
inode_lock(ovl_inode)
mnt_want_write_file(filp)
sb_start_write(ext4_sb)[sb_writers]
backing_file_write_iter()
vfs_iter_write(real_file)
file_start_write(real_file)
sb_start_write(ext4_sb)[blocked by freeze]
lock_two_nondirectories()
inode_lock(ovl_inode)[blocked]With a concurrent freeze operation holding
sb_writerswrite side, this forms a deadlock cycle: CPU0 waits for freeze to complete, freeze waits for CPU1'ssb_writersreader to exit, CPU1 waits for CPU0's inode lock.Since
EXT4_IOC_MOVE_EXTexchanges physical extents between two files, it fundamentally requires both files to reside on the same ext4 filesystem. Moving the superblock check before any lock acquisition is both semantically correct and eliminates the circular dependency by ensuring that cross-filesystem donor fds are rejected beforesb_writersor inode locks are taken.Fixes fcf6b1b729bc ("ext4: refactor ext4_move_extents code base")Reported-by [email protected]Signed-off-by Yun Zhou <[email protected]>Reviewed-by Jan Kara <[email protected]>Reviewed-by Andreas Dilger <[email protected]>Signed-off-by Theodore Ts'o <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- fs/ext4/ioctl.c | 3 +++ 1 file changed, 3 insertions(+)fs/ext4/ioctl.c +0
-0
fs/ext4/ioctl.c static long __ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) · line 1380
Quoted 9 lines
fs/ext4/ioctl.c +3
-0@@ -1372,6 +1372,9 @@ static long __ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) goto mext_out; } +if (file_inode (filp)->i_sb !=file_inode (fd_file (donor))->i_sb) +return -EXDEV ; + err =mnt_want_write_file (filp);if (err) goto mext_out;
I have run an AI-assisted backport review and took a look at d9db3e516000 ("ext4: validate donor file superblock early in EXT4_IOC_MOVE_EXT").
Upstream c143957520c6 uses CLASS(fd, donor), so its new direct return -EXDEV is safe: leaving the scope performs fdput(). The 6.12 backport instead uses an explicit fdget() and releases the donor only via mext_out:
+ if (file_inode(filp)->i_sb != file_inode(fd_file(donor))->i_sb)
+ return -EXDEV; <---
err = mnt_want_write_file(filp);
if (err)
goto mext_out;
...mext_out:
fdput(donor);
Thus the new cross-superblock return bypasses fdput(). In particular, when the caller has a shared files_struct, fdget() obtains a counted file reference, which is then leaked on this path.
I think the stable patch needs a small branch-specific adjustment:
set err = -EXDEV and goto mext_out instead of returning directly.
Thoughts? or we need to drop this and redo this again. I think impact is mostly a leak/DoS risk but I still think we need to get this fixed.
thanks,
Harshit
Re: [PATCH 6.12 0309/1276] ext4: validate donor file superblock early in EXT4_IOC_MOVE_EXT
Quoted 38 lines · Harshit Mogalapalli
Quoted 14 lines · Greg Kroah-Hartman
fs/ext4/ioctl.c +3
-0@@ -1372,6 +1372,9 @@ static long __ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) goto mext_out; } + if (file_inode(filp)->i_sb !=file_inode (fd_file (donor))->i_sb) + return -EXDEV; + err = mnt_want_write_file(filp);Quoted 2 lines
if (err)
gotomext_out;I have run an AI-assisted backport review and took a look at
d9db3e516000("ext4: validate donor file superblock early inEXT4_IOC_MOVE_EXT").Upstream
c143957520c6usesCLASS(fd, donor), so its new direct return-EXDEVis safe: leaving the scope performsfdput(). The 6.12 backport instead uses an explicitfdget()and releases the donor only viamext_out:+ if (file_inode(filp)->i_sb != file_inode(fd_file(donor))->i_sb) + return
-EXDEV; <---err =
mnt_want_write_file(filp);
if (err)
gotomext_out;...
mext_out:
fdput(donor);
Quoted 9 lines
Thus the new cross-superblock return bypasses
fdput(). In particular, when the caller has a sharedfiles_struct,fdget()obtains a counted file reference, which is then leaked on this path.I think the stable patch needs a small branch-specific adjustment:
set err =-EXDEVand gotomext_outinstead of returning directly. Thoughts? or we need to drop this and redo this again. I think impact is mostly a leak/DoS risk but I still think we need to get this fixed.
You're right. The fix is simply:
if (file_inode(filp)->i_sb != file_inode(fd_file(donor))->i_sb) {
err = -EXDEV;
goto mext_out;
}BR,
Yun
Greg Kroah-Hartman
maintainerRe: [PATCH 6.12 0309/1276] ext4: validate donor file superblock early in EXT4_IOC_MOVE_EXT
Quoted 49 lines · Yun
Quoted 38 lines · Harshit Mogalapalli
Quoted 14 lines · Greg Kroah-Hartman
fs/ext4/ioctl.c +3
-0@@ -1372,6 +1372,9 @@ static long __ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) goto mext_out; } + if (file_inode(filp)->i_sb !=file_inode (fd_file (donor))->i_sb) + return -EXDEV; + err = mnt_want_write_file(filp);Quoted 2 lines
if (err)
gotomext_out;I have run an AI-assisted backport review and took a look at
d9db3e516000("ext4: validate donor file superblock early inEXT4_IOC_MOVE_EXT").Upstream
c143957520c6usesCLASS(fd, donor), so its new direct return-EXDEVis safe: leaving the scope performsfdput(). The 6.12 backport instead uses an explicitfdget()and releases the donor only viamext_out:+ if (file_inode(filp)->i_sb != file_inode(fd_file(donor))->i_sb) + return
-EXDEV; <---err =
mnt_want_write_file(filp);
if (err)
gotomext_out;...
mext_out:
fdput(donor);Quoted 9 lines
Thus the new cross-superblock return bypasses
fdput(). In particular, when the caller has a sharedfiles_struct,fdget()obtains a counted file reference, which is then leaked on this path.I think the stable patch needs a small branch-specific adjustment:
set err =-EXDEVand gotomext_outinstead of returning directly. Thoughts? or we need to drop this and redo this again. I think impact is mostly a leak/DoS risk but I still think we need to get this fixed.
Quoted 6 lines
You're right. The fix is simply:
if (file_inode(filp)->i_sb != file_inode(fd_file(donor))->i_sb) { err = -EXDEV; goto mext_out; }
Great, can someone send a fixup patch for this?
thanks,
greg k-h
Re: [PATCH 6.12 0309/1276] ext4: validate donor file superblock early in EXT4_IOC_MOVE_EXT
Quoted 15 lines · Greg Kroah-Hartman
Quoted 14 lines · Yun
Quoted 12 lines · Harshit Mogalapalli
On 21/07/26 8:42 pm, Greg Kroah-Hartman wrote:
fdput(donor);Thus the new cross-superblock return bypasses
fdput(). In particular, when the caller has a sharedfiles_struct,fdget()obtains a counted file reference, which is then leaked on this path.I think the stable patch needs a small branch-specific adjustment:
set err =-EXDEVand gotomext_outinstead of returning directly. Thoughts? or we need to drop this and redo this again. I think impact is mostly a leak/DoS risk but I still think we need to get this fixed.
Quoted 9 lines
Quoted 6 lines
You're right. The fix is simply:
if (file_inode(filp)->i_sb != file_inode(fd_file(donor))->i_sb) { err = -EXDEV; goto mext_out; }Great, can someone send a fixup patch for this?
I've sent the fixed backport as "[PATCH 6.12.y] ext4: validate donor file superblock early in EXT4_IOC_MOVE_EXT" to you.
BR,
Yun
Greg Kroah-Hartman
maintainerPATCH 310/1276 selftests/bpf: Fix bpf_iter/task_vma test
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yonghong Song <[email protected]>
[ Upstream commit 2e8ad1ff712d2a397e407c9fde60901f68d077dc ]
For selftest bpf_iter/task_vma, I got a failure like below on my qemu run:
test_task_vma_common:FAIL:compare_output unexpected compare_output:
actual
'561593546000-561593585000r--p0000000000:241256579534/root/devshare/bpf-next/tools/testing/selftests/bpf/test_progs'
!= expected
'561593546000-561593585000r--p0000000000:245551546830/root/devshare/bpf-next/tools/testing/selftests/bpf/test_progs'Further debugging found out file->f_inode->i_ino value may exceed 32bit, e.g., i_ino = 0x14c2eae35, but the format string is '%u'. This caused inode mismatch between bpf iter and proc result.
Fix the issue by using format string '%llu' to accommodate 64bit i_ino.
--- tools/testing/selftests/bpf/progs/bpf_iter_task_vmas.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/progs/bpf_iter_task_vmas.c +1 -1
@@ -52,7 +52,7 @@ SEC("iter/task_vma") int proc_maps(struct bpf_iter__task_vma *ctx)bpf_d_path (&file->f_path, d_path_buf,D_PATH_BUF_SIZE );BPF_SEQ_PRINTF (seq,"%08llx " , vma->vm_pgoff <<12 ); -BPF_SEQ_PRINTF (seq,"%02x:%02x %u" ,MAJOR (dev),MINOR (dev), +BPF_SEQ_PRINTF (seq,"%02x:%02x %llu" ,MAJOR (dev),MINOR (dev), file->f_inode->i_ino);BPF_SEQ_PRINTF (seq,"\t%s\n" , d_path_buf); }else {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 311/1276 cxl/test: Fix integer overflow in mock LSA bounds checks
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Jiang <[email protected]>
[ Upstream commit 81eafcada109b653977c4dfbd2b6a72470025a01 ]
Pre-existing issue discovered by sashiko-bot.
mock_get_lsa() and mock_set_lsa() validate the requested LSA range with "offset + length > LSA_SIZE". Both offset and length are u32 and, in mock_get_lsa(), both are taken directly from the user-supplied payload. The addition is evaluated modulo 2^32, so a large offset combined with a small length wraps around and passes the check.
Rewrite the checks to first bound offset, then compare length against the remaining LSA size.
--- tools/testing/cxl/test/mem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/cxl/test/mem.c +2 -2
@@ -1015,7 +1015,7 @@ static int mock_get_lsa(struct cxl_mockmem_data *mdata,return -EINVAL ; offset =le32_to_cpu (get_lsa->offset); length =le32_to_cpu (get_lsa->length); -if (offset + length >LSA_SIZE ) +if (offset >LSA_SIZE || length >LSA_SIZE - offset)return -EINVAL ;if (length > cmd->size_out)return -EINVAL ;
@@ -1035,7 +1035,7 @@ static int mock_set_lsa(struct cxl_mockmem_data *mdata,return -EINVAL ; offset =le32_to_cpu (set_lsa->offset); length = cmd->size_in -sizeof (*set_lsa); -if (offset + length >LSA_SIZE ) +if (offset >LSA_SIZE || length >LSA_SIZE - offset)return -EINVAL ;memcpy (lsa + offset, &set_lsa->data[0 ], length);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 312/1276 cxl/test: Zero out LSA backing memory to avoid leaking to user
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Jiang <[email protected]>
[ Upstream commit 60f065dbaf46e65830da62a0041761f0c039e086 ]
Memory through vmalloc() is not zeroed out. When this memory is copied into output payload, it leaks memory content to user. Use vzalloc() instead to zero out the memory.
--- tools/testing/cxl/test/mem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/cxl/test/mem.c +1 -1
@@ -1484,7 +1484,7 @@ static int cxl_mock_mem_probe(struct platform_device *pdev)return -ENOMEM ;dev_set_drvdata (dev, mdata); - mdata->lsa =vmalloc (LSA_SIZE ); + mdata->lsa =vzalloc (LSA_SIZE );if (!mdata->lsa)return -ENOMEM ; mdata->fw =vmalloc (FW_SIZE );
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 313/1276 of: cpu: add check in __of_find_n_match_cpu_property()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sergey Shtylyov <[email protected]>
[ Upstream commit 5901eda2ed99ba0d3661da6eb265970559323bb3 ]
In __of_find_n_match_cpu_property(), checking the variable ac for 0 won't prevent a possible overflow when multiplying it by sizeof(*cell). Besides, of_read_number() (called in the *for* loop) can't return correct result if that variable (which equals the #address-cells prop's value) exceeds 2, so additionally checking for that seems logical...
Found by Linux Verification Center (linuxtesting.org) with the Svace static analysis tool.
--- drivers/of/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/of/cpu.c +1 -1
@@ -60,7 +60,7 @@ static bool __of_find_n_match_cpu_property(struct device_node *cpun, cell =of_get_property (cpun, prop_name, &prop_len);if (!cell && !ac &&arch_match_cpu_phys_id (cpu,0 ))return true; -if (!cell || !ac) +if (!cell || !ac || ac >2 )return false; prop_len /=sizeof (*cell) * ac;for (tid =0 ; tid < prop_len; tid++) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 314/1276 vfio/qat: fix f_pos race in qat_vf_resume_write()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Giovanni Cabiddu <[email protected]>
[ Upstream commit 4ec5e932e636896e97e4c6a8205b0ac76d52421a ]
qat_vf_resume_write() checks filp->f_pos before taking migf->lock, but copies into the migration-state buffer after taking the lock and re-reading the shared file position.
Two concurrent writers could therefore pass the bounds check with the old offset, then have the second writer copy after the first advanced f_pos, writing past the end of the migration-state buffer.
Take migf->lock before doing the boundary checks.
--- drivers/vfio/pci/qat/main.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
drivers/vfio/pci/qat/main.c +10 -6
@@ -303,14 +303,18 @@ static ssize_t qat_vf_resume_write(struct file *filp, const char __user *buf,return -ESPIPE ; offs = &filp->f_pos; -if (*offs <0 || -check_add_overflow (len, *offs, &end)) -return -EOVERFLOW ; +mutex_lock (&migf->lock); -if (end > mig_dev->state_size) -return -ENOMEM ; +if (*offs <0 ||check_add_overflow (len, *offs, &end)) { + done = -EOVERFLOW ; + goto out_unlock; + } + +if (end > mig_dev->state_size) { + done = -ENOMEM ; + goto out_unlock; + } -mutex_lock (&migf->lock);if (migf->disabled) { done = -ENODEV ; goto out_unlock;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 315/1276 bpf: Tighten cgroup storage cookie checks for prog arrays
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Borkmann <[email protected]>
[ Upstream commit 10627ddc0167aab5c1c390a10ef461e9937aba08 ]
The fix in commit abad3d0bad72 ("bpf: Fix oob access in cgroup local storage") is still incomplete. The prog-array compatibility check treats a program with no cgroup storage as compatible with any stored storage cookie. This allows a storage-less program to bridge a tail call chain between an entry program and a storage-using callee even though cgroup local storage at runtime still follows the caller's context, that is, A -> B(no storage) -> C(storage) path.
Requiring exact cookie equality would break the legitimate case of a storage-less leaf program being tail called from a storage-using one. Instead, only accept a zero storage cookie if the program cannot perform tail calls itself. This keeps A -> B(no storage) working while rejecting the A -> B(no storage) -> C(storage) bridge.
--- kernel/bpf/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/bpf/core.c +1 -1
@@ -2433,7 +2433,7 @@ static bool __bpf_prog_map_compatible(struct bpf_map *map, cookie = aux->cgroup_storage[i] ? aux->cgroup_storage[i]->cookie :0 ; ret = map->owner->storage_cookie[i] == cookie || - !cookie; + (!cookie && !aux->tail_call_reachable); }if (ret && map->owner->attach_func_proto != aux->attach_func_proto) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 316/1276 ASoC: cs35l56: Fix possible uninitialized value in cs35l56_spi_system_reset()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Richard Fitzgerald <[email protected]>
[ Upstream commit 007699d278a655871b07d45a1268761260d03124 ]
In cs35l56_spi_system_reset() initialize val to zero before using it in the read_poll_timeout(). This prevents testing an uninitialized value if the regmap_read_bypassed() returns an error.
Read errors are intentionally ignored during this loop because the device is resetting (though SPI can't really detect that so shouldn't fail because of that, it's safer to ignore errors and keep polling). Because of this, val must be initialized to something in case the first read fails. The polling loop is looking for a non-zero value, so initializing val to 0 will ensure that the loop continues until a valid state is read from the device or it times out.
--- sound/soc/codecs/cs35l56-shared.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/cs35l56-shared.c +1 -0
@@ -363,6 +363,7 @@ static void cs35l56_spi_system_reset(struct cs35l56_base *cs35l56_base)* The regmap must remain in cache-only until the chip has * booted, so use a bypassed read. */ + val =0 ; ret = read_poll_timeout(regmap_read_bypassed, read_ret, (val > 0) && (val < 0xffffffff), CS35L56_HALO_STATE_POLL_US,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 317/1276 s390/process: Fix kernel thread function pointer type
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heiko Carstens <[email protected]>
[ Upstream commit d0478f5d3cba1095bfdeb43a9b063c10cdebef14 ]
In case of a kernel thread __ret_from_fork() calls the specified function indirectly. Fix the kernel thread function pointer, since kernel threads return an int instead of void.
--- arch/s390/kernel/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/s390/kernel/process.c +1 -1
@@ -52,7 +52,7 @@ void ret_from_fork(void) asm("ret_from_fork");void __ret_from_fork (struct task_struct *prev,struct pt_regs *regs) { -void (*func)(void *arg); +int (*func)(void *arg);schedule_tail (prev);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 318/1276 Bluetooth: hci_qca: fix NULL pointer dereference in qca_dmp_hdr() for non-serdev device
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zijun Hu <[email protected]>
[ Upstream commit 6b8cbcf08de0db62254d1981f83db0f94681ccd9 ]
hu->serdev is NULL for hci_uart attached via non-serdev paths, but qca_dmp_hdr() unconditionally dereferences hu->serdev->dev.driver->name, causing a NULL pointer dereference.
Fix by guarding the dereference with a NULL check and falling back to "hci_ldisc_qca" for the non-serdev case.
--- drivers/bluetooth/hci_qca.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/bluetooth/hci_qca.c +1 -1
@@ -1010,7 +1010,7 @@ static void qca_dmp_hdr(struct hci_dev *hdev, struct sk_buff *skb)skb_put_data (skb, buf,strlen (buf));snprintf (buf,sizeof (buf),"Driver: %s\n" , - hu->serdev->dev.driver->name); + hu->serdev ? hu->serdev->dev.driver->name :"hci_ldisc_qca" );skb_put_data (skb, buf,strlen (buf)); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 319/1276 Bluetooth: eir: Fix stack OOB write when prepending the Flags AD
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Weiming Shi <[email protected]>
[ Upstream commit 6f5fb689fdf80bdd143f22a502f9eb1f3c85e286 ]
eir_create_adv_data() builds the advertising data into a fixed-size buffer ("size", 31 for the legacy path). It may prepend a 3-byte "Flags" AD structure (LE_AD_NO_BREDR on an LE-only controller) and then copies the per-instance data without checking that it still fits:
memcpy(ptr, adv->adv_data, adv->adv_data_len);
tlv_data_max_len() only reserves those 3 bytes when the user-supplied flags carry a managed-flags bit, so an instance added with flags == 0 is accepted with adv_data_len up to the full buffer. At advertise time the flags are still prepended, and the memcpy() writes 3 + adv_data_len bytes into the size-byte buffer:
BUG: KASAN: stack-out-of-bounds in eir_create_adv_data (net/bluetooth/eir.c:301) Write of size 31 at addr ffff88800a547bdc by task kworker/u9:0/65 Workqueue: hci0 hci_cmd_sync_work __asan_memcpy (mm/kasan/shadow.c:106) eir_create_adv_data (net/bluetooth/eir.c:301) hci_update_adv_data_sync (net/bluetooth/hci_sync.c:1310) hci_schedule_adv_instance_sync (net/bluetooth/hci_sync.c:1817) hci_cmd_sync_work (net/bluetooth/hci_sync.c:332) This frame has 1 object: [32, 64) 'cp'
The "Flags" structure is added by the kernel, not requested by userspace, so only prepend it when it fits together with the instance advertising data; when there is no room for both, drop the flags rather than the user-provided data.
Reachable by a local user with CAP_NET_ADMIN owning an LE-only controller on the legacy advertising path.
--- net/bluetooth/eir.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
net/bluetooth/eir.c +5 -3
@@ -283,10 +283,12 @@ u8 eir_create_adv_data(struct hci_dev *hdev, u8 instance, u8 *ptr, u8 size)if (!flags) flags |=mgmt_get_adv_discov_flags (hdev); -/* If flags would still be empty, then there is no need to -* include the "Flags" AD field". +/* Only add the "Flags" if it fits together with the instance +* advertising data; drop it rather than overflow the buffer. */ -if (flags && (ad_len +eir_precalc_len (1 ) <= size)) { +if (flags && + (ad_len +eir_precalc_len (1 ) + + (adv ? adv->adv_data_len :0 ) <= size)) { ptr[0 ] =0x02 ; ptr[1 ] =EIR_FLAGS ; ptr[2 ] = flags;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 320/1276 Bluetooth: hci_core: Fix UAF in hci_unregister_dev()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jordan Walters <[email protected]>
[ Upstream commit 5edcc018fa6e80b2c478454a4a8229c23d67c181 ]
hci_unregister_dev() does not disable cmd_timer and ncmd_timer before the hci_dev structure is freed. If a timeout fires during device teardown, the callback dereferences freed memory (including the hdev->reset function pointer), leading to a use-after-free.
Add disable_delayed_work_sync() calls alongside the existing disable_work_sync() calls to ensure both timers are fully quiesced before teardown proceeds.
--- net/bluetooth/hci_core.c | 2 ++ 1 file changed, 2 insertions(+)
net/bluetooth/hci_core.c +2 -0
@@ -2729,6 +2729,8 @@ void hci_unregister_dev(struct hci_dev *hdev)disable_work_sync (&hdev->tx_work);disable_work_sync (&hdev->power_on);disable_work_sync (&hdev->error_reset); +disable_delayed_work_sync (&hdev->cmd_timer); +disable_delayed_work_sync (&hdev->ncmd_timer);hci_cmd_sync_clear (hdev);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 321/1276 Bluetooth: btmtk: fix URB leak in alloc_mtk_intr_urb error path
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhao Dongdong <[email protected]>
[ Upstream commit f396f4005180928cd9e15e352a6512865d3bc908 ]
When btmtk_isopkt_pad() fails, the previously allocated URB is not freed, leaking the urb structure. Add usb_free_urb() before returning the error.
--- drivers/bluetooth/btmtk.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/bluetooth/btmtk.c +3 -1
@@ -1051,8 +1051,10 @@ struct urb *alloc_mtk_intr_urb(struct hci_dev *hdev, struct sk_buff *skb,if (!urb)return ERR_PTR (-ENOMEM ); -if (btmtk_isopkt_pad (hdev, skb)) +if (btmtk_isopkt_pad (hdev, skb)) { +usb_free_urb (urb);return ERR_PTR (-EINVAL ); + } pipe =usb_sndintpipe (btmtk_data->udev, btmtk_data->isopkt_tx_ep->bEndpointAddress);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 322/1276 Bluetooth: hci: validate codec capability element length
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Samuel Moelius <[email protected]>
[ Upstream commit c38fbcdc407925c7088f7e5f11c1fff73d2d35a2 ]
Read Local Codec Capabilities returns a sequence of capability elements. Each element starts with a one-byte length followed by that many payload bytes.
hci_read_codec_capabilities() checks that the skb contains the length byte, but then validates only caps->len against the remaining skb length. A malformed controller response with one remaining byte and caps->len set to one passes that check even though the element needs two bytes. The parser then records a two-byte capability and copies one byte beyond the advertised response payload into the codec list.
Validate the full element size, including the length byte, before adding it to the accumulated capability length. This preserves all well-formed capability elements and drops only truncated controller responses.
--- net/bluetooth/hci_codec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/bluetooth/hci_codec.c +1 -1
@@ -100,7 +100,7 @@ static void hci_read_codec_capabilities(struct hci_dev *hdev, __u8 transport, caps = (void *)skb->data;if (skb->len <sizeof (*caps)) goto error; -if (skb->len < caps->len) +if (skb->len <sizeof (caps->len) + caps->len) goto error; len +=sizeof (caps->len) + caps->len;skb_pull (skb,sizeof (caps->len) + caps->len);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 323/1276 Bluetooth: vhci: validate devcoredump state before side effects
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Samuel Moelius <[email protected]>
[ Upstream commit 88c2404a3c59c3126453919388dbd5ed98ed01bd ]
The VHCI force_devcoredump debugfs hook accepts a small test record from userspace. It validates the requested terminal state only after registering, initializing and appending a Bluetooth devcoredump.
As a result, an invalid state returns -EINVAL but still leaves queued devcoredump work behind. With a non-zero timeout field, the rejected write can still emit a devcoredump after the timeout expires.
Reject unsupported states before allocating the skb or changing the HCI devcoredump state machine.
--- drivers/bluetooth/hci_vhci.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/bluetooth/hci_vhci.c +10 -0
@@ -337,7 +337,17 @@ static ssize_t force_devcd_write(struct file *file, const char __user *user_buf,if (copy_from_user (&dump_data, user_buf, count))return -EFAULT ; +switch (dump_data.state) { +case HCI_DEVCOREDUMP_DONE : +case HCI_DEVCOREDUMP_ABORT : +case HCI_DEVCOREDUMP_TIMEOUT : +break ; +default : +return -EINVAL ; + } + data_size = count - offsetof(struct devcoredump_test_data , data); + skb =alloc_skb (data_size,GFP_ATOMIC );if (!skb)return -ENOMEM ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 324/1276 fs: efs: remove unneeded debug prints
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maxwell Doose <[email protected]>
[ Upstream commit 89009392c80da5da00876c8334ff20028e6e3eb6 ]
The current code uses debug prints conditionally compiled with #ifdef DEBUG. However, that code, when compiled, causes compiler errors due to incompatible formatters and undefined variables, notably:
fs/efs/file.c: In function `efs_get_block':fs/efs/file.c:26:35: error: block' undeclared (first use in this function); did you mean iblock'?
26 | __func__, block, inode->i_blocks, inode->i_size);
| ^~~~~
and:
fs/efs/file.c: In function `efs_bmap':./include/linux/kern_levels.h:5:25: error: format %ld' expects argument of type long int', but argument 4 has type blkcnt_t' {aka long long unsigned int'} [-Werror=format=]
5 | #define KERN_SOH "\001" /* ASCII Start Of Header */
| ^~~~~~which also extends to the other formatters. As this part of the code has been dead for just about 14 years now, it has not been modernized to stay compatible with the most recent gcc compilers. Fix these issues by removing the debug prints.
--- fs/efs/file.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-)
fs/efs/file.c +3 -18
@@ -18,16 +18,9 @@ int efs_get_block(struct inode *inode, sector_t iblock,if (create)return error; -if (iblock >= inode->i_blocks) { -#ifdef DEBUG -/* -* i have no idea why this happens as often as it does -*/ -pr_warn ("%s(): block %d >= %ld (filesize %ld)\n" , - __func__, block, inode->i_blocks, inode->i_size); -#endif +if (iblock >= inode->i_blocks)return 0 ; - } + phys =efs_map_block (inode, iblock);if (phys)map_bh (bh_result, inode->i_sb, phys);
@@ -42,16 +35,8 @@ int efs_bmap(struct inode *inode, efs_block_t block) { }/* are we about to read past the end of a file ? */ -if (!(block < inode->i_blocks)) { -#ifdef DEBUG -/* -* i have no idea why this happens as often as it does -*/ -pr_warn ("%s(): block %d >= %ld (filesize %ld)\n" , - __func__, block, inode->i_blocks, inode->i_size); -#endif +if (!(block < inode->i_blocks))return 0 ; - }return efs_map_block (inode, block); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 325/1276 RDMA/mlx5: Remove DCT restrack tracking
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Patrisious Haddad <[email protected]>
[ Upstream commit b136a7af41f796a48665afc6a55907488a3d5500 ]
DCT restrack tracking wasn't working to begin with as it was only tracking the first DCT which was added, since at creation the DCT number isn't yet initialized because the DCT FW object is only created during modify. The following DCT additions were failing silently.
Since the fix isn't trivial and there were no users that required or complained about this issue we are dropping this for now instead of fixing.
--- drivers/infiniband/hw/mlx5/qp.c | 1 + drivers/infiniband/hw/mlx5/restrack.c | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-)
drivers/infiniband/hw/mlx5/qp.c +1 -0
@@ -3084,6 +3084,7 @@ static int create_qp(struct mlx5_ib_dev *dev, struct ib_pd *pd,switch (qp->type) {case MLX5_IB_QPT_DCT : +rdma_restrack_no_track (&qp->ibqp.res); err =create_dct (dev, pd, qp, params);break ;case MLX5_IB_QPT_DCI :
drivers/infiniband/hw/mlx5/restrack.c +0 -3
@@ -169,9 +169,6 @@ static int fill_res_qp_entry(struct sk_buff *msg, struct ib_qp *ibqp) ret =nla_put_string (msg,RDMA_NLDEV_ATTR_RES_SUBTYPE ,"REG_UMR" );break ; -case MLX5_IB_QPT_DCT : - ret =nla_put_string (msg,RDMA_NLDEV_ATTR_RES_SUBTYPE ,"DCT" ); -break ;case MLX5_IB_QPT_DCI : ret =nla_put_string (msg,RDMA_NLDEV_ATTR_RES_SUBTYPE ,"DCI" );break ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 326/1276 RDMA/mlx5: Remove raw RSS QP restrack tracking
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Patrisious Haddad <[email protected]>
[ Upstream commit 666031fed8f0fdfc29b20d125a628c1b0a04cdaf ]
Raw RSS QP restrack tracking wasn't working to begin with as it was only tracking the first raw RSS QP which was added, since at creation the raw RSS QP number is reserved so the QP number for this qp type was always zero.
The following raw RSS QP additions were always failing silently.
Since the fix isn't trivial and there were no users that required or complained about this issue we are dropping this for now instead of fixing.
--- drivers/infiniband/hw/mlx5/qp.c | 1 + 1 file changed, 1 insertion(+)
drivers/infiniband/hw/mlx5/qp.c +1 -0
@@ -3078,6 +3078,7 @@ static int create_qp(struct mlx5_ib_dev *dev, struct ib_pd *pd,int err;if (params->is_rss_raw) { +rdma_restrack_no_track (&qp->ibqp.res); err =create_rss_raw_qp_tir (dev, pd, qp, params); goto out; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 327/1276 RDMA/mlx5: Fix undefined shift of user RQ WQE size
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maher Sanalla <[email protected]>
[ Upstream commit d881d60223aac8fdc12b227d89c76e131e92a9cd ]
set_rq_size() computes the RQ WQE size as "1 << rq_wqe_shift" based on the user-provided rq_wqe_shift, which is only checked to be greater than 32, so shifts of 32 are still accepted. A shift of 31 also overflows a signed integer, leading to undefined behavior.
Use check_shl_overflow() to compute the RQ WQE size and reject any invalid values.
--- drivers/infiniband/hw/mlx5/qp.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/infiniband/hw/mlx5/qp.c +4 -7
@@ -451,16 +451,13 @@ static int set_rq_size(struct mlx5_ib_dev *dev, struct ib_qp_cap *cap,if (ucmd) { qp->rq.wqe_cnt = ucmd->rq_wqe_count; -if (ucmd->rq_wqe_shift >BITS_PER_BYTE *sizeof (ucmd->rq_wqe_shift)) -return -EINVAL ; qp->rq.wqe_shift = ucmd->rq_wqe_shift; -if ((1 << qp->rq.wqe_shift) / -sizeof (struct mlx5_wqe_data_seg ) < - wq_sig) +if (check_shl_overflow (1 , qp->rq.wqe_shift, &wqe_size)) +return -EINVAL ; +if (wqe_size /sizeof (struct mlx5_wqe_data_seg ) < wq_sig)return -EINVAL ; qp->rq.max_gs = - (1 << qp->rq.wqe_shift) / -sizeof (struct mlx5_wqe_data_seg ) - + wqe_size /sizeof (struct mlx5_wqe_data_seg ) - wq_sig; qp->rq.max_post = qp->rq.wqe_cnt; }else {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 328/1276 RDMA/mlx5: Release the HW‑provided UAR index rather than the SW one
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leon Romanovsky <[email protected]>
[ Upstream commit 449ae7927152e46acbe5f19f97eafdae6d3a96b1 ]
Free the UAR index returned by the hardware.
--- drivers/infiniband/hw/mlx5/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/mlx5/main.c +1 -1
@@ -2412,7 +2412,7 @@ static int uar_mmap(struct mlx5_ib_dev *dev, enum mlx5_ib_mmap_cmd cmd,if (!dyn_uar)return err; -mlx5_cmd_uar_dealloc (dev->mdev, idx, context->devx_uid); +mlx5_cmd_uar_dealloc (dev->mdev, uar_index, context->devx_uid); free_bfreg:mlx5_ib_free_bfreg (dev, bfregi, bfreg_dyn_idx);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 329/1276 ASoC: codecs: hdac_hdmi: Validate written enum value
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: HyeongJun An <[email protected]>
[ Upstream commit 0b08baeccdcf52fad328ad645f5b4fbee04eea34 ]
hdac_hdmi_set_pin_port_mux() uses the written enum value to index the texts array before calling snd_soc_dapm_put_enum_double(), which validates that the value is within the enum item range.
An out-of-range value can therefore make the driver read past the texts array before the helper rejects the write. Move the lookup after the helper has accepted the value.
--- sound/soc/codecs/hdac_hdmi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/soc/codecs/hdac_hdmi.c +3 -1
@@ -909,12 +909,14 @@ static int hdac_hdmi_set_pin_port_mux(struct snd_kcontrol *kcontrol,struct hdac_device *hdev =dev_to_hdac_dev (dapm->dev);struct hdac_hdmi_priv *hdmi =hdev_to_hdmi_priv (hdev);struct hdac_hdmi_pcm *pcm; -const char *cvt_name = e->texts[ucontrol->value.enumerated.item[0 ]]; +const char *cvt_name; ret =snd_soc_dapm_put_enum_double (kcontrol, ucontrol);if (ret <0 )return ret; + cvt_name = e->texts[ucontrol->value.enumerated.item[0 ]]; +if (port ==NULL )return -EINVAL ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 330/1276 ASoC: fsl: fsl_audmix: Validate written enum values
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: HyeongJun An <[email protected]>
[ Upstream commit 3cd17e4e2871114d5579fa7bc8da66faf7fc1930 ]
fsl_audmix_put_mix_clk_src() and fsl_audmix_put_out_src() convert the user-provided enum item with snd_soc_enum_item_to_val() before checking whether the item is within the enum's item count.
The generic snd_soc_put_enum_double() helper performs that validation, but these callbacks use the converted value first: the clock-source path tests it with BIT(), and the output-source path indexes the prms transition table with it.
Reject out-of-range enum items before converting them.
--- sound/soc/fsl/fsl_audmix.c | 6 ++++++ 1 file changed, 6 insertions(+)
sound/soc/fsl/fsl_audmix.c +6 -0
@@ -117,6 +117,9 @@ static int fsl_audmix_put_mix_clk_src(struct snd_kcontrol *kcontrol,unsigned int *item = ucontrol->value.enumerated.item;unsigned int reg_val, val, mix_clk; +if (item[0 ] >= e->items) +return -EINVAL ; +/* Get current state */ reg_val =snd_soc_component_read (comp,FSL_AUDMIX_CTR ); mix_clk = ((reg_val & FSL_AUDMIX_CTR_MIXCLK_MASK)
@@ -157,6 +160,9 @@ static int fsl_audmix_put_out_src(struct snd_kcontrol *kcontrol,unsigned int reg_val, val, mask =0 , ctr =0 ;int ret; +if (item[0 ] >= e->items) +return -EINVAL ; +/* Get current state */ reg_val =snd_soc_component_read (comp,FSL_AUDMIX_CTR );
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 331/1276 ASoC: tegra: tegra210_ahub: Validate written enum value
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: HyeongJun An <[email protected]>
[ Upstream commit 1d8aabb413b5638670dfd1162169edc0ba276a2e ]
tegra_ahub_put_value_enum() reads e->values[item[0]] before checking whether item[0] is within the enum item range. The existing check therefore happens too late to prevent an out-of-range read of the values array.
Move the check before the array access.
--- sound/soc/tegra/tegra210_ahub.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/soc/tegra/tegra210_ahub.c +3 -1
@@ -60,13 +60,15 @@ static int tegra_ahub_put_value_enum(struct snd_kcontrol *kctl,struct soc_enum *e = (struct soc_enum *)kctl->private_value;struct snd_soc_dapm_update update[TEGRA_XBAR_UPDATE_MAX_REG ] = { };unsigned int *item = uctl->value.enumerated.item; -unsigned int value = e->values[item[0 ]]; +unsigned int value;unsigned int i, bit_pos, reg_idx =0 , reg_val =0 ;int change =0 ;if (item[0 ] >= e->items)return -EINVAL ; + value = e->values[item[0 ]]; +if (value) {/* Get the register index and value to set */ reg_idx = (value -1 ) / (8 * cmpnt->val_bytes);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 332/1276 net: dsa: qca8k: fix led devicename when using external mdio bus
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: George Moussalem <[email protected]>
[ Upstream commit 0b7b378ce6cafbb948786cb6f17f406d94016c8c ]
The qca8k dsa switch can use either an external or internal mdio bus. This depends on whether the mdio node is defined under the switch node itself. Upon registering the internal mdio bus, the internal_mdio_bus of the dsa switch is assigned to this bus. When an external mdio bus is used, the driver still uses the internal_mdio_bus id which is used to create the device names of the leds.
This leads to the leds being prefixed with '(efault)' as the internal_mii_bus is null. So let's fix this by adding a null check and use the devicename of the external bus instead when an external bus is configured.
--- drivers/net/dsa/qca/qca8k-leds.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/dsa/qca/qca8k-leds.c +2 -1
@@ -429,7 +429,8 @@ qca8k_parse_port_leds(struct qca8k_priv *priv, struct fwnode_handle *port, int p init_data.fwnode = led; init_data.devname_mandatory = true; init_data.devicename =kasprintf (GFP_KERNEL ,"%s:0%d" , - priv->internal_mdio_bus->id, + priv->internal_mdio_bus ? + priv->internal_mdio_bus->id : priv->bus->id, port_num);if (!init_data.devicename) {fwnode_handle_put (led);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 333/1276 net/sched: cls_flow: Dont expose folded kernel pointers
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jamal Hadi Salim <[email protected]>
[ Upstream commit f294fc71c4a0fa4964f6428a1b4e7929c1d83125 ]
The flow classifier falls back to addr_fold() for fields that are missing from packet headers. In map mode, userspace controls mask, xor, rshift, addend and divisor, and can observe the resulting classid through class statistics. This allows a tc classifier in a user/network namespace to recover the 32-bit folded value of skb->sk, skb_dst() or skb_nfct().
Align with standard kernel practices for pointer hashing and replace the XOR folding with a keyed siphash (which is cryptographically secure)
--- net/sched/cls_flow.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
net/sched/cls_flow.c +9 -3
@@ -21,6 +21,7 @@#include <net/inet_sock.h> #include <net/pkt_cls.h> +#include <linux/siphash.h> #include <net/ip.h> #include <net/route.h> #include <net/flow_dissector.h>
@@ -57,11 +58,15 @@ struct flow_filter {struct rcu_work rwork; }; +static siphash_aligned_key_t flow_keys_secret__read_mostly ; +static inline u32 addr_fold (void *addr) { -unsigned long a = (unsigned long )addr; - -return (a &0xFFFFFFFF ) ^ (BITS_PER_LONG >32 ? a >>32 :0 ); +#ifdef CONFIG_64BIT +return (u32 )siphash_1u64 ((u64 )addr, &flow_keys_secret); +#else +return (u32 )siphash_1u32 ((u32 )addr, &flow_keys_secret); +#endif }static u32 flow_get_src (const struct sk_buff *skb,const struct flow_keys *flow)
@@ -596,6 +601,7 @@ static int flow_init(struct tcf_proto *tp)return -ENOBUFS ;INIT_LIST_HEAD (&head->filters);rcu_assign_pointer (tp->root, head); +net_get_random_once (&flow_keys_secret,sizeof (flow_keys_secret));return 0 ; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 334/1276 net: fib_rules: Dont dump dying fib_rule in fib_rules_dump().
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit 2821e85c058f81c9948a2fb1a634f7b47457d51c ]
rocker_router_fib_event() calls fib_rule_get() during RCU dump.
If the fib_rule is dying, refcount_inc() will complain about it.
Let's call refcount_inc_not_zero() in fib_rules_dump().
--- include/net/fib_rules.h | 5 +++++ net/core/fib_rules.c | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-)
include/net/fib_rules.h +5 -0
@@ -107,6 +107,11 @@ static inline void fib_rule_get(struct fib_rule *rule)refcount_inc (&rule->refcnt); } +static inline bool fib_rule_get_safe (struct fib_rule *rule) +{ +return refcount_inc_not_zero (&rule->refcnt); +} +static inline void fib_rule_put (struct fib_rule *rule) {if (refcount_dec_and_test (&rule->refcnt))
net/core/fib_rules.c +5 -1
@@ -330,7 +330,7 @@ int fib_rules_lookup(struct fib_rules_ops *ops, struct flowi *fl,if (err != -EAGAIN ) {if ((arg->flags &FIB_LOOKUP_NOREF ) || -likely (refcount_inc_not_zero (&rule->refcnt))) { +likely (fib_rule_get_safe (rule))) { arg->rule = rule; goto out; }
@@ -388,8 +388,12 @@ int fib_rules_dump(struct net *net, struct notifier_block *nb, int family,if (!ops)return -EAFNOSUPPORT ;list_for_each_entry_rcu (rule, &ops->rules_list, list) { +if (!fib_rule_get_safe (rule)) +continue ; + err =call_fib_rule_notifier (nb,FIB_EVENT_RULE_ADD , rule, family, extack); +fib_rule_put (rule);if (err)break ; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 335/1276 bridge: cfm: reject invalid CCM interval at configuration time
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xiang Mei <[email protected]>
[ Upstream commit f3e02edd8322b31b8e6517faa6ba053bf29d1e26 ]
ccm_tx_work_expired() re-arms itself via queue_delayed_work() using the configured exp_interval converted by interval_to_us(). When exp_interval is BR_CFM_CCM_INTERVAL_NONE or out of range, interval_to_us() returns 0, causing the worker to fire immediately in a tight loop that allocates skbs until OOM.
Fix this by validating exp_interval at configuration time:
- Constrain IFLA_BRIDGE_CFM_CC_CONFIG_EXP_INTERVAL to the valid range [BR_CFM_CCM_INTERVAL_3_3_MS, BR_CFM_CCM_INTERVAL_10_MIN] in the netlink policy so userspace cannot set an invalid value.
- Reject starting CCM TX in br_cfm_cc_ccm_tx() when exp_interval has not yet been configured (defaults to 0 from kzalloc).
--- net/bridge/br_cfm.c | 6 ++++++ net/bridge/br_cfm_netlink.c | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-)
net/bridge/br_cfm.c +6 -0
@@ -805,6 +805,12 @@ int br_cfm_cc_ccm_tx(struct net_bridge *br, const u32 instance, goto save; } +if (!interval_to_us (mep->cc_config.exp_interval)) { +NL_SET_ERR_MSG_MOD (extack, +"Invalid CCM interval" ); +return -EINVAL ; + } +/* Start delayed work to transmit CCM frames. It is done with zero delay * to send first frame immediately */
net/bridge/br_cfm_netlink.c +3 -1
@@ -34,7 +34,9 @@ br_cfm_cc_config_policy[IFLA_BRIDGE_CFM_CC_CONFIG_MAX + 1] = { [IFLA_BRIDGE_CFM_CC_CONFIG_UNSPEC] = { .type = NLA_REJECT }, [IFLA_BRIDGE_CFM_CC_CONFIG_INSTANCE] = { .type = NLA_U32 }, [IFLA_BRIDGE_CFM_CC_CONFIG_ENABLE] = { .type = NLA_U32 }, - [IFLA_BRIDGE_CFM_CC_CONFIG_EXP_INTERVAL] = { .type = NLA_U32 }, + [IFLA_BRIDGE_CFM_CC_CONFIG_EXP_INTERVAL ] = +NLA_POLICY_RANGE (NLA_U32 ,BR_CFM_CCM_INTERVAL_3_3_MS , + BR_CFM_CCM_INTERVAL_10_MIN), [IFLA_BRIDGE_CFM_CC_CONFIG_EXP_MAID ] = { .type = NLA_BINARY, .len = CFM_MAID_LENGTH }, };
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 336/1276 sctp: validate embedded address parameter length
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xin Long <[email protected]>
[ Upstream commit e9361d0ca55c4af12aac09e2572852fa91046229 ]
sctp_verify_asconf() and sctp_verify_param() only validate ADD_IP, DEL_IP, and SET_PRIMARY parameters against a fixed minimum size of sizeof(struct sctp_addip_param) + sizeof(struct sctp_paramhdr). This ensures the outer parameter is large enough to contain an embedded address parameter header, but does not verify that the embedded address parameter's declared length fits within the bounds of the outer parameter.
Later, sctp_process_param() and sctp_process_asconf_param() extract the embedded address parameter and pass it to af->from_addr_param(), which uses the address parameter length to parse the variable-length address payload. A malformed peer can therefore advertise an embedded address parameter length that exceeds the remaining bytes in the enclosing parameter.
Validate that addr_param->p.length does not exceed the space available after the sctp_addip_param header before processing the embedded address parameter. Reject malformed parameters when the embedded address length extends beyond the enclosing parameter bounds.
This prevents out-of-bounds reads when parsing malformed parameters carried in INIT or ASCONF processing paths.
--- net/sctp/sm_make_chunk.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
net/sctp/sm_make_chunk.c +8 -2
@@ -2662,6 +2662,9 @@ static int sctp_process_param(struct sctp_association *asoc, goto fall_through; addr_param = param.v +sizeof (struct sctp_addip_param ); +if (ntohs (addr_param->p.length) > +ntohs (param.p->length) -sizeof (struct sctp_addip_param )) +break ; af =sctp_get_af_specific (param_type2af (addr_param->p.type));if (!af)
@@ -3060,13 +3063,16 @@ static __be16 sctp_process_asconf_param(struct sctp_association *asoc,union sctp_addr addr;struct sctp_af *af; - addr_param = (void *)asconf_param +sizeof (*asconf_param); -if (asconf_param->param_hdr.type !=SCTP_PARAM_ADD_IP && asconf_param->param_hdr.type !=SCTP_PARAM_DEL_IP && asconf_param->param_hdr.type !=SCTP_PARAM_SET_PRIMARY )return SCTP_ERROR_UNKNOWN_PARAM ; + addr_param = (void *)asconf_param +sizeof (*asconf_param); +if (ntohs (addr_param->p.length) > +ntohs (asconf_param->param_hdr.length) -sizeof (*asconf_param)) +return SCTP_ERROR_PROTO_VIOLATION ; +switch (addr_param->p.type) {case SCTP_PARAM_IPV6_ADDRESS :if (!asoc->peer.ipv6_address)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 337/1276 net: pfcp: allocate per-cpu tstats for PFCP netdevs
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Samuel Moelius <[email protected]>
[ Upstream commit 24041543da8cd84eb5d8ae738c534372fff54820 ]
PFCP uses dev_get_tstats64() as its ndo_get_stats64 callback, but pfcp_link_setup() does not request NETDEV_PCPU_STAT_TSTATS. The net core therefore leaves dev->tstats NULL for PFCP devices.
Creating a PFCP rtnetlink device can immediately ask the new netdev for stats while building the RTM_NEWLINK notification. That reaches dev_get_tstats64() and dereferences the NULL dev->tstats pointer.
Set pcpu_stat_type to NETDEV_PCPU_STAT_TSTATS during PFCP link setup so the net core allocates the storage expected by dev_get_tstats64().
--- drivers/net/pfcp.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/pfcp.c +1 -0
@@ -148,6 +148,7 @@ static void pfcp_link_setup(struct net_device *dev) dev->flags =IFF_POINTOPOINT |IFF_NOARP |IFF_MULTICAST ; dev->priv_flags |=IFF_NO_QUEUE ; + dev->pcpu_stat_type =NETDEV_PCPU_STAT_TSTATS ;netif_keep_dst (dev); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 338/1276 net/sched: sch_hfsc: Dont make class passive twice
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Victor Nogueira <[email protected]>
[ Upstream commit 90b662ea25f5e83bb3b8ccec5b93ced810b92fb8 ]
update_vf() is called from two places for the same class during a single dequeue when the class's child qdisc (e.g. codel/fq_codel) drops its last packets while dequeuing:
1. The child calls qdisc_tree_reduce_backlog(), which, now that the child is empty, invokes hfsc_qlen_notify() -> update_vf(cl, 0, 0) and turns the class passive (cl_nactive is decremented up the hierarchy).
2. hfsc_dequeue() then calls update_vf(cl, qdisc_pkt_len(skb), cur_time) to charge the dequeued bytes.
On the second call the class is already passive, but its child qdisc is still empty, so update_vf() arms go_passive again:
if (cl->qdisc->q.qlen == 0 && cl->cl_flags & HFSC_FSC)
go_passive = 1;The leaf is then skipped by the cl_nactive == 0 check inside the loop, which does not clear go_passive, so the stale go_passive propagates to the parent and decrements its cl_nactive a second time. A parent that still has other active children is driven to cl_nactive == 0 and removed from the vttree, even though those siblings are still backlogged. They are never dequeued again and the qdisc stalls.
Fix this by only arming go_passive when the class is actually active, so an already-passive class no longer triggers a second passive transition. The byte accounting (cl->cl_total += len) still runs for every ancestor, so dequeued bytes continue to be counted exactly once.
--- net/sched/sch_hfsc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sched/sch_hfsc.c +1 -1
@@ -753,7 +753,7 @@ update_vf(struct hfsc_class *cl, unsigned int len, u64 cur_time)u64 f;/* , myf_bound, delta; */ int go_passive =0 ; -if (cl->qdisc->q.qlen ==0 && cl->cl_flags &HFSC_FSC ) +if (cl->qdisc->q.qlen ==0 && cl->cl_flags &HFSC_FSC && cl->cl_nactive) go_passive =1 ;for (; cl->cl_parent !=NULL ; cl = cl->cl_parent) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 339/1276 tipc: require net admin for TIPCv2 netlink mutators
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Bommarito <[email protected]>
[ Upstream commit 86b0c540e2ea397cde021eecd24145f7c16a3d4e ]
TIPCv2 registers mutating generic-netlink operations without admin permission flags. Generic netlink only checks CAP_NET_ADMIN when an operation sets GENL_ADMIN_PERM or GENL_UNS_ADMIN_PERM, so a local unprivileged process can currently change TIPC state through commands such as TIPC_NL_NET_SET, TIPC_NL_KEY_SET, TIPC_NL_KEY_FLUSH, and bearer enable/disable.
The legacy TIPC netlink API already checks netlink_net_capable(..., CAP_NET_ADMIN) for administrative commands. Give the TIPCv2 mutators the equivalent generic-netlink gate. Use GENL_UNS_ADMIN_PERM, which maps to the same namespace-aware CAP_NET_ADMIN check that netlink_net_capable() performs, so the behaviour matches the legacy path and keeps working for CAP_NET_ADMIN holders in a non-initial user namespace (containers).
A QEMU/KASAN repro run as uid/gid 65534 with zero effective capabilities previously succeeded in changing the network id and node identity, setting and flushing key material, and enabling/disabling a UDP bearer. With this patch applied the same operations fail with -EPERM.
--- net/tipc/netlink.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
net/tipc/netlink.c +12 -0
@@ -152,11 +152,13 @@ static const struct genl_ops tipc_genl_v2_ops[] = { { .cmd = TIPC_NL_BEARER_DISABLE, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, + .flags = GENL_UNS_ADMIN_PERM, .doit = tipc_nl_bearer_disable, }, { .cmd = TIPC_NL_BEARER_ENABLE, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, + .flags = GENL_UNS_ADMIN_PERM, .doit = tipc_nl_bearer_enable, }, {
@@ -168,11 +170,13 @@ static const struct genl_ops tipc_genl_v2_ops[] = { { .cmd = TIPC_NL_BEARER_ADD, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, + .flags = GENL_UNS_ADMIN_PERM, .doit = tipc_nl_bearer_add, }, { .cmd = TIPC_NL_BEARER_SET, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, + .flags = GENL_UNS_ADMIN_PERM, .doit = tipc_nl_bearer_set, }, {
@@ -197,11 +201,13 @@ static const struct genl_ops tipc_genl_v2_ops[] = { { .cmd = TIPC_NL_LINK_SET, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, + .flags = GENL_UNS_ADMIN_PERM, .doit = tipc_nl_node_set_link, }, { .cmd = TIPC_NL_LINK_RESET_STATS, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, + .flags = GENL_UNS_ADMIN_PERM, .doit = tipc_nl_node_reset_link_stats, }, {
@@ -213,6 +219,7 @@ static const struct genl_ops tipc_genl_v2_ops[] = { { .cmd = TIPC_NL_MEDIA_SET, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, + .flags = GENL_UNS_ADMIN_PERM, .doit = tipc_nl_media_set, }, {
@@ -228,6 +235,7 @@ static const struct genl_ops tipc_genl_v2_ops[] = { { .cmd = TIPC_NL_NET_SET, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, + .flags = GENL_UNS_ADMIN_PERM, .doit = tipc_nl_net_set, }, {
@@ -238,6 +246,7 @@ static const struct genl_ops tipc_genl_v2_ops[] = { { .cmd = TIPC_NL_MON_SET, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, + .flags = GENL_UNS_ADMIN_PERM, .doit = tipc_nl_node_set_monitor, }, {
@@ -255,6 +264,7 @@ static const struct genl_ops tipc_genl_v2_ops[] = { { .cmd = TIPC_NL_PEER_REMOVE, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, + .flags = GENL_UNS_ADMIN_PERM, .doit = tipc_nl_peer_rm, },#ifdef CONFIG_TIPC_MEDIA_UDP
@@ -269,11 +279,13 @@ static const struct genl_ops tipc_genl_v2_ops[] = { { .cmd = TIPC_NL_KEY_SET, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, + .flags = GENL_UNS_ADMIN_PERM, .doit = tipc_nl_node_set_key, }, { .cmd = TIPC_NL_KEY_FLUSH, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, + .flags = GENL_UNS_ADMIN_PERM, .doit = tipc_nl_node_flush_key, }, #endif
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 340/1276 tipc: prevent snt_unacked underflow on CONN_ACK
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Bommarito <[email protected]>
[ Upstream commit ab3e10b44ba5411779aac7afd2477917dd77750f ]
tipc_sk_conn_proto_rcv() subtracts the peer-supplied connection ack count from the unsigned 16-bit send counter snt_unacked without checking that it does not exceed the number of messages actually outstanding:
tsk->snt_unacked -= msg_conn_ack(hdr);
msg_conn_ack() is read straight from a received CONN_MANAGER/CONN_ACK message. If the ack count is larger than snt_unacked, the subtraction wraps to a near-maximum value, leaving tsk_conn_cong() permanently true and starving the connection of further transmits.
Validate the ACK count at the start of the CONN_ACK block and drop the message if it acknowledges more messages than are outstanding. A peer (or, for a local connection, the connected peer socket) can otherwise wedge a TIPC connection's send side by sending an oversized connection ack.
--- net/tipc/socket.c | 3 +++ 1 file changed, 3 insertions(+)
net/tipc/socket.c +3 -0
@@ -1362,6 +1362,9 @@ static void tipc_sk_conn_proto_rcv(struct tipc_sock *tsk, struct sk_buff *skb,__skb_queue_tail (xmitq, skb);return ; }else if (mtyp ==CONN_ACK ) { +if (tsk->snt_unacked <msg_conn_ack (hdr)) + goto exit; + was_cong =tsk_conn_cong (tsk);tipc_sk_push_backlog (tsk,msg_nagle_ack (hdr)); tsk->snt_unacked -=msg_conn_ack (hdr);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 341/1276 tipc: reject inverted service ranges from peer bindings
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Bommarito <[email protected]>
[ Upstream commit 2afb648f7b99216c687db1f89739c995e1144153 ]
tipc_update_nametbl() inserts a binding advertised by a peer node using the lower and upper service-range bounds taken directly from the wire, without checking that lower <= upper. The local bind path validates the ordering (tipc_uaddr_valid()), but the name-distribution path does not.
A binding with lower > upper is inserted at the far end of the service-range rbtree (keyed on lower) where no lookup or withdrawal can ever match it (service_range_foreach_match() requires sr->lower <= end). The publication, its service_range node and the augmented rbtree entry are then leaked for the lifetime of the namespace, and there is no per-peer cap equivalent to TIPC_MAX_PUBL on locally created bindings.
Reject inverted ranges in the network path as well. A peer node can otherwise leak unbounded binding-table memory by sending PUBLICATION items with lower > upper.
--- net/tipc/name_distr.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
net/tipc/name_distr.c +11 -2
@@ -280,12 +280,21 @@ static bool tipc_update_nametbl(struct net *net, struct distr_item *i, u32 node, u32 dtype) {struct publication *p =NULL ; +u32 lower =ntohl (i->lower); +u32 upper =ntohl (i->upper);struct tipc_socket_addr sk; -struct tipc_uaddr ua;u32 key =ntohl (i->key); +struct tipc_uaddr ua; + +/* A peer-advertised binding with lower > upper can never be matched +* or withdrawn and would leak the publication; the local bind path +* rejects such ranges, so reject ranges learned from the network too. +*/ +if (lower > upper) +return false;tipc_uaddr (&ua,TIPC_SERVICE_RANGE ,TIPC_CLUSTER_SCOPE , -ntohl (i->type),ntohl (i->lower),ntohl (i->upper)); +ntohl (i->type), lower, upper); sk.ref =ntohl (i->port); sk.node = node;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 342/1276 cxl/test: Unregister cxl_acpi in cxl_test_init() error path
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Jiang <[email protected]>
[ Upstream commit 50cc34be04a0ea7522b739c9c7a71367cfbc489c ]
In cxl_test_init(), Once cxl_mock_platform_device_add() succeeds, all error paths after needs to call platform_device_unregister() instead of platform_device_put() to clean up.
--- tools/testing/cxl/test/cxl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/cxl/test/cxl.c +1 -1
@@ -1448,7 +1448,7 @@ static __init int cxl_test_init(void)return 0 ; err_root: -platform_device_put (cxl_acpi); +platform_device_unregister (cxl_acpi); err_rch:cxl_rch_topo_exit (); err_single:
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 343/1276 cxl/test: Add check after kzalloc() memory in alloc_mock_res()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Jiang <[email protected]>
[ Upstream commit dfe28c8592538152e9611341dae6f7be1735b3f1 ]
alloc_mock_res() calls kzalloc() without checking the return value. Add scope based resource management to deal with the allocated memory cleanly.
--- tools/testing/cxl/test/cxl.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
tools/testing/cxl/test/cxl.c +6 -2
@@ -402,12 +402,16 @@ static void depopulate_all_mock_resources(void)static struct cxl_mock_res *alloc_mock_res (resource_size_t size,int align) { -struct cxl_mock_res *res =kzalloc (sizeof (*res),GFP_KERNEL );struct genpool_data_align data = { .align = align, };unsigned long phys; + struct cxl_mock_res *res __free(kfree) = kzalloc(sizeof(*res), +GFP_KERNEL ); +if (!res) +return NULL ; +INIT_LIST_HEAD (&res->list); phys =gen_pool_alloc_algo (cxl_mock_pool, size, gen_pool_first_fit_align, &data);
@@ -422,7 +426,7 @@ static struct cxl_mock_res *alloc_mock_res(resource_size_t size, int align)list_add (&res->list, &mock_res);mutex_unlock (&mock_res_lock); -return res; +return no_free_ptr (res); }static int populate_cedt (void )
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 344/1276 crypto: marvell/octeontx - fix DMA cleanup using wrong loop index
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Felix Gu <[email protected]>
[ Upstream commit 7891c64c0520519782470ba29bac8a5761e295d8 ]
The sg_cleanup path used list[i] instead of list[j] when unmapping DMA buffers, leaking successfully mapped entries and repeatedly unmapping the failed one.
--- drivers/crypto/marvell/octeontx/otx_cptvf_reqmgr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/crypto/marvell/octeontx/otx_cptvf_reqmgr.c +2 -2
@@ -157,8 +157,8 @@ static inline int setup_sgio_components(struct pci_dev *pdev, sg_cleanup:for (j =0 ; j < i; j++) {if (list[j].dma_addr) { -dma_unmap_single (&pdev->dev, list[i].dma_addr, - list[i].size,DMA_BIDIRECTIONAL ); +dma_unmap_single (&pdev->dev, list[j].dma_addr, + list[j].size,DMA_BIDIRECTIONAL ); } list[j].dma_addr =0 ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 345/1276 crypto: cavium/cpt - fix DMA cleanup using wrong loop index
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Felix Gu <[email protected]>
[ Upstream commit 9dbf173bd32d5f81b005008b682bfb50aa093455 ]
The sg_cleanup error path used list[i] instead of list[j] when unmapping DMA buffers, leaking successfully mapped entries and repeatedly unmapping the failed one.
--- drivers/crypto/cavium/cpt/cptvf_reqmanager.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/crypto/cavium/cpt/cptvf_reqmanager.c +2 -2
@@ -108,8 +108,8 @@ static int setup_sgio_components(struct cpt_vf *cptvf, struct buf_ptr *list, sg_cleanup:for (j =0 ; j < i; j++) {if (list[j].dma_addr) { -dma_unmap_single (&pdev->dev, list[i].dma_addr, - list[i].size,DMA_BIDIRECTIONAL ); +dma_unmap_single (&pdev->dev, list[j].dma_addr, + list[j].size,DMA_BIDIRECTIONAL ); } list[j].dma_addr =0 ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 346/1276 crypto: rng - Free default RNG on module exit
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Herbert Xu <[email protected]>
[ Upstream commit 606ba888b98e0d26a2c4e5c8dc0542e3ad8f0f3a ]
When the rng module is removed the default RNG will be leaked. Call crypto_del_default_rng to free it if possible.
--- crypto/rng.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
crypto/rng.c +11 -0
@@ -225,5 +225,16 @@ void crypto_unregister_rngs(struct rng_alg *algs, int count) }EXPORT_SYMBOL_GPL (crypto_unregister_rngs); +static void __exit rng_exit(void) +{ +int err; + + err =crypto_del_default_rng (); +if (err) +pr_err ("Failed delete default RNG: %d\n" , err); +} + +module_exit (rng_exit); +MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Random Number Generator" );
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 347/1276 ALSA: seq: Fix kernel heap address leak in bounce_error_event()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: HanQuan <[email protected]>
[ Upstream commit efc86691e4d8083d9e380ea95042c2cf679f65fd ]
The comment above bounce_error_event() documents that user clients should receive SNDRV_SEQ_EVENT_BOUNCE with the original event embedded as variable-length data, while kernel clients should receive SNDRV_SEQ_EVENT_KERNEL_ERROR with a quoted kernel pointer.
However, the implementation unconditionally uses SNDRV_SEQ_EVENT_KERNEL_ERROR with data.quote.event set to the raw struct snd_seq_event pointer for all clients. When a bounce error event is delivered to a USER_CLIENT via snd_seq_read(), the kernel heap address in data.quote.event is exposed to userspace through copy_to_user() in the fixed-length branch.
This is a distinct leak path from the one addressed by commit 705dd6dcbc0e ("ALSA: seq: Clear variable event pointer on read"), which sanitizes data.ext.ptr in the variable-length branch of snd_seq_read(). The bounce_error_event() leak uses fixed-length events that take the else branch where no sanitization occurs.
Differentiate the bounce event by client type. For USER_CLIENT, send SNDRV_SEQ_EVENT_BOUNCE with SNDRV_SEQ_EVENT_LENGTH_VARIABLE and data.ext pointing to the original event. The variable-length path in snd_seq_event_dup() copies the event data into chained cells, and snd_seq_expand_var_event() copies only the content -- never the pointer -- to userspace. For KERNEL_CLIENT, keep the existing SNDRV_SEQ_EVENT_KERNEL_ERROR behavior with the quoted pointer.
--- sound/core/seq/seq_clientmgr.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-)
sound/core/seq/seq_clientmgr.c +27 -5
@@ -589,16 +589,38 @@ static int bounce_error_event(struct snd_seq_client *client,/* set up quoted error */ memset (&bounce_ev,0 ,sizeof (bounce_ev)); - bounce_ev.type =SNDRV_SEQ_EVENT_KERNEL_ERROR ; - bounce_ev.flags =SNDRV_SEQ_EVENT_LENGTH_FIXED ; + +if (client->type ==USER_CLIENT ) { +/* +* For user clients, send SNDRV_SEQ_EVENT_BOUNCE with the +* original event embedded as variable-length data. This +* avoids exposing data.quote.event (a kernel pointer) to +* userspace. The variable-length path in snd_seq_event_dup() +* copies the event data from data.ext.ptr into chained cells, +* and snd_seq_expand_var_event() copies only the data content +* -- never the pointer -- to userspace. +*/ + bounce_ev.type =SNDRV_SEQ_EVENT_BOUNCE ; + bounce_ev.flags =SNDRV_SEQ_EVENT_LENGTH_VARIABLE ; + bounce_ev.data.ext.len =sizeof (struct snd_seq_event ); + bounce_ev.data.ext.ptr = (char *)event; + }else { +/* +* For kernel clients, quote the event pointer directly. +* Kernel consumers can safely dereference the pointer. +*/ + bounce_ev.type =SNDRV_SEQ_EVENT_KERNEL_ERROR ; + bounce_ev.flags =SNDRV_SEQ_EVENT_LENGTH_FIXED ; + bounce_ev.data.quote.origin = event->dest; + bounce_ev.data.quote.event = event; + bounce_ev.data.quote.value = -err;/* use positive value */ + } + bounce_ev.queue =SNDRV_SEQ_QUEUE_DIRECT ; bounce_ev.source.client =SNDRV_SEQ_CLIENT_SYSTEM ; bounce_ev.source.port =SNDRV_SEQ_PORT_SYSTEM_ANNOUNCE ; bounce_ev.dest.client = client->number; bounce_ev.dest.port = event->source.port; - bounce_ev.data.quote.origin = event->dest; - bounce_ev.data.quote.event = event; - bounce_ev.data.quote.value = -err;/* use positive value */ result =snd_seq_deliver_single_event (NULL , &bounce_ev, atomic, hop +1 );if (result <0 ) { client->event_lost++;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 348/1276 spi: xilinx: use FIFO occupancy register to determine buffer size
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lars Pöschel <[email protected]>
[ Upstream commit 47f3b5365536e8c38f264824ab15fdb74454e066 ]
The method the driver uses to determine the size of the FIFO has a problem. What it currently does is this:
It stops the SPI hardware and writes to the TX FIFO register until TX FIFO FULL asserts in the status register. But the hardware does not only have the FIFO, it also has a shift register which can hold a byte. This can be seen, when writing a byte to the FIFO (while the SPI hardware is stopped,) the TX FIFO EMPTY is still empty. So, if we have a FIFO size of 16 for example, the current method returns a 17.
This is a problem, at least when using the driver in irq mode. The same size determined for the TX FIFO is also assumed for the RX FIFO. When a SPI transaction wants to write the amount of the FIFO size or more bytes, the following happens, for example with 16 bytes FIFO size:
The driver stops the SPI hardware and writes 17 bytes to the TX FIFO and starts the SPI hardware and goes sleep.
The hardware then shifts out 17 bytes (FIFO + shift register) and simultaneously reads bytes into the RX FIFO, but it only has 16 places, so it looses one byte. Then TX FIFO empty asserts, wakes the driver again, which has a fast path and reads 16 bytes from the RX FIFO, but before reading the last 17th byte (which is lost) it does this:
sr = xspi->read_fn(xspi->regs + XSPI_SR_OFFSET);
if (!(sr & XSPI_SR_RX_EMPTY_MASK)) {
xilinx_spi_rx(xspi);
rx_words--;
}It reads the status register and checks if the RX FIFO is not empty. But it is empty in our case. So this check spins in a while loop forever locking the driver.
This patch fixes the logic to determine the FIFO size.
--- drivers/spi/spi-xilinx.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/spi/spi-xilinx.c +9 -2
@@ -370,11 +370,18 @@ static int xilinx_spi_find_buffer_size(struct xilinx_spi *xspi) xspi->regs + XIPIF_V123B_RESETR_OFFSET);/* Fill the Tx FIFO with as many words as possible */ -do { +while (1 ) { xspi->write_fn (0 , xspi->regs +XSPI_TXD_OFFSET ); sr = xspi->read_fn (xspi->regs +XSPI_SR_OFFSET ); +if (sr &XSPI_SR_TX_FULL_MASK ) +break ; + n_words++; - }while (!(sr &XSPI_SR_TX_FULL_MASK )); + } + +/* Handle the NO FIFO case separately */ +if (!n_words) +return 1 ;return n_words; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 349/1276 ASoC: adau1372: Clear PLL_EN on failed PLL lock without reset GPIO
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guangshuo Li <[email protected]>
[ Upstream commit 69b4141b428bcf2cf7a863950c0d6e5c5ae89ac1 ]
The PLL lock failure path in adau1372_set_power() unwinds by putting the regmap back in cache-only mode, asserting the optional power-down GPIO and disabling mclk.
adau1372_enable_pll() enables CLK_CTRL.PLL_EN before polling the PLL lock bit. If the lock fails on a board without a power-down GPIO, the error path disables mclk and returns an error, but leaves PLL_EN set in the hardware register. The normal power-off path already handles the no-GPIO case by explicitly clearing PLL_EN.
Mirror that cleanup in the PLL lock failure path and clear PLL_EN while the regmap is still live, before switching it back to cache-only mode.
--- sound/soc/codecs/adau1372.c | 5 +++++ 1 file changed, 5 insertions(+)
sound/soc/codecs/adau1372.c +5 -0
@@ -812,6 +812,11 @@ static int adau1372_set_power(struct adau1372 *adau1372, bool enable)if (adau1372->use_pll) { ret =adau1372_enable_pll (adau1372);if (ret) { +if (!adau1372->pd_gpio) +regmap_update_bits (adau1372->regmap, +ADAU1372_REG_CLK_CTRL , +ADAU1372_CLK_CTRL_PLL_EN , +0 );regcache_cache_only (adau1372->regmap, true);if (adau1372->pd_gpio)gpiod_set_value (adau1372->pd_gpio,1 );
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 350/1276 power: supply: core: fix supplied_from allocations
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lucas Tsai <[email protected]>
[ Upstream commit ba61aed9a34671222d1149acfc2f0179a9ce7e80 ]
If dts property power-supplies has multiple values, then accessing to psy->supplied_from[i-1] in __power_supply_populate_supplied_from will overrun supplied_from array.
--- drivers/power/supply/power_supply_core.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
drivers/power/supply/power_supply_core.c +3 -8
@@ -269,18 +269,13 @@ static int power_supply_check_supplies(struct power_supply *psy)if (cnt ==1 )return 0 ; -/* All supplies found, allocate char ** array for filling */ - psy->supplied_from =devm_kzalloc (&psy->dev,sizeof (*psy->supplied_from), +/* All supplies found, allocate char * array for filling */ + psy->supplied_from =devm_kcalloc (&psy->dev, + cnt -1 ,sizeof (*psy->supplied_from),GFP_KERNEL );if (!psy->supplied_from)return -ENOMEM ; - *psy->supplied_from =devm_kcalloc (&psy->dev, - cnt -1 ,sizeof (**psy->supplied_from), -GFP_KERNEL ); -if (!*psy->supplied_from) -return -ENOMEM ; - return power_supply_populate_supplied_from(psy); }#else
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 351/1276 handshake: Require admin permission for DONE command
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chuck Lever <[email protected]>
[ Upstream commit 81246a65303d9635266b1334490142caaf86a11f ]
ACCEPT and DONE are the two downcalls of the handshake genl family, both intended for use by the trusted handshake agent (tlshd). ACCEPT already requires GENL_ADMIN_PERM; DONE has no privilege check at all.
The fd-lookup in handshake_nl_done_doit() only confirms that some pending handshake request exists for the supplied sockfd; it does not authenticate the sender. An unprivileged process that guesses or observes a valid sockfd can therefore submit a DONE with HANDSHAKE_A_DONE_STATUS == 0, leaving the kernel consumer to proceed as if the handshake succeeded. A non-zero status on a forged DONE tears down a legitimate in-flight handshake before tlshd can report its real result.
--- Documentation/netlink/specs/handshake.yaml | 1 + net/handshake/genl.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
Documentation/netlink/specs/handshake.yaml +1 -0
@@ -121,6 +121,7 @@ operations: name: done doc: Handler reports handshake completion attribute-set: done + flags: [admin-perm] do: request: attributes:
net/handshake/genl.c +1 -1
@@ -37,7 +37,7 @@ static const struct genl_split_ops handshake_nl_ops[] = { .doit = handshake_nl_done_doit, .policy = handshake_done_nl_policy, .maxattr = HANDSHAKE_A_DONE_REMOTE_AUTH, - .flags = GENL_CMD_CAP_DO, + .flags = GENL_ADMIN_PERM | GENL_CMD_CAP_DO, }, };
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 352/1276 net/sched: sch_fq_codel: Do not call qdisc_tree_reduce_backlog during peek before restoring qlen
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Victor Nogueira <[email protected]>
[ Upstream commit 097f6fc7b1ae362dd7a9444b2572162fda73b284 ]
Whenever fq_codel drops packets during peek, it calls qdisc_tree_reduce_backlog. An issue arises because it calls qdisc_tree_reduce_backlog before it reincrements the qlen. If qlen drops to zero, but peek returns an skb, the parent's qlen_notify callback will be executed even though fq_codel still has 1 packet on the queue and, thus, will mistakenly deactivate the parent's class causing issues like a recent report [1] and a wild memory access in qfq:
[ 29.371146][ T360] Oops: general protection fault, probably for non-canonical address 0xfbd59c0000000024: 0000 [#1] SMP KASAN NOPTI [ 29.371666][ T360] KASAN: maybe wild-memory-access in range [0xdead000000000120-0xdead000000000127] [ 29.371987][ T360] CPU: 6 UID: 0 PID: 360 Comm: tc Not tainted 7.1.0-rc5-00285-gc530e5b2dbc6-dirty #82 PREEMPT(full) [ 29.372384][ T360] Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011 [ 29.372620][ T360] RIP: 0010:qfq_deactivate_agg (include/linux/list.h:1029 (discriminator 2) include/linux/list.h:1043 (discriminator 2) net/sched/sch_qfq.c:1369 (discriminator 2) net/sched/sch_qfq.c:1395 (discriminator 2)) sch_qfq [ 29.373544][ T360] RSP: 0018:ffff888102417370 EFLAGS: 00010216 [ 29.373800][ T360] RAX: 0000000000000000 RBX: ffff88811224d568 RCX: dffffc0000000000 [ 29.374079][ T360] RDX: 1ffff11021fe1543 RSI: ffff88810ff0aa00 RDI: dffffc0000000000 [ 29.374368][ T360] RBP: ffff88811224c280 R08: dead000000000122 R09: 1bd5a00000000024 [ 29.374649][ T360] R10: fffffbfff7940329 R11: fffffbfff7940329 R12: 0000000000000000 [ 29.374926][ T360] R13: dead000000000100 R14: ffff88811224d580 R15: ffff88811224d578 [ 29.375207][ T360] FS: 00007f5b794e5780(0000) GS:ffff88815d1e9000(0000) knlGS:0000000000000000 [ 29.375545][ T360] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 29.375823][ T360] CR2: 000055ffb091f000 CR3: 000000010a305000 CR4: 0000000000750ef0 [ 29.376103][ T360] PKRU: 55555554 [ 29.376258][ T360] Call Trace: [ 29.376401][ T360] <TASK> ... [ 29.376885][ T360] qfq_reset_qdisc (net/sched/sch_qfq.c:357 net/sched/sch_qfq.c:1487) sch_qfq [ 29.377074][ T360] qdisc_reset (net/sched/sch_generic.c:1057) [ 29.377414][ T360] __qdisc_destroy (net/sched/sch_generic.c:1096) [ 29.377600][ T360] qdisc_graft (net/sched/sch_api.c:1062 net/sched/sch_api.c:1053 net/sched/sch_api.c:1159) [ 29.378593][ T360] tc_get_qdisc (net/sched/sch_api.c:1528 net/sched/sch_api.c:1556)
Fix this by only calling qdisc_tree_reduce_backlog in peek after the qlen is restored.
[1] http://lore.kernel.org/netdev/CAN2cbVe79oj0O9==m4+4x3v+O+qzRagA=2=wkrp9i9=CqYvyZA@mail.gmail.com/
--- net/sched/sch_fq_codel.c | 41 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-)
net/sched/sch_fq_codel.c +39 -2
@@ -278,7 +278,7 @@ static void drop_func(struct sk_buff *skb, void *ctx)qdisc_qstats_drop (sch); } -static struct sk_buff *fq_codel_dequeue (struct Qdisc *sch) +static struct sk_buff *__fq_codel_dequeue (struct Qdisc *sch) {struct fq_codel_sched_data *q =qdisc_priv (sch);struct sk_buff *skb;
@@ -315,12 +315,49 @@ static struct sk_buff *fq_codel_dequeue(struct Qdisc *sch)qdisc_bstats_update (sch, skb); flow->deficit -=qdisc_pkt_len (skb); +return skb; +} + +static void fq_codel_dequeue_drop (struct Qdisc *sch) +{ +struct fq_codel_sched_data *q =qdisc_priv (sch); +if (q->cstats.drop_count) {qdisc_tree_reduce_backlog (sch, q->cstats.drop_count, q->cstats.drop_len); q->cstats.drop_count =0 ; q->cstats.drop_len =0 ; } +} + +static struct sk_buff *fq_codel_dequeue (struct Qdisc *sch) +{ +struct sk_buff *skb; + + skb =__fq_codel_dequeue (sch); + +fq_codel_dequeue_drop (sch); + +return skb; +} + +static struct sk_buff *fq_codel_peek (struct Qdisc *sch) +{ +struct sk_buff *skb =skb_peek (&sch->gso_skb); + +if (!skb) { + skb =__fq_codel_dequeue (sch); + +if (skb) { +__skb_queue_head (&sch->gso_skb, skb); +/* it's still part of the queue */ +qdisc_qstats_backlog_inc (sch, skb); + sch->q.qlen++; + } + +fq_codel_dequeue_drop (sch); + } +return skb; }
@@ -720,7 +757,7 @@ static struct Qdisc_ops fq_codel_qdisc_ops __read_mostly = { .priv_size = sizeof(struct fq_codel_sched_data), .enqueue = fq_codel_enqueue, .dequeue = fq_codel_dequeue, - .peek = qdisc_peek_dequeued, + .peek = fq_codel_peek, .init = fq_codel_init, .reset = fq_codel_reset, .destroy = fq_codel_destroy,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 353/1276 net/sched: sch_codel: Do not call qdisc_tree_reduce_backlog during peek before restoring qlen
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Victor Nogueira <[email protected]>
[ Upstream commit 52f1da34c9f4d5bdc1e8b44242da5c7ba8db85f3 ]
Whenever codel drops packets during peek, it calls qdisc_tree_reduce_backlog. An issue arises because it calls qdisc_tree_reduce_backlog before it reincrements the qlen. If qlen drops to zero, but peek returns an skb, the parent's qlen_notify callback will be executed even though codel still has 1 packet on the queue and, thus, will mistakenly deactivate the parent's class causing issues like a wild memory access when qfq has codel as a child:
[ 36.339843][ T370] Oops: general protection fault, probably for non-canonical address 0xfbd59c0000000024: 0000 [#1] SMP KASAN NOPTI [ 36.340408][ T370] KASAN: maybe wild-memory-access in range [0xdead000000000120-0xdead000000000127] [ 36.340737][ T370] CPU: 2 UID: 0 PID: 370 Comm: tc Not tainted 7.1.0-rc5-00287-g66e13b626592 #87 PREEMPT(full) [ 36.341113][ T370] Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011 [ 36.341357][ T370] RIP: 0010:qfq_deactivate_agg (include/linux/list.h:1029 (discriminator 2) include/linux/list.h:1043 (discriminator 2) net/sched/sch_qfq.c:1369 (discriminator 2) net/sched/sch_qfq.c:1395 (discriminator 2)) sch_qfq [ 36.342221][ T370] RSP: 0018:ffff8881100ef370 EFLAGS: 00010216 [ 36.342422][ T370] RAX: 0000000000000000 RBX: ffff8881058a9568 RCX: dffffc0000000000 [ 36.342664][ T370] RDX: 1ffff11021064dc3 RSI: ffff888108326e00 RDI: dffffc0000000000 [ 36.342905][ T370] RBP: ffff8881058a8280 R08: dead000000000122 R09: 1bd5a00000000024 [ 36.343140][ T370] R10: fffffbfff2940329 R11: fffffbfff2940329 R12: 0000000000000000 [ 36.343383][ T370] R13: dead000000000100 R14: ffff8881058a9580 R15: ffff8881058a9578 [ 36.343631][ T370] FS: 00007fc04b0ca780(0000) GS:ffff888184fef000(0000) knlGS:0000000000000000 [ 36.343911][ T370] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 36.344116][ T370] CR2: 0000557c02c02000 CR3: 000000010e0ba000 CR4: 0000000000750ef0 [ 36.344359][ T370] PKRU: 55555554 [ 36.344481][ T370] Call Trace: ... [ 36.345054][ T370] qfq_reset_qdisc (net/sched/sch_qfq.c:357 net/sched/sch_qfq.c:1487) sch_qfq [ 36.345222][ T370] qdisc_reset (net/sched/sch_generic.c:1057) [ 36.345503][ T370] __qdisc_destroy (net/sched/sch_generic.c:1096) [ 36.345677][ T370] qdisc_graft (net/sched/sch_api.c:1062 net/sched/sch_api.c:1053 net/sched/sch_api.c:1159) [ 36.346335][ T370] tc_get_qdisc (net/sched/sch_api.c:1528 net/sched/sch_api.c:1556)
Fix this by only calling qdisc_tree_reduce_backlog in peek after the qlen is restored.
--- net/sched/sch_codel.c | 48 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 43 insertions(+), 5 deletions(-)
net/sched/sch_codel.c +43 -5
@@ -56,7 +56,7 @@ static void drop_func(struct sk_buff *skb, void *ctx)qdisc_qstats_drop (sch); } -static struct sk_buff *codel_qdisc_dequeue (struct Qdisc *sch) +static struct sk_buff *__codel_qdisc_dequeue (struct Qdisc *sch) {struct codel_sched_data *q =qdisc_priv (sch);struct sk_buff *skb;
@@ -65,13 +65,51 @@ static struct sk_buff *codel_qdisc_dequeue(struct Qdisc *sch) &q->stats, qdisc_pkt_len, codel_get_enqueue_time, drop_func, dequeue_func); +if (skb) +qdisc_bstats_update (sch, skb); +return skb; +} + +static void codel_dequeue_drop (struct Qdisc *sch) +{ +struct codel_sched_data *q =qdisc_priv (sch); +if (q->stats.drop_count) { -qdisc_tree_reduce_backlog (sch, q->stats.drop_count, q->stats.drop_len); +qdisc_tree_reduce_backlog (sch, q->stats.drop_count, + q->stats.drop_len); q->stats.drop_count =0 ; q->stats.drop_len =0 ; } -if (skb) -qdisc_bstats_update (sch, skb); +} + +static struct sk_buff *codel_qdisc_dequeue (struct Qdisc *sch) +{ +struct sk_buff *skb; + + skb =__codel_qdisc_dequeue (sch); + +codel_dequeue_drop (sch); + +return skb; +} + +static struct sk_buff *codel_peek (struct Qdisc *sch) +{ +struct sk_buff *skb =skb_peek (&sch->gso_skb); + +if (!skb) { + skb =__codel_qdisc_dequeue (sch); + +if (skb) { +__skb_queue_head (&sch->gso_skb, skb); +/* it's still part of the queue */ +qdisc_qstats_backlog_inc (sch, skb); + sch->q.qlen++; + } + +codel_dequeue_drop (sch); + } +return skb; }
@@ -253,7 +291,7 @@ static struct Qdisc_ops codel_qdisc_ops __read_mostly = { .enqueue = codel_qdisc_enqueue, .dequeue = codel_qdisc_dequeue, - .peek = qdisc_peek_dequeued, + .peek = codel_peek, .init = codel_init, .reset = codel_reset, .change = codel_change,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 354/1276 net: mana: initialize gdma queue id to INVALID_QUEUE_ID
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aditya Garg <[email protected]>
[ Upstream commit 5985474e1cb4034680fac2145497a94b0860be50 ]
mana_gd_create_mana_wq_cq() leaves queue->id as 0 (from kzalloc_obj()) until mana_create_wq_obj() assigns the firmware-returned id. If creation fails before that, cleanup calls mana_gd_destroy_cq() with id 0, NULLing gc->cq_table[0] and silently breaking whichever real CQ owns that slot.
Initialize queue->id to INVALID_QUEUE_ID right after allocation, matching mana_gd_create_eq(). The existing (id >= max_num_cqs) guard then short-circuits cleanly.
--- drivers/net/ethernet/microsoft/mana/gdma_main.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/microsoft/mana/gdma_main.c +2 -0
@@ -845,6 +845,8 @@ int mana_gd_create_mana_wq_cq(struct gdma_dev *gd,if (!queue)return -ENOMEM ; + queue->id =INVALID_QUEUE_ID ; + gmi = &queue->mem_info; err =mana_gd_alloc_memory (gc, spec->queue_size, gmi);if (err)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 355/1276 net: mana: guard TX wq object destroy with INVALID_MANA_HANDLE check
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aditya Garg <[email protected]>
[ Upstream commit f8fd56977eeea3d6939b1a9cd8bd36f1779b3ad0 ]
mana_create_txq() has several error paths (after mana_alloc_queues() or mana_create_wq_obj() failure) where tx_qp[i].tx_object stays as the INVALID_MANA_HANDLE sentinel set at allocation. mana_destroy_txq() then unconditionally calls mana_destroy_wq_obj() with (u64)-1, which firmware rejects and logs an error.
Mirror the RX-side pattern in mana_destroy_rxq() and skip the destroy when the handle is still INVALID_MANA_HANDLE.
--- drivers/net/ethernet/microsoft/mana/mana_en.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/microsoft/mana/mana_en.c +2 -1
@@ -1865,7 +1865,8 @@ static void mana_destroy_txq(struct mana_port_context *apc)netif_napi_del (napi); apc->tx_qp[i].txq.napi_initialized = false; } -mana_destroy_wq_obj (apc,GDMA_SQ , apc->tx_qp[i].tx_object); +if (apc->tx_qp[i].tx_object !=INVALID_MANA_HANDLE ) +mana_destroy_wq_obj (apc,GDMA_SQ , apc->tx_qp[i].tx_object);mana_deinit_cq (apc, &apc->tx_qp[i].tx_cq);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 356/1276 net: ethernet: mtk_wed: fix loading WO firmware for MT7986
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhi-Jun You <[email protected]>
[ Upstream commit 9192a18f6de2f5e3eb3813ecd2895ac0f5c008a9 ]
MT7986 requires a different mask for second WO firmware. Without this, WO would timeout after loading FW.
The correct mask was removed when adding WED for MT7988. Add it back and add a WED version check to fix it.
This can be reproduced with a MT7986 + MT7916 board.
--- drivers/net/ethernet/mediatek/mtk_wed_mcu.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/ethernet/mediatek/mtk_wed_mcu.c +6 -2
@@ -377,8 +377,12 @@ mtk_wed_mcu_load_firmware(struct mtk_wed_wo *wo)/* wo firmware reset */ wo_w32 (MTK_WO_MCU_CFG_LS_WF_MCCR_CLR_ADDR ,0xc00 ); - val =wo_r32 (MTK_WO_MCU_CFG_LS_WF_MCU_CFG_WM_WA_ADDR ) | -MTK_WO_MCU_CFG_LS_WF_WM_WA_WM_CPU_RSTB_MASK ; + val =wo_r32 (MTK_WO_MCU_CFG_LS_WF_MCU_CFG_WM_WA_ADDR ); + +if (!mtk_wed_is_v3_or_greater (wo->hw) && wo->hw->index) + val |=MTK_WO_MCU_CFG_LS_WF_WM_WA_WA_CPU_RSTB_MASK ; +else + val |=MTK_WO_MCU_CFG_LS_WF_WM_WA_WM_CPU_RSTB_MASK ;wo_w32 (MTK_WO_MCU_CFG_LS_WF_MCU_CFG_WM_WA_ADDR , val); out:release_firmware (fw);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 357/1276 bpf: Run generic devmap egress prog on private skb
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sun Jian <[email protected]>
[ Upstream commit 6001896f00984d317fb75160ba05c4a885fbe2a0 ]
Generic XDP devmap multi redirect uses skb_clone() for intermediate destinations and sends the last destination with the original skb. This can leave multiple destinations sharing the same packet data.
This becomes visible after generic devmap egress-program support was
added: a devmap egress program may mutate packet data, and another destination sharing the same data can observe that mutation.
Native XDP broadcast redirect does not have this issue because xdpf_clone() copies the frame data for each destination. Generic XDP should provide the same per-destination isolation before running a devmap egress program.
Fix this by making cloned skbs private before running the generic devmap egress program. Use skb_copy() instead of skb_unshare() so allocation failure does not consume the skb and the existing caller error paths keep their ownership semantics.
--- kernel/bpf/devmap.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
kernel/bpf/devmap.c +12 -0
@@ -698,6 +698,18 @@ int dev_map_generic_redirect(struct bpf_dtab_netdev *dst, struct sk_buff *skb,if (unlikely (err))return err; +if (dst->xdp_prog &&skb_cloned (skb)) { +struct sk_buff *nskb; + + nskb =skb_copy (skb,GFP_ATOMIC ); +if (!nskb) +return -ENOMEM ; + + nskb->mac_len = skb->mac_len; +consume_skb (skb); + skb = nskb; + } +/* Redirect has already succeeded semantically at this point, so we just * return 0 even if packet is dropped. Helper below takes care of * freeing skb.
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 358/1276 net/mlx5: Check max_macs devlink param value against max capability
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dragos Tatulea <[email protected]>
[ Upstream commit d7b0413b35715d7b32cb12d4d424613eff85ed2b ]
The max_macs devlink param is checked against the FW max value only at param register time (driver load) and inside the validate callback (devlink param set). The stored DRIVERINIT value persists across FW resets and devlink reloads without any further checks against the max.
If the FW link type changes from Ethernet to IB and a FW reset happens, the MAX cap for log_max_current_uc_list will become zero, but the previously stored max_macs value remains and is unconditionally programmed into the HCA caps in handle_hca_cap(). FW will then return a syndrome during SET_HCA_CAP:
mlx5_cmd_out_err:839:(pid 3831): SET_HCA_CAP(0x109) op_mod(0x0) failed, status bad parameter(0x3), syndrome (0x537801), err(-22) set_hca_cap:907:(pid 3831): handle_hca_cap failed
This results in a failure to register the RDMA device.
This patch skips programming log_max_current_uc_list when the MAX capability is 0 (in case of IB).
--- drivers/net/ethernet/mellanox/mlx5/core/main.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/main.c +7 -5
@@ -576,7 +576,6 @@ static int handle_hca_cap(struct mlx5_core_dev *dev, void *set_ctx) {struct mlx5_profile *prof = &dev->profile;void *set_hca_cap; -int max_uc_list;int err; err =mlx5_core_get_caps (dev,MLX5_CAP_GENERAL );
@@ -659,10 +658,13 @@ static int handle_hca_cap(struct mlx5_core_dev *dev, void *set_ctx)MLX5_SET (cmd_hca_cap, set_hca_cap, roce,mlx5_is_roce_on (dev)); - max_uc_list =max_uc_list_get_devlink_param (dev); -if (max_uc_list >0 ) -MLX5_SET (cmd_hca_cap, set_hca_cap, log_max_current_uc_list, -ilog2 (max_uc_list)); +if (MLX5_CAP_GEN_MAX (dev, log_max_current_uc_list)) { +int max_uc_list =max_uc_list_get_devlink_param (dev); + +if (max_uc_list >0 ) +MLX5_SET (cmd_hca_cap, set_hca_cap, + log_max_current_uc_list,ilog2 (max_uc_list)); + }return set_caps (dev, set_ctx,MLX5_SET_HCA_CAP_OP_MOD_GENERAL_DEVICE ); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 359/1276 octeontx2-af: npc: Fix size of entry2cntr_map
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ratheesh Kannoth <[email protected]>
[ Upstream commit f9cd6fabe0e7c7f6fc30c6c192c7ed72aba37232 ]
KASAN prints below splat. This is caused by allocating counter for reserved mcam entry for cpt 2nd pass entry. But mcam->entry2cntr_map is not allocated for reserved entries.
BUG: KASAN: slab-out-of-bounds in npc_map_mcam_entry_and_cntr+0xb0/0x1a0 Write of size 2 at addr ffff0001033e7ffe by task kworker/0:1/14 CPU: 0 PID: 14 Comm: kworker/0:1 Not tainted 6.1.67 #1 Hardware name: Marvell CN106XX board (DT) Workqueue: events work_for_cpu_fn Call trace: dump_backtrace.part.0+0xe4/0xf0 show_stack+0x18/0x30 dump_stack_lvl+0x88/0xb4 print_report+0x154/0x458 kasan_report+0xb8/0x194 __asan_store2+0x7c/0xa0 npc_map_mcam_entry_and_cntr+0xb0/0x1a0 rvu_mbox_handler_npc_mcam_write_entry+0x268/0x280 npc_install_flow+0x840/0xfe0 rvu_npc_install_cpt_pass2_entry+0x138/0x190 rvu_nix_init+0x148c/0x2880 rvu_probe+0x1800/0x30b0 local_pci_probe+0x78/0xe0 work_for_cpu_fn+0x30/0x50 process_one_work+0x4cc/0x97c worker_thread+0x360/0x630 kthread+0x1a0/0x1b0 ret_from_fork+0x10/0x20
--- .../ethernet/marvell/octeontx2/af/rvu_npc.c | 40 +++++++------------ 1 file changed, 15 insertions(+), 25 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c +15 -25
@@ -1933,7 +1933,7 @@ int npc_mcam_rsrcs_init(struct rvu *rvu, int blkaddr)/* Alloc memory for MCAM entry to counter mapping and for tracking * counter's reference count. */ - mcam->entry2cntr_map =kcalloc (mcam->bmap_entries,sizeof (u16), + mcam->entry2cntr_map =kcalloc (mcam->total_entries,sizeof (u16),GFP_KERNEL );if (!mcam->entry2cntr_map) goto free_cntr_map;
@@ -1949,10 +1949,11 @@ int npc_mcam_rsrcs_init(struct rvu *rvu, int blkaddr)if (!mcam->entry2target_pffunc) goto free_cntr_refcnt; -for (index =0 ; index < mcam->bmap_entries; index++) { +for (index =0 ; index < mcam->bmap_entries; index++) mcam->entry2pfvf_map[index] =NPC_MCAM_INVALID_MAP ; + +for (index =0 ; index < mcam->total_entries; index++) mcam->entry2cntr_map[index] =NPC_MCAM_INVALID_MAP ; - }for (cntr =0 ; cntr < mcam->counters.max; cntr++) mcam->cntr2pfvf_map[cntr] =NPC_MCAM_INVALID_MAP ;
@@ -3046,7 +3047,7 @@ int rvu_mbox_handler_npc_mcam_free_counter(struct rvu *rvu, struct npc_mcam_oper_counter_req *req, struct msg_rsp *rsp) { struct npc_mcam *mcam = &rvu->hw->mcam; -u16 index, entry =0 ; +u16 index;int blkaddr, err; blkaddr =rvu_get_blkaddr (rvu,BLKTYPE_NPC ,0 );
@@ -3064,20 +3065,16 @@ int rvu_mbox_handler_npc_mcam_free_counter(struct rvu *rvu, mcam->cntr2pfvf_map[req->cntr] =NPC_MCAM_INVALID_MAP ;rvu_free_rsrc (&mcam->counters, req->cntr); -/* Disable all MCAM entry's stats which are using this counter */ -while (entry < mcam->bmap_entries) { +/* Disable all MCAM entry's stats which are using this counter. +* Scan the full MCAM index range: AF-reserved rules (e.g. CPT pass-2) +*/ +for (index =0 ; index < mcam->total_entries; index++) {if (!mcam->cntr_refcnt[req->cntr])break ; - - index =find_next_bit (mcam->bmap, mcam->bmap_entries, entry); -if (index >= mcam->bmap_entries) -break ; - entry = index +1 ;if (mcam->entry2cntr_map[index] != req->cntr)continue ; - -npc_unmap_mcam_entry_and_cntr (rvu, mcam, blkaddr, - index, req->cntr); +npc_unmap_mcam_entry_and_cntr (rvu, mcam, blkaddr, index, + req->cntr); }mutex_unlock (&mcam->lock);
@@ -3088,7 +3085,7 @@ int rvu_mbox_handler_npc_mcam_unmap_counter(struct rvu *rvu, struct npc_mcam_unmap_counter_req *req, struct msg_rsp *rsp) { struct npc_mcam *mcam = &rvu->hw->mcam; -u16 index, entry =0 ; +u16 index;int blkaddr, rc; blkaddr =rvu_get_blkaddr (rvu,BLKTYPE_NPC ,0 );
@@ -3111,20 +3108,13 @@ int rvu_mbox_handler_npc_mcam_unmap_counter(struct rvu *rvu, }/* Disable all MCAM entry's stats which are using this counter */ -while (entry < mcam->bmap_entries) { +for (index =0 ; index < mcam->total_entries; index++) {if (!mcam->cntr_refcnt[req->cntr])break ; - - index =find_next_bit (mcam->bmap, mcam->bmap_entries, entry); -if (index >= mcam->bmap_entries) -break ; - entry = index +1 ; -if (mcam->entry2cntr_map[index] != req->cntr)continue ; - -npc_unmap_mcam_entry_and_cntr (rvu, mcam, blkaddr, - index, req->cntr); +npc_unmap_mcam_entry_and_cntr (rvu, mcam, blkaddr, index, + req->cntr); } exit:mutex_unlock (&mcam->lock);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 360/1276 net: ethernet: mtk_wed: debugfs: correct index in wed_amsdu_show()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wentao Guan <[email protected]>
[ Upstream commit 14a8bc41ce9edae42d56466063a7f2c84a16c45c ]
WED_MON_AMSDU_ENG_CNT point to different entry by 'base+n*offset' mode, correct the wed amsdu entry number in wed_amsdu_show().
--- drivers/net/ethernet/mediatek/mtk_wed_debugfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/mediatek/mtk_wed_debugfs.c +3 -3
@@ -310,9 +310,9 @@ wed_amsdu_show(struct seq_file *s, void *data) WED_AMSDU_ENG_MAX_QGPP_CNT),DUMP_WED_MASK (WED_MON_AMSDU_ENG_CNT9 (1 ),WED_AMSDU_ENG_CUR_ENTRY ), -DUMP_WED_MASK (WED_MON_AMSDU_ENG_CNT9 (2 ), +DUMP_WED_MASK (WED_MON_AMSDU_ENG_CNT9 (1 ),WED_AMSDU_ENG_MAX_BUF_MERGED ), -DUMP_WED_MASK (WED_MON_AMSDU_ENG_CNT9 (2 ), +DUMP_WED_MASK (WED_MON_AMSDU_ENG_CNT9 (1 ),WED_AMSDU_ENG_MAX_MSDU_MERGED ), DUMP_STR("WED AMDSU ENG2 INFO"),
@@ -414,7 +414,7 @@ wed_amsdu_show(struct seq_file *s, void *data) WED_AMSDU_ENG_CUR_ENTRY),DUMP_WED_MASK (WED_MON_AMSDU_ENG_CNT9 (7 ),WED_AMSDU_ENG_MAX_BUF_MERGED ), -DUMP_WED_MASK (WED_MON_AMSDU_ENG_CNT9 (4 ), +DUMP_WED_MASK (WED_MON_AMSDU_ENG_CNT9 (7 ),WED_AMSDU_ENG_MAX_MSDU_MERGED ), DUMP_STR("WED AMDSU ENG8 INFO"),
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 361/1276 net: wwan: t7xx: check skb_clone in control TX
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ruoyu Wang <[email protected]>
[ Upstream commit 05f789fa90d95d5771230e78453cedff2486039d ]
t7xx_port_ctrl_tx() clones each skb fragment before passing it to the port transmit path. The clone is used immediately to set cloned->len, so an skb_clone() failure results in a NULL pointer dereference.
Check the clone before using it. If previous fragments were already queued, preserve the driver's existing partial-write behavior by returning the number of bytes submitted so far.
--- drivers/net/wwan/t7xx/t7xx_port_wwan.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wwan/t7xx/t7xx_port_wwan.c +2 -0
@@ -106,6 +106,8 @@ static int t7xx_port_ctrl_tx(struct t7xx_port *port, struct sk_buff *skb)while (cur) { cloned =skb_clone (cur,GFP_KERNEL ); +if (!cloned) +return cnt ? cnt : -ENOMEM ; cloned->len =skb_headlen (cur); ret =t7xx_port_send_skb (port, cloned,0 ,0 );if (ret) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 362/1276 dpll: add reference-sync netlink attribute
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arkadiusz Kubalewski <[email protected]>
[ Upstream commit 7f15ee35972dd3dee37704bfd0f136290f6d63d9 ]
Add new netlink attribute to allow user space configuration of reference sync pin pairs, where both pins are used to provide one clock signal consisting of both: base frequency and sync signal.
Stable-dep-of: 32239d600236 ("dpll: fix stale iteration in dpll_pin_on_pin_unregister()")
--- Documentation/driver-api/dpll.rst | 25 +++++++++++++++++++++++++ Documentation/netlink/specs/dpll.yaml | 19 +++++++++++++++++++ drivers/dpll/dpll_nl.c | 10 ++++++++-- drivers/dpll/dpll_nl.h | 1 + include/uapi/linux/dpll.h | 1 + 5 files changed, 54 insertions(+), 2 deletions(-)
Documentation/driver-api/dpll.rst +25 -0
@@ -235,6 +235,31 @@ the pin. ``DPLL_A_PIN_ESYNC_PULSE`` pulse type of Embedded SYNC ========================================= ================================= +Reference SYNC +============== + +The device may support the Reference SYNC feature, which allows the combination +of two inputs into a input pair. In this configuration, clock signals +from both inputs are used to synchronize the DPLL device. The higher frequency +signal is utilized for the loop bandwidth of the DPLL, while the lower frequency +signal is used to syntonize the output signal of the DPLL device. This feature +enables the provision of a high-quality loop bandwidth signal from an external +source. + +A capable input provides a list of inputs that can be bound with to create +Reference SYNC. To control this feature, the user must request a desired +state for a target pin: use ``DPLL_PIN_STATE_CONNECTED`` to enable or +``DPLL_PIN_STATE_DISCONNECTED`` to disable the feature. An input pin can be +bound to only one other pin at any given time. + + ============================== ========================================== + ``DPLL_A_PIN_REFERENCE_SYNC`` nested attribute for providing info or + requesting configuration of the Reference + SYNC feature + ``DPLL_A_PIN_ID`` target pin id for Reference SYNC feature + ``DPLL_A_PIN_STATE`` state of Reference SYNC connection + ============================== ========================================== + Configuration commands group ============================
Documentation/netlink/specs/dpll.yaml +19 -0
@@ -365,6 +365,15 @@ attribute-sets: doc: | A ratio of high to low state of a SYNC signal pulse embedded into base clock frequency. Value is in percents. + - + name: reference-sync + type: nest + multi-attr: true + nested-attributes: reference-sync + doc: | + Capable pin provides list of pins that can be bound to create a + reference-sync pin pair. + - name: pin-parent-device subset-of: pin
@@ -395,6 +404,14 @@ attribute-sets: name: frequency-min - name: frequency-max + - + name: reference-sync + subset-of: pin + attributes: + - + name: id + - + name: state operations: enum-name: dpll_cmd
@@ -535,6 +552,7 @@ operations: - esync-frequency - esync-frequency-supported - esync-pulse + - reference-sync dump: request:
@@ -562,6 +580,7 @@ operations: - parent-pin - phase-adjust - esync-frequency + - reference-sync - name: pin-create-ntf doc: Notification about pin appearing
drivers/dpll/dpll_nl.c +8 -2
@@ -24,6 +24,11 @@ const struct nla_policy dpll_pin_parent_pin_nl_policy[DPLL_A_PIN_STATE + 1] = { [DPLL_A_PIN_STATE] = NLA_POLICY_RANGE(NLA_U32, 1, 3), }; +const struct nla_policy dpll_reference_sync_nl_policy[DPLL_A_PIN_STATE +1 ] = { + [DPLL_A_PIN_ID ] = { .type =NLA_U32 , }, + [DPLL_A_PIN_STATE ] =NLA_POLICY_RANGE (NLA_U32 ,1 ,3 ), +}; +/* DPLL_CMD_DEVICE_ID_GET - do */ static const struct nla_policy dpll_device_id_get_nl_policy[DPLL_A_TYPE +1 ] = { [DPLL_A_MODULE_NAME ] = { .type =NLA_NUL_STRING , },
@@ -62,7 +67,7 @@ static const struct nla_policy dpll_pin_get_dump_nl_policy[DPLL_A_PIN_ID + 1] = };/* DPLL_CMD_PIN_SET - do */ -static const struct nla_policy dpll_pin_set_nl_policy[DPLL_A_PIN_ESYNC_FREQUENCY +1 ] = { +static const struct nla_policy dpll_pin_set_nl_policy[DPLL_A_PIN_REFERENCE_SYNC +1 ] = { [DPLL_A_PIN_ID ] = { .type =NLA_U32 , }, [DPLL_A_PIN_FREQUENCY ] = { .type =NLA_U64 , }, [DPLL_A_PIN_DIRECTION ] =NLA_POLICY_RANGE (NLA_U32 ,1 ,2 ),
@@ -72,6 +77,7 @@ static const struct nla_policy dpll_pin_set_nl_policy[DPLL_A_PIN_ESYNC_FREQUENCY [DPLL_A_PIN_PARENT_PIN] = NLA_POLICY_NESTED(dpll_pin_parent_pin_nl_policy), [DPLL_A_PIN_PHASE_ADJUST] = { .type = NLA_S32, }, [DPLL_A_PIN_ESYNC_FREQUENCY] = { .type = NLA_U64, }, + [DPLL_A_PIN_REFERENCE_SYNC] = NLA_POLICY_NESTED(dpll_reference_sync_nl_policy), };/* Ops table for dpll */
@@ -139,7 +145,7 @@ static const struct genl_split_ops dpll_nl_ops[] = { .doit = dpll_nl_pin_set_doit, .post_doit = dpll_pin_post_doit, .policy = dpll_pin_set_nl_policy, - .maxattr = DPLL_A_PIN_ESYNC_FREQUENCY, + .maxattr = DPLL_A_PIN_REFERENCE_SYNC, .flags = GENL_ADMIN_PERM | GENL_CMD_CAP_DO, }, };
drivers/dpll/dpll_nl.h +1 -0
@@ -14,6 +14,7 @@/* Common nested types */ extern const struct nla_policy dpll_pin_parent_device_nl_policy[DPLL_A_PIN_PHASE_OFFSET +1 ];extern const struct nla_policy dpll_pin_parent_pin_nl_policy[DPLL_A_PIN_STATE +1 ]; +extern const struct nla_policy dpll_reference_sync_nl_policy[DPLL_A_PIN_STATE +1 ];int dpll_lock_doit (const struct genl_split_ops *ops,struct sk_buff *skb,struct genl_info *info);
include/uapi/linux/dpll.h +1 -0
@@ -213,6 +213,7 @@ enum dpll_a_pin {DPLL_A_PIN_ESYNC_FREQUENCY ,DPLL_A_PIN_ESYNC_FREQUENCY_SUPPORTED ,DPLL_A_PIN_ESYNC_PULSE , +DPLL_A_PIN_REFERENCE_SYNC , __DPLL_A_PIN_MAX,DPLL_A_PIN_MAX = (__DPLL_A_PIN_MAX -1 )
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 363/1276 dpll: add reference sync get/set
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arkadiusz Kubalewski <[email protected]>
[ Upstream commit 58256a26bfb37a94738dd65618b1f31f460f8d91 ]
Define function for reference sync pin registration and callback ops to set/get current feature state.
Implement netlink handler to fill netlink messages with reference sync pin configuration of capable pins (pin-get).
Implement netlink handler to call proper ops and configure reference sync pin state (pin-set).
Stable-dep-of: 32239d600236 ("dpll: fix stale iteration in dpll_pin_on_pin_unregister()")
--- drivers/dpll/dpll_core.c | 45 +++++++++ drivers/dpll/dpll_core.h | 2 + drivers/dpll/dpll_netlink.c | 190 ++++++++++++++++++++++++++++++++---- drivers/dpll/dpll_netlink.h | 2 + include/linux/dpll.h | 13 +++ 5 files changed, 233 insertions(+), 19 deletions(-)
drivers/dpll/dpll_core.c +45 -0
@@ -502,6 +502,7 @@ dpll_pin_alloc(u64 clock_id, u32 pin_idx, struct module *module,refcount_set (&pin->refcount,1 );xa_init_flags (&pin->dpll_refs,XA_FLAGS_ALLOC );xa_init_flags (&pin->parent_refs,XA_FLAGS_ALLOC ); +xa_init_flags (&pin->ref_sync_pins,XA_FLAGS_ALLOC ); ret =xa_alloc_cyclic (&dpll_pin_xa, &pin->id, pin, xa_limit_32b, &dpll_pin_xa_id,GFP_KERNEL );if (ret <0 )
@@ -510,6 +511,7 @@ dpll_pin_alloc(u64 clock_id, u32 pin_idx, struct module *module, err_xa_alloc:xa_destroy (&pin->dpll_refs);xa_destroy (&pin->parent_refs); +xa_destroy (&pin->ref_sync_pins);dpll_pin_prop_free (&pin->prop); err_pin_prop:kfree (pin);
@@ -591,6 +593,7 @@ void dpll_pin_put(struct dpll_pin *pin)xa_erase (&dpll_pin_xa, pin->id);xa_destroy (&pin->dpll_refs);xa_destroy (&pin->parent_refs); +xa_destroy (&pin->ref_sync_pins);dpll_pin_prop_free (&pin->prop);kfree_rcu (pin, rcu); }
@@ -655,11 +658,26 @@ dpll_pin_register(struct dpll_device *dpll, struct dpll_pin *pin, }EXPORT_SYMBOL_GPL (dpll_pin_register); +static void dpll_pin_ref_sync_pair_del (u32 ref_sync_pin_id) +{ +struct dpll_pin *pin, *ref_sync_pin; +unsigned long i; + +xa_for_each (&dpll_pin_xa, i, pin) { + ref_sync_pin =xa_load (&pin->ref_sync_pins, ref_sync_pin_id); +if (ref_sync_pin) { +xa_erase (&pin->ref_sync_pins, ref_sync_pin_id); +__dpll_pin_change_ntf (pin); + } + } +} +static void __dpll_pin_unregister (struct dpll_device *dpll,struct dpll_pin *pin,const struct dpll_pin_ops *ops,void *priv,void *cookie) {ASSERT_DPLL_PIN_REGISTERED (pin); +dpll_pin_ref_sync_pair_del (pin->id);dpll_xa_ref_pin_del (&dpll->pin_refs, pin, ops, priv, cookie);dpll_xa_ref_dpll_del (&pin->dpll_refs, dpll, ops, priv, cookie);if (xa_empty (&pin->dpll_refs))
@@ -779,6 +797,33 @@ void dpll_pin_on_pin_unregister(struct dpll_pin *parent, struct dpll_pin *pin, }EXPORT_SYMBOL_GPL (dpll_pin_on_pin_unregister); +/** +* dpll_pin_ref_sync_pair_add - create a reference sync signal pin pair +* @pin: pin which produces the base frequency +* @ref_sync_pin: pin which produces the sync signal +* +* Once pins are paired, the user-space configuration of reference sync pair +* is possible. +* Context: Acquires a lock (dpll_lock) +* Return: +* * 0 on success +* * negative - error value +*/ +int dpll_pin_ref_sync_pair_add (struct dpll_pin *pin, +struct dpll_pin *ref_sync_pin) +{ +int ret; + +mutex_lock (&dpll_lock); + ret =xa_insert (&pin->ref_sync_pins, ref_sync_pin->id, + ref_sync_pin,GFP_KERNEL ); +__dpll_pin_change_ntf (pin); +mutex_unlock (&dpll_lock); + +return ret; +} +EXPORT_SYMBOL_GPL (dpll_pin_ref_sync_pair_add); +static struct dpll_device_registration *dpll_device_registration_first (struct dpll_device *dpll) {
drivers/dpll/dpll_core.h +2 -0
@@ -44,6 +44,7 @@ struct dpll_device {* @module: module of creator * @dpll_refs: hold referencees to dplls pin was registered with * @parent_refs: hold references to parent pins pin was registered with +* @ref_sync_pins: hold references to pins for Reference SYNC feature * @prop: pin properties copied from the registerer * @rclk_dev_name: holds name of device when pin can recover clock from it * @refcount: refcount
@@ -56,6 +57,7 @@ struct dpll_pin {struct module *module;struct xarray dpll_refs;struct xarray parent_refs; +struct xarray ref_sync_pins;struct dpll_pin_properties prop;refcount_t refcount;struct rcu_head rcu;
drivers/dpll/dpll_netlink.c +171 -19
232 lines not on this page · raw message
drivers/dpll/dpll_netlink.h +2 -0
@@ -11,3 +11,5 @@ int dpll_device_delete_ntf(struct dpll_device *dpll);int dpll_pin_create_ntf (struct dpll_pin *pin);int dpll_pin_delete_ntf (struct dpll_pin *pin); + +int __dpll_pin_change_ntf (struct dpll_pin *pin);
include/linux/dpll.h +13 -0
@@ -91,6 +91,16 @@ struct dpll_pin_ops { const struct dpll_device *dpll, void *dpll_priv, struct dpll_pin_esync *esync, struct netlink_ext_ack *extack); +int (*ref_sync_set)(const struct dpll_pin *pin,void *pin_priv, +const struct dpll_pin *ref_sync_pin, +void *ref_sync_pin_priv, +const enum dpll_pin_state state, +struct netlink_ext_ack *extack); +int (*ref_sync_get)(const struct dpll_pin *pin,void *pin_priv, +const struct dpll_pin *ref_sync_pin, +void *ref_sync_pin_priv, +enum dpll_pin_state *state, +struct netlink_ext_ack *extack); };struct dpll_pin_frequency {
@@ -190,6 +200,9 @@ int dpll_pin_on_pin_register(struct dpll_pin *parent, struct dpll_pin *pin,void dpll_pin_on_pin_unregister (struct dpll_pin *parent,struct dpll_pin *pin,const struct dpll_pin_ops *ops,void *priv); +int dpll_pin_ref_sync_pair_add (struct dpll_pin *pin, +struct dpll_pin *ref_sync_pin); +int dpll_device_change_ntf (struct dpll_device *dpll);int dpll_pin_change_ntf (struct dpll_pin *pin);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 364/1276 dpll: Allow associating dpll pin with a firmware node
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ivan Vecera <[email protected]>
[ Upstream commit d0f4771e2befbe8de3a16a564c6bbd1d5502cec3 ]
Extend the DPLL core to support associating a DPLL pin with a firmware node. This association is required to allow other subsystems (such as network drivers) to locate and request specific DPLL pins defined in the Device Tree or ACPI.
* Add a .fwnode field to the struct dpll_pin
* Introduce dpll_pin_fwnode_set() helper to allow the provider driver to associate a pin with a fwnode after the pin has been allocated
* Introduce fwnode_dpll_pin_find() helper to allow consumers to search for a registered DPLL pin using its associated fwnode handle
* Ensure the fwnode reference is properly released in dpll_pin_put()
Stable-dep-of: 32239d600236 ("dpll: fix stale iteration in dpll_pin_on_pin_unregister()")
--- drivers/dpll/dpll_core.c | 49 ++++++++++++++++++++++++++++++++++++++++ drivers/dpll/dpll_core.h | 2 ++ include/linux/dpll.h | 11 +++++++++ 3 files changed, 62 insertions(+)
drivers/dpll/dpll_core.c +49 -0
@@ -10,6 +10,7 @@#include <linux/device.h> #include <linux/err.h> +#include <linux/property.h> #include <linux/slab.h> #include <linux/string.h>
@@ -595,12 +596,60 @@ void dpll_pin_put(struct dpll_pin *pin)xa_destroy (&pin->parent_refs);xa_destroy (&pin->ref_sync_pins);dpll_pin_prop_free (&pin->prop); +fwnode_handle_put (pin->fwnode);kfree_rcu (pin, rcu); }mutex_unlock (&dpll_lock); }EXPORT_SYMBOL_GPL (dpll_pin_put); +/** +* dpll_pin_fwnode_set - set dpll pin firmware node reference +* @pin: pointer to a dpll pin +* @fwnode: firmware node handle +* +* Set firmware node handle for the given dpll pin. +*/ +void dpll_pin_fwnode_set (struct dpll_pin *pin,struct fwnode_handle *fwnode) +{ +mutex_lock (&dpll_lock); +fwnode_handle_put (pin->fwnode);/* Drop fwnode previously set */ + pin->fwnode =fwnode_handle_get (fwnode); +mutex_unlock (&dpll_lock); +} +EXPORT_SYMBOL_GPL (dpll_pin_fwnode_set); + +/** +* fwnode_dpll_pin_find - find dpll pin by firmware node reference +* @fwnode: reference to firmware node +* +* Get existing object of a pin that is associated with given firmware node +* reference. +* +* Context: Acquires a lock (dpll_lock) +* Return: +* * valid dpll_pin pointer on success +* * NULL when no such pin exists +*/ +struct dpll_pin *fwnode_dpll_pin_find (struct fwnode_handle *fwnode) +{ +struct dpll_pin *pin, *ret =NULL ; +unsigned long index; + +mutex_lock (&dpll_lock); +xa_for_each (&dpll_pin_xa, index, pin) { +if (pin->fwnode == fwnode) { + ret = pin; +refcount_inc (&ret->refcount); +break ; + } + } +mutex_unlock (&dpll_lock); + +return ret; +} +EXPORT_SYMBOL_GPL (fwnode_dpll_pin_find); +static int __dpll_pin_register (struct dpll_device *dpll,struct dpll_pin *pin,const struct dpll_pin_ops *ops,void *priv,void *cookie)
drivers/dpll/dpll_core.h +2 -0
@@ -42,6 +42,7 @@ struct dpll_device {* @pin_idx: index of a pin given by dev driver * @clock_id: clock_id of creator * @module: module of creator +* @fwnode: optional reference to firmware node * @dpll_refs: hold referencees to dplls pin was registered with * @parent_refs: hold references to parent pins pin was registered with * @ref_sync_pins: hold references to pins for Reference SYNC feature
@@ -55,6 +56,7 @@ struct dpll_pin {u32 pin_idx;u64 clock_id;struct module *module; +struct fwnode_handle *fwnode;struct xarray dpll_refs;struct xarray parent_refs;struct xarray ref_sync_pins;
include/linux/dpll.h +11 -0
@@ -16,6 +16,7 @@struct dpll_device ;struct dpll_pin ;struct dpll_pin_esync ; +struct fwnode_handle ;struct dpll_device_ops { int (*mode_get)(const struct dpll_device *dpll, void *dpll_priv,
@@ -154,6 +155,8 @@ void dpll_netdev_pin_clear(struct net_device *dev);size_t dpll_netdev_pin_handle_size (const struct net_device *dev);int dpll_netdev_add_pin_handle (struct sk_buff *msg,const struct net_device *dev); + +struct dpll_pin *fwnode_dpll_pin_find (struct fwnode_handle *fwnode);#else static inline void dpll_netdev_pin_set (struct net_device *dev,struct dpll_pin *dpll_pin) { }
@@ -169,6 +172,12 @@ dpll_netdev_add_pin_handle(struct sk_buff *msg, const struct net_device *dev) {return 0 ; } + +static inline struct dpll_pin * +fwnode_dpll_pin_find (struct fwnode_handle *fwnode) +{ +return NULL ; +}#endif struct dpll_device *
@@ -194,6 +203,8 @@ void dpll_pin_unregister(struct dpll_device *dpll, struct dpll_pin *pin,void dpll_pin_put (struct dpll_pin *pin); +void dpll_pin_fwnode_set (struct dpll_pin *pin,struct fwnode_handle *fwnode); +int dpll_pin_on_pin_register (struct dpll_pin *parent,struct dpll_pin *pin,const struct dpll_pin_ops *ops,void *priv);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 365/1276 dpll: Add notifier chain for dpll events
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Petr Oros <[email protected]>
[ Upstream commit 2be467588d6bc6ec5988fc254e62a44b865912a0 ]
Currently, the DPLL subsystem reports events (creation, deletion, changes) to userspace via Netlink. However, there is no mechanism for other kernel components to be notified of these events directly.
Add a raw notifier chain to the DPLL core protected by dpll_lock. This allows other kernel subsystems or drivers to register callbacks and receive notifications when DPLL devices or pins are created, deleted, or modified.
Define the following:
- Registration helpers: {,un}register_dpll_notifier()
- Event types: DPLL_DEVICE_CREATED, DPLL_PIN_CREATED, etc.
- Context structures: dpll_{device,pin}_notifier_info to pass relevant data to the listeners.
The notification chain is invoked alongside the existing Netlink event generation to ensure in-kernel listeners are kept in sync with the subsystem state.
Stable-dep-of: 32239d600236 ("dpll: fix stale iteration in dpll_pin_on_pin_unregister()")
--- drivers/dpll/dpll_core.c | 57 +++++++++++++++++++++++++++++++++++++ drivers/dpll/dpll_core.h | 4 +++ drivers/dpll/dpll_netlink.c | 6 ++++ include/linux/dpll.h | 29 +++++++++++++++++++ 4 files changed, 96 insertions(+)
drivers/dpll/dpll_core.c +57 -0
@@ -23,6 +23,8 @@ DEFINE_MUTEX(dpll_lock);DEFINE_XARRAY_FLAGS (dpll_device_xa,XA_FLAGS_ALLOC );DEFINE_XARRAY_FLAGS (dpll_pin_xa,XA_FLAGS_ALLOC ); +static RAW_NOTIFIER_HEAD (dpll_notifier_chain); +static u32 dpll_device_xa_id;static u32 dpll_pin_xa_id;
@@ -46,6 +48,39 @@ struct dpll_pin_registration {void *cookie; }; +static int call_dpll_notifiers (unsigned long action,void *info) +{ +lockdep_assert_held (&dpll_lock); +return raw_notifier_call_chain (&dpll_notifier_chain, action, info); +} + +void dpll_device_notify (struct dpll_device *dpll,unsigned long action) +{ +struct dpll_device_notifier_info info = { + .dpll = dpll, + .id = dpll->id, + .idx = dpll->device_idx, + .clock_id = dpll->clock_id, + .type = dpll->type, + }; + +call_dpll_notifiers (action, &info); +} + +void dpll_pin_notify (struct dpll_pin *pin,unsigned long action) +{ +struct dpll_pin_notifier_info info = { + .pin = pin, + .id = pin->id, + .idx = pin->pin_idx, + .clock_id = pin->clock_id, + .fwnode = pin->fwnode, + .prop = &pin->prop, + }; + +call_dpll_notifiers (action, &info); +} +struct dpll_device *dpll_device_get_by_id (int id) {if (xa_get_mark (&dpll_device_xa, id,DPLL_REGISTERED ))
@@ -539,6 +574,28 @@ void dpll_netdev_pin_clear(struct net_device *dev) }EXPORT_SYMBOL (dpll_netdev_pin_clear); +int register_dpll_notifier (struct notifier_block *nb) +{ +int ret; + +mutex_lock (&dpll_lock); + ret =raw_notifier_chain_register (&dpll_notifier_chain, nb); +mutex_unlock (&dpll_lock); +return ret; +} +EXPORT_SYMBOL_GPL (register_dpll_notifier); + +int unregister_dpll_notifier (struct notifier_block *nb) +{ +int ret; + +mutex_lock (&dpll_lock); + ret =raw_notifier_chain_unregister (&dpll_notifier_chain, nb); +mutex_unlock (&dpll_lock); +return ret; +} +EXPORT_SYMBOL_GPL (unregister_dpll_notifier); +/** * dpll_pin_get - find existing or create new dpll pin * @clock_id: clock_id of creator
drivers/dpll/dpll_core.h +4 -0
@@ -92,4 +92,8 @@ struct dpll_pin_ref *dpll_xa_ref_dpll_first(struct xarray *xa_refs);extern struct xarray dpll_device_xa;extern struct xarray dpll_pin_xa;extern struct mutex dpll_lock; + +void dpll_device_notify (struct dpll_device *dpll,unsigned long action); +void dpll_pin_notify (struct dpll_pin *pin,unsigned long action); +#endif
drivers/dpll/dpll_netlink.c +6 -0
@@ -667,17 +667,20 @@ dpll_device_event_send(enum dpll_cmd event, struct dpll_device *dpll)int dpll_device_create_ntf (struct dpll_device *dpll) { +dpll_device_notify (dpll,DPLL_DEVICE_CREATED );return dpll_device_event_send (DPLL_CMD_DEVICE_CREATE_NTF , dpll); }int dpll_device_delete_ntf (struct dpll_device *dpll) { +dpll_device_notify (dpll,DPLL_DEVICE_DELETED );return dpll_device_event_send (DPLL_CMD_DEVICE_DELETE_NTF , dpll); }static int __dpll_device_change_ntf (struct dpll_device *dpll) { +dpll_device_notify (dpll,DPLL_DEVICE_CHANGED );return dpll_device_event_send (DPLL_CMD_DEVICE_CHANGE_NTF , dpll); }
@@ -735,16 +738,19 @@ dpll_pin_event_send(enum dpll_cmd event, struct dpll_pin *pin)int dpll_pin_create_ntf (struct dpll_pin *pin) { +dpll_pin_notify (pin,DPLL_PIN_CREATED );return dpll_pin_event_send (DPLL_CMD_PIN_CREATE_NTF , pin); }int dpll_pin_delete_ntf (struct dpll_pin *pin) { +dpll_pin_notify (pin,DPLL_PIN_DELETED );return dpll_pin_event_send (DPLL_CMD_PIN_DELETE_NTF , pin); }int __dpll_pin_change_ntf (struct dpll_pin *pin) { +dpll_pin_notify (pin,DPLL_PIN_CHANGED );return dpll_pin_event_send (DPLL_CMD_PIN_CHANGE_NTF , pin); }
include/linux/dpll.h +29 -0
@@ -11,6 +11,7 @@#include <linux/device.h> #include <linux/netlink.h> #include <linux/netdevice.h> +#include <linux/notifier.h> #include <linux/rtnetlink.h> struct dpll_device ;
@@ -148,6 +149,30 @@ struct dpll_pin_properties {struct dpll_pin_phase_adjust_range phase_range; }; +#define DPLL_DEVICE_CREATED 1 +#define DPLL_DEVICE_DELETED 2 +#define DPLL_DEVICE_CHANGED 3 +#define DPLL_PIN_CREATED 4 +#define DPLL_PIN_DELETED 5 +#define DPLL_PIN_CHANGED 6 + +struct dpll_device_notifier_info { +struct dpll_device *dpll; +u32 id; +u32 idx; +u64 clock_id; +enum dpll_type type; +}; + +struct dpll_pin_notifier_info { +struct dpll_pin *pin; +u32 id; +u32 idx; +u64 clock_id; +const struct fwnode_handle *fwnode; +const struct dpll_pin_properties *prop; +}; +#if IS_ENABLED (CONFIG_DPLL )void dpll_netdev_pin_set (struct net_device *dev,struct dpll_pin *dpll_pin);void dpll_netdev_pin_clear (struct net_device *dev);
@@ -218,4 +243,8 @@ int dpll_device_change_ntf(struct dpll_device *dpll);int dpll_pin_change_ntf (struct dpll_pin *pin); +int register_dpll_notifier (struct notifier_block *nb); + +int unregister_dpll_notifier (struct notifier_block *nb); +#endif
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 366/1276 dpll: Support dynamic pin index allocation
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ivan Vecera <[email protected]>
[ Upstream commit 711696b3e168cea4165e7b7f051f3f442a347430 ]
Allow drivers to register DPLL pins without manually specifying a pin index.
Currently, drivers must provide a unique pin index when calling dpll_pin_get(). This works well for hardware-mapped pins but creates friction for drivers handling virtual pins or those without a strict hardware indexing scheme.
Introduce DPLL_PIN_IDX_UNSPEC (U32_MAX). When a driver passes this value as the pin index:
1. The core allocates a unique index using an IDA
2. The allocated index is mapped to a range starting above INT_MAX
This separation ensures that dynamically allocated indices never collide with standard driver-provided hardware indices, which are assumed to be within the 0 to INT_MAX range. The index is automatically freed when the pin is released in dpll_pin_put().
Stable-dep-of: 32239d600236 ("dpll: fix stale iteration in dpll_pin_on_pin_unregister()")
--- drivers/dpll/dpll_core.c | 48 ++++++++++++++++++++++++++++++++++++++-- include/linux/dpll.h | 2 ++ 2 files changed, 48 insertions(+), 2 deletions(-)
drivers/dpll/dpll_core.c +46 -2
@@ -10,6 +10,7 @@#include <linux/device.h> #include <linux/err.h> +#include <linux/idr.h> #include <linux/property.h> #include <linux/slab.h> #include <linux/string.h>
@@ -24,6 +25,7 @@ DEFINE_XARRAY_FLAGS(dpll_device_xa, XA_FLAGS_ALLOC);DEFINE_XARRAY_FLAGS (dpll_pin_xa,XA_FLAGS_ALLOC );static RAW_NOTIFIER_HEAD (dpll_notifier_chain); +static DEFINE_IDA (dpll_pin_idx_ida);static u32 dpll_device_xa_id;static u32 dpll_pin_xa_id;
@@ -464,6 +466,36 @@ void dpll_device_unregister(struct dpll_device *dpll, }EXPORT_SYMBOL_GPL (dpll_device_unregister); +static int dpll_pin_idx_alloc (u32 *pin_idx) +{ +int ret; + +if (!pin_idx) +return -EINVAL ; + +/* Alloc unique number from IDA. Number belongs to <0, INT_MAX> range */ + ret =ida_alloc (&dpll_pin_idx_ida,GFP_KERNEL ); +if (ret <0 ) +return ret; + +/* Map the value to dynamic pin index range <INT_MAX+1, U32_MAX> */ + *pin_idx = (u32 )ret +INT_MAX +1 ; + +return 0 ; +} + +static void dpll_pin_idx_free (u32 pin_idx) +{ +if (pin_idx <=INT_MAX ) +return ;/* Not a dynamic pin index */ + +/* Map the index value from dynamic pin index range to IDA range and +* free it. +*/ + pin_idx -= (u32 )INT_MAX +1 ; +ida_free (&dpll_pin_idx_ida, pin_idx); +} +static void dpll_pin_prop_free (struct dpll_pin_properties *prop) {kfree (prop->package_label);
@@ -521,9 +553,18 @@ dpll_pin_alloc(u64 clock_id, u32 pin_idx, struct module *module,struct dpll_pin *pin;int ret; +if (pin_idx ==DPLL_PIN_IDX_UNSPEC ) { + ret =dpll_pin_idx_alloc (&pin_idx); +if (ret) +return ERR_PTR (ret); + }else if (pin_idx >INT_MAX ) { +return ERR_PTR (-EINVAL ); + } pin =kzalloc (sizeof (*pin),GFP_KERNEL ); -if (!pin) -return ERR_PTR (-ENOMEM ); +if (!pin) { + ret = -ENOMEM ; + goto err_pin_alloc; + } pin->pin_idx = pin_idx; pin->clock_id = clock_id; pin->module = module;
@@ -551,6 +592,8 @@ dpll_pin_alloc(u64 clock_id, u32 pin_idx, struct module *module,dpll_pin_prop_free (&pin->prop); err_pin_prop:kfree (pin); +err_pin_alloc: +dpll_pin_idx_free (pin_idx);return ERR_PTR (ret); }
@@ -654,6 +697,7 @@ void dpll_pin_put(struct dpll_pin *pin)xa_destroy (&pin->ref_sync_pins);dpll_pin_prop_free (&pin->prop);fwnode_handle_put (pin->fwnode); +dpll_pin_idx_free (pin->pin_idx);kfree_rcu (pin, rcu); }mutex_unlock (&dpll_lock);
include/linux/dpll.h +2 -0
@@ -216,6 +216,8 @@ int dpll_device_register(struct dpll_device *dpll, enum dpll_type type,void dpll_device_unregister (struct dpll_device *dpll,const struct dpll_device_ops *ops,void *priv); +#define DPLL_PIN_IDX_UNSPEC U32_MAX +struct dpll_pin *dpll_pin_get (u64 clock_id,u32 dev_driver_id,struct module *module,const struct dpll_pin_properties *prop);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 367/1276 dpll: Enhance and consolidate reference counting logic
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ivan Vecera <[email protected]>
[ Upstream commit 729f5e0153bda8c0423fb7c5795865b6b77ca050 ]
Refactor the reference counting mechanism for DPLL devices and pins to improve consistency and prevent potential lifetime issues.
Introduce internal helpers __dpll_{device,pin}_{hold,put}() to centralize reference management.
Update the internal XArray reference helpers (dpll_xa_ref_*) to automatically grab a reference to the target object when it is added to a list, and release it when removed. This ensures that objects linked internally (e.g., pins referenced by parent pins) are properly kept alive without relying on the caller to manually manage the count.
Consequently, remove the now redundant manual refcount_inc/dec calls in dpll_pin_on_pin_{,un}register()`, as ownership is now correctly handled by the dpll_xa_ref_* functions.
Additionally, ensure that dpll_device_{,un}register()` takes/releases a reference to the device, ensuring the device object remains valid for the duration of its registration.
Stable-dep-of: 32239d600236 ("dpll: fix stale iteration in dpll_pin_on_pin_unregister()")
--- drivers/dpll/dpll_core.c | 74 +++++++++++++++++++++++++++------------- 1 file changed, 50 insertions(+), 24 deletions(-)
drivers/dpll/dpll_core.c +50 -24
@@ -83,6 +83,45 @@ void dpll_pin_notify(struct dpll_pin *pin, unsigned long action)call_dpll_notifiers (action, &info); } +static void __dpll_device_hold (struct dpll_device *dpll) +{ +refcount_inc (&dpll->refcount); +} + +static void __dpll_device_put (struct dpll_device *dpll) +{ +if (refcount_dec_and_test (&dpll->refcount)) { +ASSERT_DPLL_NOT_REGISTERED (dpll); +WARN_ON_ONCE (!xa_empty (&dpll->pin_refs)); +xa_destroy (&dpll->pin_refs); +xa_erase (&dpll_device_xa, dpll->id); +WARN_ON (!list_empty (&dpll->registration_list)); +kfree (dpll); + } +} + +static void __dpll_pin_hold (struct dpll_pin *pin) +{ +refcount_inc (&pin->refcount); +} + +static void dpll_pin_idx_free (u32 pin_idx); +static void dpll_pin_prop_free (struct dpll_pin_properties *prop); + +static void __dpll_pin_put (struct dpll_pin *pin) +{ +if (refcount_dec_and_test (&pin->refcount)) { +xa_erase (&dpll_pin_xa, pin->id); +xa_destroy (&pin->dpll_refs); +xa_destroy (&pin->parent_refs); +xa_destroy (&pin->ref_sync_pins); +dpll_pin_prop_free (&pin->prop); +fwnode_handle_put (pin->fwnode); +dpll_pin_idx_free (pin->pin_idx); +kfree_rcu (pin, rcu); + } +} +struct dpll_device *dpll_device_get_by_id (int id) {if (xa_get_mark (&dpll_device_xa, id,DPLL_REGISTERED ))
@@ -152,6 +191,7 @@ dpll_xa_ref_pin_add(struct xarray *xa_pins, struct dpll_pin *pin, reg->ops = ops; reg->priv = priv; reg->cookie = cookie; +__dpll_pin_hold (pin);if (ref_exists)refcount_inc (&ref->refcount);list_add_tail (®->list, &ref->registration_list);
@@ -174,6 +214,7 @@ static int dpll_xa_ref_pin_del(struct xarray *xa_pins, struct dpll_pin *pin,if (WARN_ON (!reg))return -EINVAL ;list_del (®->list); +__dpll_pin_put (pin);kfree (reg);if (refcount_dec_and_test (&ref->refcount)) {xa_erase (xa_pins, i);
@@ -231,6 +272,7 @@ dpll_xa_ref_dpll_add(struct xarray *xa_dplls, struct dpll_device *dpll, reg->ops = ops; reg->priv = priv; reg->cookie = cookie; +__dpll_device_hold (dpll);if (ref_exists)refcount_inc (&ref->refcount);list_add_tail (®->list, &ref->registration_list);
@@ -253,6 +295,7 @@ dpll_xa_ref_dpll_del(struct xarray *xa_dplls, struct dpll_device *dpll,if (WARN_ON (!reg))return ;list_del (®->list); +__dpll_device_put (dpll);kfree (reg);if (refcount_dec_and_test (&ref->refcount)) {xa_erase (xa_dplls, i);
@@ -323,8 +366,8 @@ dpll_device_get(u64 clock_id, u32 device_idx, struct module *module)if (dpll->clock_id == clock_id && dpll->device_idx == device_idx && dpll->module == module) { +__dpll_device_hold (dpll); ret = dpll; -refcount_inc (&ret->refcount);break ; } }
@@ -347,14 +390,7 @@ EXPORT_SYMBOL_GPL(dpll_device_get);void dpll_device_put (struct dpll_device *dpll) {mutex_lock (&dpll_lock); -if (refcount_dec_and_test (&dpll->refcount)) { -ASSERT_DPLL_NOT_REGISTERED (dpll); -WARN_ON_ONCE (!xa_empty (&dpll->pin_refs)); -xa_destroy (&dpll->pin_refs); -xa_erase (&dpll_device_xa, dpll->id); -WARN_ON (!list_empty (&dpll->registration_list)); -kfree (dpll); - } +__dpll_device_put (dpll);mutex_unlock (&dpll_lock); }EXPORT_SYMBOL_GPL (dpll_device_put);
@@ -416,6 +452,7 @@ int dpll_device_register(struct dpll_device *dpll, enum dpll_type type, reg->ops = ops; reg->priv = priv; dpll->type = type; +__dpll_device_hold (dpll); first_registration =list_empty (&dpll->registration_list);list_add_tail (®->list, &dpll->registration_list);if (!first_registration) {
@@ -455,6 +492,7 @@ void dpll_device_unregister(struct dpll_device *dpll,return ; }list_del (®->list); +__dpll_device_put (dpll);kfree (reg);if (!list_empty (&dpll->registration_list)) {
@@ -666,8 +704,8 @@ dpll_pin_get(u64 clock_id, u32 pin_idx, struct module *module,if (pos->clock_id == clock_id && pos->pin_idx == pin_idx && pos->module == module) { +__dpll_pin_hold (pos); ret = pos; -refcount_inc (&ret->refcount);break ; } }
@@ -690,16 +728,7 @@ EXPORT_SYMBOL_GPL(dpll_pin_get);void dpll_pin_put (struct dpll_pin *pin) {mutex_lock (&dpll_lock); -if (refcount_dec_and_test (&pin->refcount)) { -xa_erase (&dpll_pin_xa, pin->id); -xa_destroy (&pin->dpll_refs); -xa_destroy (&pin->parent_refs); -xa_destroy (&pin->ref_sync_pins); -dpll_pin_prop_free (&pin->prop); -fwnode_handle_put (pin->fwnode); -dpll_pin_idx_free (pin->pin_idx); -kfree_rcu (pin, rcu); - } +__dpll_pin_put (pin);mutex_unlock (&dpll_lock); }EXPORT_SYMBOL_GPL (dpll_pin_put);
@@ -740,8 +769,8 @@ struct dpll_pin *fwnode_dpll_pin_find(struct fwnode_handle *fwnode)mutex_lock (&dpll_lock);xa_for_each (&dpll_pin_xa, index, pin) {if (pin->fwnode == fwnode) { +__dpll_pin_hold (pin); ret = pin; -refcount_inc (&ret->refcount);break ; } }
@@ -893,7 +922,6 @@ int dpll_pin_on_pin_register(struct dpll_pin *parent, struct dpll_pin *pin, ret =dpll_xa_ref_pin_add (&pin->parent_refs, parent, ops, priv, pin);if (ret) goto unlock; -refcount_inc (&pin->refcount);xa_for_each (&parent->dpll_refs, i, ref) { ret =__dpll_pin_register (ref->dpll, pin, ops, priv, parent);if (ret) {
@@ -913,7 +941,6 @@ int dpll_pin_on_pin_register(struct dpll_pin *parent, struct dpll_pin *pin, parent);dpll_pin_delete_ntf (pin); } -refcount_dec (&pin->refcount);dpll_xa_ref_pin_del (&pin->parent_refs, parent, ops, priv, pin); unlock:mutex_unlock (&dpll_lock);
@@ -940,7 +967,6 @@ void dpll_pin_on_pin_unregister(struct dpll_pin *parent, struct dpll_pin *pin,mutex_lock (&dpll_lock);dpll_pin_delete_ntf (pin);dpll_xa_ref_pin_del (&pin->parent_refs, parent, ops, priv, pin); -refcount_dec (&pin->refcount);xa_for_each (&pin->dpll_refs, i, ref)__dpll_pin_unregister (ref->dpll, pin, ops, priv, parent);mutex_unlock (&dpll_lock);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 368/1276 dpll: fix stale iteration in dpll_pin_on_pin_unregister()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Grzegorz Nitka <[email protected]>
[ Upstream commit 32239d600236a986c8e6d16aa814d3d91066b244 ]
Neither parent->dpll_refs nor pin->dpll_refs on its own is a correct iteration target at unregister time:
- pin->dpll_refs includes DPLLs the child was registered against via a different parent or directly; blind unregister WARNs on the cookie miss in dpll_xa_ref_pin_del().
- parent->dpll_refs reflects the parent's current attachments, not those at child-register time. Another driver may have (un)reg'd the parent against additional DPLLs in the meantime, so we miss registrations that exist and visit DPLLs that have none.
Walk pin->dpll_refs and use dpll_pin_registration_find() to filter to entries whose cookie is this parent. Symmetric with dpll_pin_on_pin_register(), correct under any subsequent change to parent->dpll_refs.
--- drivers/dpll/dpll_core.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/dpll/dpll_core.c +6 -1
@@ -961,14 +961,19 @@ EXPORT_SYMBOL_GPL(dpll_pin_on_pin_register);void dpll_pin_on_pin_unregister (struct dpll_pin *parent,struct dpll_pin *pin,const struct dpll_pin_ops *ops,void *priv) { +struct dpll_pin_registration *reg;struct dpll_pin_ref *ref;unsigned long i;mutex_lock (&dpll_lock);dpll_pin_delete_ntf (pin);dpll_xa_ref_pin_del (&pin->parent_refs, parent, ops, priv, pin); -xa_for_each (&pin->dpll_refs, i, ref) +xa_for_each (&pin->dpll_refs, i, ref) { + reg =dpll_pin_registration_find (ref, ops, priv, parent); +if (!reg) +continue ;__dpll_pin_unregister (ref->dpll, pin, ops, priv, parent); + }mutex_unlock (&dpll_lock); }EXPORT_SYMBOL_GPL (dpll_pin_on_pin_unregister);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 369/1276 dpll: send delete notification before unregister in on-pin rollback
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Grzegorz Nitka <[email protected]>
[ Upstream commit e83b403eb142be18d223fc599c0ac45519053671 ]
The rollback path in dpll_pin_on_pin_register() called __dpll_pin_unregister() before dpll_pin_delete_ntf(). When the unregister dropped the pin's last DPLL reference it cleared the DPLL_REGISTERED mark in dpll_pin_xa, so the subsequent dpll_pin_event_send() failed dpll_pin_available() and aborted with -ENODEV. As a result userspace was never notified of the rollback deletion and remained out of sync with the kernel.
Send the delete notification first, matching the order used by dpll_pin_unregister() and dpll_pin_on_pin_unregister().
--- drivers/dpll/dpll_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dpll/dpll_core.c +1 -1
@@ -937,9 +937,9 @@ int dpll_pin_on_pin_register(struct dpll_pin *parent, struct dpll_pin *pin, dpll_unregister:xa_for_each (&parent->dpll_refs, i, ref)if (i < stop) { +dpll_pin_delete_ntf (pin);__dpll_pin_unregister (ref->dpll, pin, ops, priv, parent); -dpll_pin_delete_ntf (pin); }dpll_xa_ref_pin_del (&pin->parent_refs, parent, ops, priv, pin); unlock:
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 370/1276 dpll: emit per-dpll delete notifications in dpll_pin_on_pin_unregister()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Grzegorz Nitka <[email protected]>
[ Upstream commit df0ba51ccf873e533669578104981109217d8201 ]
dpll_pin_on_pin_register() emits a creation notification for every parent->dpll_refs entry, but dpll_pin_on_pin_unregister() emitted only one deletion notification outside the loop. When a pin is registered against multiple parent dplls, userspace sees N creates but a single delete and leaks per-dpll state.
Move dpll_pin_delete_ntf() into the loop and call it before __dpll_pin_unregister() so the DPLL_REGISTERED mark is still set when dpll_pin_available() is consulted.
--- drivers/dpll/dpll_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/dpll/dpll_core.c +2 -2
@@ -966,14 +966,14 @@ void dpll_pin_on_pin_unregister(struct dpll_pin *parent, struct dpll_pin *pin,unsigned long i;mutex_lock (&dpll_lock); -dpll_pin_delete_ntf (pin); -dpll_xa_ref_pin_del (&pin->parent_refs, parent, ops, priv, pin);xa_for_each (&pin->dpll_refs, i, ref) { reg =dpll_pin_registration_find (ref, ops, priv, parent);if (!reg)continue ; +dpll_pin_delete_ntf (pin);__dpll_pin_unregister (ref->dpll, pin, ops, priv, parent); } +dpll_xa_ref_pin_del (&pin->parent_refs, parent, ops, priv, pin);mutex_unlock (&dpll_lock); }EXPORT_SYMBOL_GPL (dpll_pin_on_pin_unregister);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 371/1276 dpll: guard sync-pair removal on full pin unregister
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Grzegorz Nitka <[email protected]>
[ Upstream commit 0a5c720a7d57d2287d5566c4ad93ee26b7c06845 ]
__dpll_pin_unregister() wiped the global sync-pair state on every (dpll, ops, priv, cookie) tuple removed from a pin. When a pin is registered multiple times and only one registration is being torn down, this dropped sync-pair pairings still in use by the surviving registrations.
Move dpll_pin_ref_sync_pair_del() inside the xa_empty(&pin->dpll_refs) branch so it only runs when the last registration is gone, alongside clearing the DPLL_REGISTERED mark.
--- drivers/dpll/dpll_core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/dpll/dpll_core.c +3 -2
@@ -856,11 +856,12 @@ __dpll_pin_unregister(struct dpll_device *dpll, struct dpll_pin *pin, const struct dpll_pin_ops *ops, void *priv, void *cookie) {ASSERT_DPLL_PIN_REGISTERED (pin ); -dpll_pin_ref_sync_pair_del (pin->id);dpll_xa_ref_pin_del (&dpll->pin_refs, pin, ops, priv, cookie);dpll_xa_ref_dpll_del (&pin->dpll_refs, dpll, ops, priv, cookie); -if (xa_empty (&pin->dpll_refs)) +if (xa_empty (&pin->dpll_refs)) { +dpll_pin_ref_sync_pair_del (pin->id);xa_clear_mark (&dpll_pin_xa, pin->id,DPLL_REGISTERED ); + } }/**
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 372/1276 dpll: balance create/delete notifications in __dpll_pin_(un)register
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Grzegorz Nitka <[email protected]>
[ Upstream commit 1a2292101c0dc422466c673031de03d2e871adbe ]
__dpll_pin_register() emits dpll_pin_create_ntf() internally, but __dpll_pin_unregister() left the matching delete to its callers. The counts then diverge on dpll_pin_on_pin_register() rollback and on dpll_pin_on_pin_unregister(), leaking stale notifications.
Emit dpll_pin_delete_ntf() inside __dpll_pin_unregister() and drop the now-redundant call in dpll_pin_unregister().
--- drivers/dpll/dpll_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dpll/dpll_core.c +1 -1
@@ -856,6 +856,7 @@ __dpll_pin_unregister(struct dpll_device *dpll, struct dpll_pin *pin, const struct dpll_pin_ops *ops, void *priv, void *cookie) {ASSERT_DPLL_PIN_REGISTERED (pin ); +dpll_pin_delete_ntf (pin);dpll_xa_ref_pin_del (&dpll->pin_refs, pin, ops, priv, cookie);dpll_xa_ref_dpll_del (&pin->dpll_refs, dpll, ops, priv, cookie);if (xa_empty (&pin->dpll_refs)) {
@@ -883,7 +884,6 @@ void dpll_pin_unregister(struct dpll_device *dpll, struct dpll_pin *pin,return ;mutex_lock (&dpll_lock); -dpll_pin_delete_ntf (pin);__dpll_pin_unregister (dpll, pin, ops, priv,NULL );mutex_unlock (&dpll_lock); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 373/1276 landlock: Fix unmarked concurrent access to socket family
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthieu Buffet <[email protected]>
[ Upstream commit 0ce4243509d1580349dd0d50624036d6b097e958 ]
Socket family is read (twice) in a context where the socket is not locked, so another thread can setsockopt(IPV6_ADDRFORM) to write it concurrently. Add needed READ_ONCE() annotation.
Use the proper macro to access __sk_common.skc_family like everywhere else.
[mic: Squash two patches, move variable to ease backport, fix comment formatting]
--- security/landlock/net.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
security/landlock/net.c +9 -2
@@ -48,6 +48,7 @@ static int current_check_access_socket(struct socket *const sock,const int addrlen, access_mask_t access_request) { + unsigned short sock_family;__be16 port;layer_mask_t layer_masks[LANDLOCK_NUM_ACCESS_NET ] = {};const struct landlock_rule *rule;
@@ -70,6 +71,12 @@ static int current_check_access_socket(struct socket *const sock,if (addrlen <offsetofend (typeof (*address), sa_family))return -EINVAL ; +/* +* The socket is not locked, so sk_family can change concurrently due to +* e.g. setsockopt(IPV6_ADDRFORM). +*/ + sock_family =READ_ONCE (sock->sk->sk_family); +switch (address->sa_family) {case AF_UNSPEC :if (access_request ==LANDLOCK_ACCESS_NET_CONNECT_TCP ) {
@@ -106,7 +113,7 @@ static int current_check_access_socket(struct socket *const sock,* these checks, but it is safer to return a proper * error and test consistency thanks to kselftest. */ -if (sock->sk->__sk_common.skc_family ==AF_INET ) { +if (sock_family ==AF_INET ) {const struct sockaddr_in *const sockaddr = (struct sockaddr_in *)address;
@@ -154,7 +161,7 @@ static int current_check_access_socket(struct socket *const sock,* check, but it is safer to return a proper error and test * consistency thanks to kselftest. */ -if (address->sa_family != sock->sk->__sk_common.skc_family && +if (address->sa_family != sock_family && address->sa_family !=AF_UNSPEC )return -EINVAL ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 374/1276 net: bcmgenet: Use weighted round-robin TX DMA arbitration
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ovidiu Panait <[email protected]>
[ Upstream commit fd615abd53110f0f815984e99e7cc51ca6b7d979 ]
Under heavy network traffic, we observed sporadic TX queue timeouts on the Raspberry Pi 4. The timeouts can be reproduced by stress testing the TX path with multiple concurrent iperf UDP streams:
iperf3 -c <ip> -u -b0 -P16 -t60
NETDEV WATCHDOG: CPU: 0: transmit queue 0 timed out 2044 ms NETDEV WATCHDOG: CPU: 3: transmit queue 0 timed out 2004 ms
Investigation showed that the timeouts are caused by the priority-based arbiter. Under heavy load the highest priority queue starves the lower priority ones, causing timeouts. The TX strict priority arbiter is not suitable for the default use case where all the traffic gets spread across all the TX queues.
Therefore, to fix this, switch the TX DMA arbiter to Weighted Round-Robin, which services all queues, so they do not stall. The weights were chosen to follow the existing priority scheme: q0 gets the smallest weight, while q1-4 get the bulk of the TX bandwidth.
--- .../net/ethernet/broadcom/genet/bcmgenet.c | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-)
drivers/net/ethernet/broadcom/genet/bcmgenet.c +8 -15
@@ -41,9 +41,8 @@#include "bcmgenet.h" -/* Default highest priority queue for multi queue support */ -#define GENET_Q1_PRIORITY 0 -#define GENET_Q0_PRIORITY 1 +#define GENET_Q0_WEIGHT 1 +#define GENET_Q1_WEIGHT 4#define GENET_Q0_RX_BD_CNT \ (TOTAL_DESC - priv->hw_params->rx_queues * priv->hw_params->rx_bds_per_q)
@@ -2077,13 +2076,6 @@ static netdev_tx_t bcmgenet_xmit(struct sk_buff *skb, struct net_device *dev)int i; index =skb_get_queue_mapping (skb); -/* Mapping strategy: -* queue_mapping = 0, unclassified, packet xmited through ring 0 -* queue_mapping = 1, goes to ring 1. (highest priority queue) -* queue_mapping = 2, goes to ring 2. -* queue_mapping = 3, goes to ring 3. -* queue_mapping = 4, goes to ring 4. -*/ ring = &priv->tx_rings[index]; txq =netdev_get_tx_queue (dev, index);
@@ -2783,8 +2775,9 @@ static void bcmgenet_fini_tx_napi(struct bcmgenet_priv *priv)/* Initialize Tx queues * -* Queues 1-4 are priority-based, each one has 32 descriptors, -* with queue 1 being the highest priority queue. +* Queues 1-4 are the priority queues, each one has 32 descriptors. +* The weighted round-robin arbiter gives them a larger share of TX +* bandwidth than the default queue 0. * * Queue 0 is the default Tx queue with * GENET_Q0_TX_BD_CNT = 256 - 4 * 32 = 128 descriptors.
@@ -2812,8 +2805,8 @@ static void bcmgenet_init_tx_queues(struct net_device *dev) dma_ctrl =0 ; ring_cfg =0 ; -/* Enable strict priority arbiter mode */ -bcmgenet_tdma_writel (priv,DMA_ARBITER_SP ,DMA_ARB_CTRL ); +/* Enable Weighted Round-Robin arbiter mode */ +bcmgenet_tdma_writel (priv,DMA_ARBITER_WRR ,DMA_ARB_CTRL );/* Initialize Tx priority queues */ for (i =0 ; i <= priv->hw_params->tx_queues; i++) {
@@ -2823,7 +2816,7 @@ static void bcmgenet_init_tx_queues(struct net_device *dev) ring_cfg |= (1 << i); dma_ctrl |= (1 << (i +DMA_RING_BUF_EN_SHIFT )); dma_priority[DMA_PRIO_REG_INDEX (i)] |= - (i ?GENET_Q1_PRIORITY :GENET_Q0_PRIORITY ) + (i ?GENET_Q1_WEIGHT :GENET_Q0_WEIGHT ) <<DMA_PRIO_REG_SHIFT (i); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 375/1276 kcm: use WRITE_ONCE() when changing lower socket callbacks
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Runyu Xiao <[email protected]>
[ Upstream commit 47186409c092cd7dd70350999186c700233e854d ]
kcm_attach() replaces a live lower TCP socket's sk_data_ready and sk_write_space callbacks with KCM handlers, and kcm_unattach() restores them later. Those callback-pointer updates are still plain stores even though the same fields can be read and invoked concurrently on other CPUs.
If another CPU observes an older callback snapshot after the live field has already been restored, callback execution can run with a mismatched target and sk_user_data state, leading to stale or misdirected wakeups.
Use WRITE_ONCE() for the callback replacement and restore operations so these shared callback fields follow the same visibility contract already established by the earlier 4022 fixes.
--- net/kcm/kcmsock.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/kcm/kcmsock.c +4 -4
@@ -1299,8 +1299,8 @@ static int kcm_attach(struct socket *sock, struct socket *csock, psock->save_write_space = csk->sk_write_space; psock->save_state_change = csk->sk_state_change; csk->sk_user_data = psock; - csk->sk_data_ready = psock_data_ready; - csk->sk_write_space = psock_write_space; +WRITE_ONCE (csk->sk_data_ready, psock_data_ready); +WRITE_ONCE (csk->sk_write_space, psock_write_space); csk->sk_state_change = psock_state_change;write_unlock_bh (&csk->sk_callback_lock);
@@ -1376,8 +1376,8 @@ static void kcm_unattach(struct kcm_psock *psock)*/ write_lock_bh (&csk->sk_callback_lock); csk->sk_user_data =NULL ; - csk->sk_data_ready = psock->save_data_ready; - csk->sk_write_space = psock->save_write_space; +WRITE_ONCE (csk->sk_data_ready, psock->save_data_ready); +WRITE_ONCE (csk->sk_write_space, psock->save_write_space); csk->sk_state_change = psock->save_state_change;strp_stop (&psock->strp);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 376/1276 netfilter: nf_conncount: callers must hold rcu read lock
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Westphal <[email protected]>
[ Upstream commit 64d7d5abe2160bba369b4a8f06bdf5630573bab0 ]
rcu_derefence_raw() should not have been used here, it concealed this bug. Its used because struct rb_node lacks __rcu annotated pointers, so plain rcu_derefence causes sparse warnings.
The major tradeoff is that rcu_derefence_raw() doesn't warn when the caller isn't in a rcu read section.
Extend the rcu read lock scope accordingly and cause sparse warnings, those warnings are the lesser evil.
--- net/netfilter/nf_conncount.c | 6 +++--- net/openvswitch/conntrack.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
net/netfilter/nf_conncount.c +3 -3
@@ -499,7 +499,7 @@ count_tree(struct net *net, hash =jhash2 (key, data->keylen, conncount_rnd) %CONNCOUNT_SLOTS ; root = &data->root[hash]; - parent =rcu_dereference_raw (root->rb_node); + parent =rcu_dereference (root->rb_node);while (parent) {int diff;
@@ -507,9 +507,9 @@ count_tree(struct net *net, diff =key_diff (key, rbconn->key, data->keylen);if (diff <0 ) { - parent =rcu_dereference_raw (parent->rb_left); + parent =rcu_dereference (parent->rb_left); }else if (diff >0 ) { - parent =rcu_dereference_raw (parent->rb_right); + parent =rcu_dereference (parent->rb_right); }else {int ret;
net/openvswitch/conntrack.c +1 -1
@@ -1800,10 +1800,10 @@ static int ovs_ct_limit_get_zone_limit(struct net *net, }else {rcu_read_lock (); limit =ct_limit_get (info, zone); -rcu_read_unlock (); err =__ovs_ct_limit_get_zone_limit ( net, info->data, zone, limit, reply); +rcu_read_unlock ();if (err)return err; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 377/1276 ALSA: core: Fix unintuitive behavior of snd_power_ref_and_wait()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit b113a891252c3fa4fab11ec8c2894a22ecaf278c ]
snd_power_ref_and_wait() takes the power refcount and doesn't leave it no matter whether it returns an error or not. However, the majority of callers don't expect but just returns without unreferencing in the caller side upon errors.
For addressing the potential refcount unbalance, rather correct the behavior of snd_power_ref_wait() to unreference upon returning an error.
Note that the problem above is likely negligible; the function returns an error only when the sound card is being shutdown, hence it doesn't matter about the power refcount any longer at such a state.
--- sound/core/init.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
sound/core/init.c +8 -3
@@ -1133,7 +1133,7 @@ EXPORT_SYMBOL(snd_card_file_remove);* typically around calling control ops. * * The caller needs to pull down the refcount via snd_power_unref() later -* no matter whether the error is returned from this function or not. +* when this function returns 0. * * Return: Zero if successful, or a negative error code. */
@@ -1146,7 +1146,11 @@ int snd_power_ref_and_wait(struct snd_card *card) card->shutdown ||snd_power_get_state (card) ==SNDRV_CTL_POWER_D0 , snd_power_unref(card), snd_power_ref(card)); -return card->shutdown ? -ENODEV :0 ; +if (card->shutdown) { +snd_power_unref (card); +return -ENODEV ; + } +return 0 ; }EXPORT_SYMBOL_GPL (snd_power_ref_and_wait);
@@ -1163,7 +1167,8 @@ int snd_power_wait(struct snd_card *card)int ret; ret =snd_power_ref_and_wait (card); -snd_power_unref (card); +if (!ret) +snd_power_unref (card);return ret; }EXPORT_SYMBOL (snd_power_wait);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 378/1276 cifs: remove all cifs files before kill super
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jian Zhang <[email protected]>
[ Upstream commit 6d9a4aaaa8b2612b5ef9d581e2f286a458b71ee1 ]
Cifs files may be put into fileinfo_put_wq during umounting cifs. After umount done, cifsFileInfo_put_final is called, which cause following BUG:
BUG: kernel NULL pointer dereference, address: 0000000000000000 ... [ 134.222152] list_lru_add+0x64/0x1a0 [ 134.222399] ? cifs_put_tcon+0x171/0x340 [cifs] [ 134.222772] d_lru_add+0x44/0x60 [ 134.222997] dput+0x1fc/0x210 [ 134.223213] cifsFileInfo_put_final+0x11a/0x140 [cifs] [ 134.223576] process_one_work+0x17c/0x320 [ 134.223843] worker_thread+0x188/0x280 [ 134.224084] ? __pfx_worker_thread+0x10/0x10 [ 134.224366] kthread+0xcc/0x100 [ 134.224576] ? __pfx_kthread+0x10/0x10 [ 134.224827] ret_from_fork+0x30/0x50 [ 134.225063] ? __pfx_kthread+0x10/0x10 [ 134.225328] ret_from_fork_asm+0x1b/0x30
This can be reproduce by following:
unshare -n bash -c "
mkdir -p ${CIFS_MNT}
ip netns attach root 1
ip link add eth0 type veth peer veth0 netns root
ip link set eth0 up
ip -n root link set veth0 up
ip addr add 192.168.0.2/24 dev eth0
ip -n root addr add 192.168.0.1/24 dev veth0
ip route add default via 192.168.0.1 dev eth0
ip netns exec root sysctl net.ipv4.ip_forward=1
ip netns exec root iptables -t nat -A POSTROUTING -s 192.168.0.2 -o
${DEV} -j MASQUERADE
mount -t cifs ${CIFS_PATH} ${CIFS_MNT} -o vers=3.0,sec=ntlmssp,credentials=${CIFS_CRED},rsize=65536,wsize=65536,cache=none,echo_interval=1 touch ${CIFS_MNT}/a.txt
ip netns exec root iptables -t nat -D POSTROUTING -s 192.168.0.2 -o
${DEV} -j MASQUERADE
"
umount ${CIFS_MNT}
--- fs/smb/client/connect.c | 3 +++ 1 file changed, 3 insertions(+)
fs/smb/client/connect.c +3 -0
@@ -3971,6 +3971,9 @@ cifs_umount(struct cifs_sb_info *cifs_sb) }spin_unlock (&cifs_sb->tlink_tree_lock); +flush_workqueue (serverclose_wq); +flush_workqueue (fileinfo_put_wq); +kfree (cifs_sb->prepath);call_rcu (&cifs_sb->rcu, delayed_free); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 379/1276 smb/client: always return a value for FS_IOC_GETFLAGS
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Huiwen He <[email protected]>
[ Upstream commit 7acbaa16b99edaf8ef432229d4b7a6f3b666767d ]
Currently, repeated lsattr calls on a regular CIFS file without the compressed attribute may show random flags:
$ touch test.bin $ lsattr test.bin s-S-ia-A-EjI---------m test.bin $ lsattr test.bin ------d-cEjI---------m test.bin
The lsattr reproducer depends on the previous contents of its userspace buffer, so it may not reproduce on every setup. A deterministic reproducer is to initialize the ioctl argument before FS_IOC_GETFLAGS on a file without the compressed attribute:
int flags = 0x7fffffff;
ioctl(fd, FS_IOC_GETFLAGS, &flags);On an affected kernel, flags remains 0x7fffffff. With the fix, it is set to 0.
This happens because when the cached inode does not have the compressed bit set, the CIFS fallback path in FS_IOC_GETFLAGS returns success without calling put_user() to write the zero flags value into the user buffer. As a result, the caller observes stale contents from its own buffer.
Fix this by always writing the visible flags value back to the user buffer before returning success, even when the value is zero.
--- fs/smb/client/ioctl.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
fs/smb/client/ioctl.c +5 -7
@@ -396,13 +396,11 @@ long cifs_ioctl(struct file *filep, unsigned int command, unsigned long arg) }#endif /* CONFIG_CIFS_ALLOW_INSECURE_LEGACY */ #endif /* CONFIG_CIFS_POSIX */ - rc =0 ; -if (CIFS_I (inode)->cifsAttrs &ATTR_COMPRESSED ) { -/* add in the compressed bit */ - ExtAttrBits =FS_COMPR_FL ; - rc =put_user (ExtAttrBits &FS_FL_USER_VISIBLE , - (int __user *)arg); - } +if (CIFS_I (inode)->cifsAttrs &FILE_ATTRIBUTE_COMPRESSED ) + ExtAttrBits |=FS_COMPR_FL ; + + rc =put_user (ExtAttrBits &FS_FL_USER_VISIBLE , + (int __user *)arg);break ;case FS_IOC_SETFLAGS :if (pSMBFile ==NULL )
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 380/1276 selftests/bpf: Fix typo in verify_umulti_link_info
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiri Olsa <[email protected]>
[ Upstream commit df29003c55115737a8fb4f8a60c6c2bba4c4a484 ]
We verify info.uprobe_multi.flags against wrong kprobe-multi flag (BPF_F_KPROBE_MULTI_RETURN). It's the same value as the correct flag (BPF_F_UPROBE_MULTI_RETURN), so there's not functional change.
--- tools/testing/selftests/bpf/prog_tests/fill_link_info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/prog_tests/fill_link_info.c +1 -1
@@ -455,7 +455,7 @@ verify_umulti_link_info(int fd, bool retprobe, __u64 *offsets,ASSERT_EQ (info.uprobe_multi.pid,getpid (),"info.uprobe_multi.pid" );ASSERT_EQ (info.uprobe_multi.count,3 ,"info.uprobe_multi.count" ); -ASSERT_EQ (info.uprobe_multi.flags &BPF_F_KPROBE_MULTI_RETURN , +ASSERT_EQ (info.uprobe_multi.flags &BPF_F_UPROBE_MULTI_RETURN , retprobe,"info.uprobe_multi.flags.retprobe" );ASSERT_EQ (info.uprobe_multi.path_size,strlen (path) +1 ,"info.uprobe_multi.path_size" );ASSERT_STREQ (path_buf, path,"info.uprobe_multi.path" );
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 381/1276 selftests/bpf: Initialize operation name before use
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leo Yan <[email protected]>
[ Upstream commit 55ffbe8a15b1254f44d56952fb425a10e3f15c31 ]
ASAN reports stack-buffer-overflow due to the uninitialized op_name.
Initialize it to fix the issue.
--- tools/testing/selftests/bpf/prog_tests/verifier_log.c | 1 + 1 file changed, 1 insertion(+)
tools/testing/selftests/bpf/prog_tests/verifier_log.c +1 -0
@@ -317,6 +317,7 @@ static void verif_btf_log_subtest(bool bad_btf) res =load_btf (&opts, true);ASSERT_EQ (res, -ENOSPC ,"half_log_fd" );ASSERT_EQ (strlen (logs.buf),24 ,"log_fixed_25" ); +strscpy (op_name,"log_fixed" ,sizeof (op_name));ASSERT_STRNEQ (logs.buf, logs.reference,24 , op_name);/* validate rolling verifier log logic: try all variations of log buf
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 382/1276 bpf: Fix bpf_get/setsockopt to tos for ipv4-mapped ipv6 socket
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leon Hwang <[email protected]>
[ Upstream commit ca0f587c029afa66227f7b932450b1c417403394 ]
When TCP over IPv4 via INET6 API, bpf_get/setsockopt with ipv4 will fail, because sk->sk_family is AF_INET6. With ipv6 will success, not take effect, because inet_csk(sk)->icsk_af_ops is ipv6_mapped and use ip_queue_xmit, inet_sk(sk)->tos.
To relax this restriction, allow getting/setting tos for those possible ipv4-mapped ipv6 sockets.
--- net/core/filter.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
net/core/filter.c +14 -1
@@ -5507,11 +5507,24 @@ static int sol_tcp_sockopt(struct sock *sk, int optname, KERNEL_SOCKPTR(optval), *optlen); } +static bool sk_allows_sol_ip_sockopt (struct sock *sk) +{ +switch (sk->sk_family) { +case AF_INET : +return true; +case AF_INET6 : +/* Allow getting/setting sockopt for possible ipv4-mapped ipv6 socket. */ +return sk->sk_type !=SOCK_RAW && !ipv6_only_sock (sk); +default : +return false; + } +} +static int sol_ip_sockopt (struct sock *sk,int optname,char *optval,int *optlen,bool getopt) { -if (sk->sk_family !=AF_INET ) +if (!sk_allows_sol_ip_sockopt (sk))return -EINVAL ;switch (optname) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 383/1276 udf: fix nls leak on udf_fill_super() failure
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Al Viro <[email protected]>
[ Upstream commit 462bdd08fbdf41db223c6117d907c8fd68d666ea ]
On all failure exits that go to error_out there we have already moved the nls reference from uopt->nls_map to sbi->s_nls_map, leaving NULL behind.
--- fs/udf/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/udf/super.c +1 -1
@@ -2331,7 +2331,7 @@ static int udf_fill_super(struct super_block *sb, struct fs_context *fc) error_out:iput (sbi->s_vat_inode); -unload_nls (uopt->nls_map); +unload_nls (sbi->s_nls_map);if (lvid_open)udf_close_lvid (sb);brelse (sbi->s_lvid_bh);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 384/1276 bpf, sockmap: reject overflowing copy + len in bpf_msg_push_data()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Weiming Shi <[email protected]>
[ Upstream commit 0c0a8ed85349dae298712d79cb276acfeb794d82 ]
When the scatterlist ring is full or nearly full, bpf_msg_push_data() enters a copy fallback path and computes copy + len for the page allocation size. Since len comes from BPF with arg3_type = ARG_ANYTHING and both are u32, a crafted len can wrap the sum to a small value, causing an undersized allocation followed by an out-of-bounds memcpy.
BUG: unable to handle page fault for address: ffffed104089a402 Oops: Oops: 0000 [#1] SMP KASAN NOPTI Call Trace: __asan_memcpy (mm/kasan/shadow.c:105) bpf_msg_push_data (net/core/filter.c:2852 net/core/filter.c:2788) bpf_prog_9ed8b5711920a7d7+0x2e/0x36 sk_psock_msg_verdict (net/core/skmsg.c:934) tcp_bpf_sendmsg (net/ipv4/tcp_bpf.c:421 net/ipv4/tcp_bpf.c:584) __sys_sendto (net/socket.c:2206) do_syscall_64 (arch/x86/entry/syscall_64.c:94) entry_SYSCALL_64_after_hwframe (arch/x86/entry/entry_64.S:130)
Add an overflow check before the allocation.
--- net/core/filter.c | 3 +++ 1 file changed, 3 insertions(+)
net/core/filter.c +3 -0
@@ -2841,6 +2841,9 @@ BPF_CALL_4(bpf_msg_push_data, struct sk_msg *, msg, u32, start,if (!space || (space ==1 && start != offset)) copy = msg->sg.data[i].length; +if (unlikely (copy + len < copy)) +return -EINVAL ; + page =alloc_pages (__GFP_NOWARN |GFP_ATOMIC | __GFP_COMP,get_order (copy + len));if (unlikely (!page))
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 385/1276 bpf, sockmap: fix integer overflow in bpf_msg_pop_data() bounds check
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sechang Lim <[email protected]>
[ Upstream commit a48802fb2cd2d1e23651989f8ff4d15e9d5dad54 ]
start and len are u32, so
u64 last = start + len;
evaluates start + len in 32-bit and wraps before storing it in last. The bounds check
if (start >= offset + l || last > msg->sg.size) return -EINVAL;
can then be passed with an out-of-range start/len, after which the pop loop runs off the end of the scatterlist and sk_msg_shift_left() calls put_page() on the empty msg->sg.end slot:
Oops: general protection fault, probably for non-canonical address 0xdffffc0000000001: 0000 [#1] SMP KASAN PTI KASAN: null-ptr-deref in range [0x0000000000000008-0x000000000000000f] RIP: 0010:sk_msg_shift_left net/core/filter.c:2957 [inline] RIP: 0010:____bpf_msg_pop_data net/core/filter.c:3103 [inline] RIP: 0010:bpf_msg_pop_data+0x753/0x1a10 net/core/filter.c:2984 Call Trace: <TASK> bpf_prog_4cc92c278f4d5d56+0x1b1/0x1e8 bpf_prog_run_pin_on_cpu+0x107/0x320 include/linux/filter.h:746 sk_psock_msg_verdict+0x357/0x7f0 net/core/skmsg.c:934 tcp_bpf_send_verdict net/ipv4/tcp_bpf.c:420 [inline] tcp_bpf_sendmsg+0x766/0x1ae0 net/ipv4/tcp_bpf.c:583 __sock_sendmsg+0x153/0x1c0 net/socket.c:802 __sys_sendto+0x326/0x430 net/socket.c:2265 __x64_sys_sendto+0xe3/0x100 net/socket.c:2268 do_syscall_64+0x14c/0x480 entry_SYSCALL_64_after_hwframe+0x77/0x7f </TASK>
Widen the addition with a (u64) cast so the bound is evaluated in 64-bit and a len near U32_MAX no longer wraps below msg->sg.size.
While here, change pop from int to u32. It counts bytes against the unsigned scatterlist lengths and can never be negative, so the signed type only invites sign-confusion in the pop loop.
--- net/core/filter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/core/filter.c +2 -2
@@ -3007,8 +3007,8 @@ BPF_CALL_4(bpf_msg_pop_data, struct sk_msg *, msg, u32, start, u32, len, u64, flags) {u32 i =0 , l =0 , space, offset =0 ; -u64 last = start + len; -int pop; +u64 last = (u64 )start + len; +u32 pop;if (unlikely (flags))return -EINVAL ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 386/1276 MIPS: mm: Fix out-of-bounds write in maar_res_walk()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yadan Fan <[email protected]>
[ Upstream commit 1b001b16bc88f3f7817e228acfd91ee01bdcfcce ]
maar_res_walk() uses wi->num_cfg as the index into the fixed-size wi->cfg array, but checks whether the array is full only after it has filled the selected entry. If walk_system_ram_range() reports more than 16 memory ranges, the overflow call writes one struct maar_config past the end of the array before WARN_ON() prevents num_cfg from advancing.
Move the full-array check before taking the array slot and return non-zero when the scratch array is full, so walk_system_ram_range() terminates the walk instead of invoking the callback for further ranges.
--- arch/mips/mm/init.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
arch/mips/mm/init.c +8 -4
@@ -283,9 +283,15 @@ static int maar_res_walk(unsigned long start_pfn, unsigned long nr_pages, void *data) {struct maar_walk_info *wi = data; -struct maar_config *cfg = &wi->cfg[wi->num_cfg]; +struct maar_config *cfg;unsigned int maar_align; +/* Ensure we don't overflow the cfg array */ +if (WARN_ON (wi->num_cfg >=ARRAY_SIZE (wi->cfg))) +return -1 ; + + cfg = &wi->cfg[wi->num_cfg]; +/* MAAR registers hold physical addresses right shifted by 4 bits */ maar_align =BIT (MIPS_MAAR_ADDR_SHIFT +4 );
@@ -294,9 +300,7 @@ static int maar_res_walk(unsigned long start_pfn, unsigned long nr_pages, cfg->upper =ALIGN_DOWN (PFN_PHYS (start_pfn + nr_pages), maar_align) -1 ; cfg->attrs =MIPS_MAAR_S ; -/* Ensure we don't overflow the cfg array */ -if (!WARN_ON (wi->num_cfg >=ARRAY_SIZE (wi->cfg))) - wi->num_cfg++; + wi->num_cfg++;return 0 ; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 387/1276 powerpc/perf: fix preempt count underflow in fsl_emb_pmu_del
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aboorva Devarajan <[email protected]>
[ Upstream commit 81e3a86030462824a67d697739cf3f387f4ba350 ]
fsl_emb_pmu_del() unconditionally calls put_cpu_var(cpu_hw_events) at the 'out:' label, but only calls the matching get_cpu_var() after the 'i < 0' early-return check. When event->hw.idx is negative the function jumps to 'out:' without having taken get_cpu_var(), and the trailing put_cpu_var() then issues an unmatched preempt_enable(), underflowing preempt_count.
On a CONFIG_PREEMPT=y kernel preempt_count would underflow and eventually present as a 'scheduling while atomic' BUG.
Move put_cpu_var() to pair with get_cpu_var() so the percpu access is correctly bracketed and the 'out:' label only handles perf_pmu_enable.
--- arch/powerpc/perf/core-fsl-emb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/powerpc/perf/core-fsl-emb.c +2 -1
@@ -366,9 +366,10 @@ static void fsl_emb_pmu_del(struct perf_event *event, int flags) cpuhw->n_events--; +put_cpu_var (cpu_hw_events); + out:perf_pmu_enable (event->pmu); -put_cpu_var (cpu_hw_events); }static void fsl_emb_pmu_start (struct perf_event *event,int ef_flags)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 388/1276 powerpc/powernv: fix preempt count leak in pnv_kexec_wait_secondaries_down
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aboorva Devarajan <[email protected]>
[ Upstream commit 0ecd26e93e698c8327521910fc6296f5b84a4b92 ]
pnv_kexec_wait_secondaries_down() calls get_cpu() to obtain the current CPU id but never calls the matching put_cpu(), leaking one preempt_disable() nesting level on every invocation.
In practice the imbalance does not trigger a visible splat because the kexec teardown path is a one-way trip: IRQs are already disabled, no schedule() occurs after the leak, and default_machine_kexec() overwrites preempt_count with HARDIRQ_OFFSET before jumping into kexec_sequence() which never returns. However the bookkeeping is still wrong.
The function only needs the current CPU id, and this path runs with interrupts disabled and the CPU pinned, so the preempt_disable() side-effect of get_cpu() is unnecessary. Replace it with raw_smp_processor_id().
--- arch/powerpc/platforms/powernv/setup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/powerpc/platforms/powernv/setup.c +2 -1
@@ -396,7 +396,8 @@ static void pnv_kexec_wait_secondaries_down(void) {int my_cpu, i, notified =-1 ; - my_cpu =get_cpu (); +/* Called with interrupts disabled, so the CPU is pinned. */ + my_cpu =raw_smp_processor_id ();for_each_online_cpu (i) {uint8_t status;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 389/1276 powerpc/kexec: fix double get_cpu() imbalance in kexec_prepare_cpus
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aboorva Devarajan <[email protected]>
[ Upstream commit 5c86f1c1f972761a04bf22f4c0618d1aa714185b ]
kexec_prepare_cpus_wait() calls get_cpu() internally to obtain the current CPU id. kexec_prepare_cpus() calls kexec_prepare_cpus_wait() twice -- once for KEXEC_STATE_IRQS_OFF and once for KEXEC_STATE_REAL_MODE -- but only issues a single put_cpu() at the end, leaving preempt_count elevated by one extra nesting level.
In practice the imbalance does not trigger a 'scheduling while atomic' splat because the kexec path is a one-way trip: IRQs are already disabled, no schedule() occurs after the leak, and default_machine_kexec() overwrites preempt_count with HARDIRQ_OFFSET before jumping into kexec_sequence() which never returns. However the bookkeeping is still wrong.
kexec_prepare_cpus() calls local_irq_disable()/hard_irq_disable() before invoking kexec_prepare_cpus_wait(), so the CPU is already pinned and the get_cpu()/put_cpu() preempt_disable() bracketing is unnecessary. Only the current CPU id is needed, so replace get_cpu() with raw_smp_processor_id() and drop the now-unneeded put_cpu().
--- arch/powerpc/kexec/core_64.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
arch/powerpc/kexec/core_64.c +1 -3
@@ -169,7 +169,7 @@ static void kexec_prepare_cpus_wait(int wait_state)int my_cpu, i, notified=-1 ;hw_breakpoint_disable (); - my_cpu =get_cpu (); + my_cpu =raw_smp_processor_id ();/* Make sure each CPU has at least made it to the state we need. * * FIXME: There is a (slim) chance of a problem if not all of the CPUs
@@ -267,8 +267,6 @@ static void kexec_prepare_cpus(void)/* after we tell the others to go down */ if (ppc_md.kexec_cpu_down) ppc_md.kexec_cpu_down(0, 0); - - put_cpu(); }#else /* ! SMP */
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 390/1276 KEYS: Use acquire when reading state in keyring search
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gui-Dong Han <[email protected]>
[ Upstream commit c1201b37f666f6466ab1fd3a381c2b7a4b7e9fee ]
The negative-key race fix added release/acquire ordering for key use.
Publish payload before state; read state before payload.
keyring_search_iterator() still uses READ_ONCE() before match callbacks. An asymmetric match callback calls asymmetric_key_ids(), which reads key->payload.data[asym_key_ids].
Use key_read_state() there to complete that ordering.
--- security/keys/keyring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
security/keys/keyring.c +1 -1
@@ -576,7 +576,7 @@ static int keyring_search_iterator(const void *object, void *iterator_data)struct keyring_search_context *ctx = iterator_data;const struct key *key =keyring_ptr_to_key (object);unsigned long kflags =READ_ONCE (key->flags); -short state =READ_ONCE (key->state); +short state =key_read_state (key);kenter ("{%d}" , key->serial);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 391/1276 tipc: fix UAF in tipc_l2_send_msg()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit f4c3d89fc986b0da196ddfc6cfe0ea5d5d08bec6 ]
Syzbot reported a slab-use-after-free in ipvlan_hard_header() when called from tipc_l2_send_msg().
The root cause is that tipc_disable_l2_media() calls synchronize_net() while b->media_ptr is still valid. This allows concurrent RCU readers to obtain the device pointer after synchronize_net() has finished. The pointer is cleared later in bearer_disable(), but without any subsequent synchronization, allowing the device to be freed while still in use by readers.
Fix this by clearing b->media_ptr in tipc_disable_l2_media() before calling synchronize_net().
This is safe to do now because the call order in bearer_disable() was reversed in 0d051bf93c06 ("tipc: make bearer packet filtering generic") to call tipc_node_delete_links() (which needs the pointer) before disable_media().
https: //lore.kernel.org/netdev/[email protected]/T/#u
--- net/tipc/bearer.c | 1 + 1 file changed, 1 insertion(+)
net/tipc/bearer.c +1 -0
@@ -482,6 +482,7 @@ void tipc_disable_l2_media(struct tipc_bearer *b) dev = (struct net_device *)rtnl_dereference (b->media_ptr);dev_remove_pack (&b->pt);RCU_INIT_POINTER (dev->tipc_ptr,NULL ); +RCU_INIT_POINTER (b->media_ptr,NULL );synchronize_net ();dev_put (dev); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 392/1276 tcp: ipv6: clamp default adverting MSS to avoid GSO_BY_FRAGS (0xFFFF)
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 2bf43d0e2e6a27d52a7d624e2d6b9116972e8a22 ]
When MTU is large, ip6_default_advmss() can return IPV6_MAXPLEN (65535). This is interpreted by TCP as mss_clamp, allowing the MSS to reach 65535.
However, 0xFFFF is also used as a magic value GSO_BY_FRAGS in the kernel. If a TCP packet with gso_size=0xFFFF is passed to skb_segment(), it will be mistakenly treated as GSO_BY_FRAGS, leading to a NULL pointer dereference because local TCP packets do not use frag_list.
Fix this by returning min(IPV6_MAXPLEN, GSO_BY_FRAGS - 1) (65534) from ip6_default_advmss() when MTU is large.
Also update the stale comment in ip6_default_advmss() which suggested that IPV6_MAXPLEN is returned to mean "any MSS".
--- net/ipv6/route.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/ipv6/route.c +3 -3
@@ -3261,11 +3261,11 @@ static unsigned int ip6_default_advmss(const struct dst_entry *dst)/* * Maximal non-jumbo IPv6 payload is IPV6_MAXPLEN and * corresponding MSS is IPV6_MAXPLEN - tcp_header_size. -* IPV6_MAXPLEN is also valid and means: "any MSS, -* rely only on pmtu discovery" +* Limit the default MSS to GSO_BY_FRAGS - 1 to avoid +* collision with the GSO_BY_FRAGS magic value (0xFFFF). */ if (mtu >IPV6_MAXPLEN -sizeof (struct tcphdr )) - mtu =IPV6_MAXPLEN ; + mtu = min_t(unsigned int, IPV6_MAXPLEN, GSO_BY_FRAGS - 1);return mtu; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 393/1276 net: airoha: Introduce ndo_select_queue callback
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lorenzo Bianconi <[email protected]>
[ Upstream commit 2b288b81560b94958cd68bbe54673e55a1730c95 ]
Airoha EN7581 SoC supports 32 Tx DMA rings used to feed packets to QoS channels. Each channels supports 8 QoS queues where the user can apply QoS scheduling policies. In a similar way, the user can configure hw rate shaping for each QoS channel.
Introduce ndo_select_queue callback in order to select the tx queue based on QoS channel and QoS queue. In particular, for dsa device select QoS channel according to the dsa user port index, rely on port id otherwise. Select QoS queue based on the skb priority.
Stable-dep-of: c66f8511a810 ("net: airoha: Fix always-true condition in PPE1 queue reservation loop")
--- drivers/net/ethernet/mediatek/airoha_eth.c | 30 ++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-)
drivers/net/ethernet/mediatek/airoha_eth.c +28 -2
@@ -23,6 +23,8 @@#define AIROHA_MAX_NUM_XSI_RSTS 5#define AIROHA_MAX_MTU 2000#define AIROHA_MAX_PACKET_SIZE 2048 +#define AIROHA_NUM_QOS_CHANNELS 4 +#define AIROHA_NUM_QOS_QUEUES 8#define AIROHA_NUM_TX_RING 32#define AIROHA_NUM_RX_RING 32#define AIROHA_FE_MC_MAX_VLAN_TABLE 64
@@ -2428,21 +2430,44 @@ static void airoha_dev_get_stats64(struct net_device *dev, }while (u64_stats_fetch_retry (&port->stats.syncp, start)); } +static u16 airoha_dev_select_queue (struct net_device *dev,struct sk_buff *skb, +struct net_device *sb_dev) +{ +struct airoha_gdm_port *port =netdev_priv (dev); +int queue, channel; + +/* For dsa device select QoS channel according to the dsa user port +* index, rely on port id otherwise. Select QoS queue based on the +* skb priority. +*/ + channel =netdev_uses_dsa (dev) ?skb_get_queue_mapping (skb) : port->id; + channel = channel %AIROHA_NUM_QOS_CHANNELS ; + queue = (skb->priority -1 ) %AIROHA_NUM_QOS_QUEUES ;/* QoS queue */ + queue = channel *AIROHA_NUM_QOS_QUEUES + queue; + +return queue < dev->num_tx_queues ? queue :0 ; +} +static netdev_tx_t airoha_dev_xmit (struct sk_buff *skb,struct net_device *dev) {struct skb_shared_info *sinfo =skb_shinfo (skb);struct airoha_gdm_port *port =netdev_priv (dev); -u32 msg0 =0 , msg1, len =skb_headlen (skb); -int i, qid =skb_get_queue_mapping (skb); +u32 msg0, msg1, len =skb_headlen (skb);struct airoha_qdma *qdma = port->qdma;u32 nr_frags =1 + sinfo->nr_frags;struct netdev_queue *txq;struct airoha_queue *q;void *data = skb->data; +int i, qid;u16 index;u8 fport; + qid =skb_get_queue_mapping (skb) %ARRAY_SIZE (qdma->q_tx); + msg0 =FIELD_PREP (QDMA_ETH_TXMSG_CHAN_MASK , + qid /AIROHA_NUM_QOS_QUEUES ) | +FIELD_PREP (QDMA_ETH_TXMSG_QUEUE_MASK , + qid %AIROHA_NUM_QOS_QUEUES );if (skb->ip_summed ==CHECKSUM_PARTIAL ) msg0 |=FIELD_PREP (QDMA_ETH_TXMSG_TCO_MASK ,1 ) | FIELD_PREP(QDMA_ETH_TXMSG_UCO_MASK, 1) |
@@ -2616,6 +2641,7 @@ static const struct net_device_ops airoha_netdev_ops = { .ndo_init = airoha_dev_init, .ndo_open = airoha_dev_open, .ndo_stop = airoha_dev_stop, + .ndo_select_queue = airoha_dev_select_queue, .ndo_start_xmit = airoha_dev_xmit, .ndo_get_stats64 = airoha_dev_get_stats64, .ndo_set_mac_address = airoha_dev_set_macaddr,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 394/1276 net: airoha: Add sched ETS offload support
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lorenzo Bianconi <[email protected]>
[ Upstream commit 20bf7d07c956e5c7a22d3076c599cbb7a6054917 ]
Introduce support for ETS Qdisc offload available on the Airoha EN7581 ethernet controller. In order to be effective, ETS Qdisc must configured as leaf of a HTB Qdisc (HTB Qdisc offload will be added in the following patch). ETS Qdisc available on EN7581 ethernet controller supports at most 8 concurrent bands (QoS queues). We can enable an ETS Qdisc for each available QoS channel.
Stable-dep-of: c66f8511a810 ("net: airoha: Fix always-true condition in PPE1 queue reservation loop")
--- drivers/net/ethernet/mediatek/airoha_eth.c | 196 ++++++++++++++++++++- 1 file changed, 195 insertions(+), 1 deletion(-)
drivers/net/ethernet/mediatek/airoha_eth.c +195 -1
@@ -15,6 +15,7 @@#include <linux/u64_stats_sync.h> #include <net/dsa.h> #include <net/page_pool/helpers.h> +#include <net/pkt_cls.h> #include <uapi/linux/ppp_defs.h> #define AIROHA_MAX_NUM_GDM_PORTS 1
@@ -543,9 +544,24 @@#define INGRESS_SLOW_TICK_RATIO_MASK GENMASK(29, 16)#define INGRESS_FAST_TICK_MASK GENMASK(15, 0) +#define REG_QUEUE_CLOSE_CFG (_n) (0x00a0 + ((_n) & 0xfc)) +#define TXQ_DISABLE_CHAN_QUEUE_MASK (_n, _m) BIT((_m) + (((_n) & 0x3) << 3)) +#define REG_TXQ_DIS_CFG_BASE (_n) ((_n) ? 0x20a0 : 0x00a0)#define REG_TXQ_DIS_CFG (_n, _m) (REG_TXQ_DIS_CFG_BASE((_n)) + (_m) << 2) +#define REG_CNTR_CFG (_n) (0x0400 + ((_n) << 3)) +#define CNTR_EN_MASK BIT(31) +#define CNTR_ALL_CHAN_EN_MASK BIT(30) +#define CNTR_ALL_QUEUE_EN_MASK BIT(29) +#define CNTR_ALL_DSCP_RING_EN_MASK BIT(28) +#define CNTR_SRC_MASK GENMASK(27, 24) +#define CNTR_DSCP_RING_MASK GENMASK(20, 16) +#define CNTR_CHAN_MASK GENMASK(7, 3) +#define CNTR_QUEUE_MASK GENMASK(2, 0) + +#define REG_CNTR_VAL (_n) (0x0404 + ((_n) << 3)) +#define REG_LMGR_INIT_CFG 0x1000#define LMGR_INIT_START BIT(31)#define LMGR_SRAM_MODE_MASK BIT(30)
@@ -571,9 +587,19 @@#define TWRR_WEIGHT_SCALE_MASK BIT(31)#define TWRR_WEIGHT_BASE_MASK BIT(3) +#define REG_TXWRR_WEIGHT_CFG 0x1024 +#define TWRR_RW_CMD_MASK BIT(31) +#define TWRR_RW_CMD_DONE BIT(30) +#define TWRR_CHAN_IDX_MASK GENMASK(23, 19) +#define TWRR_QUEUE_IDX_MASK GENMASK(18, 16) +#define TWRR_VALUE_MASK GENMASK(15, 0) +#define REG_PSE_BUF_USAGE_CFG 0x1028#define PSE_BUF_ESTIMATE_EN_MASK BIT(29) +#define REG_CHAN_QOS_MODE (_n) (0x1040 + ((_n) << 2)) +#define CHAN_QOS_MODE_MASK (_n) GENMASK(2 + ((_n) << 2), (_n) << 2) +#define REG_GLB_TRTCM_CFG 0x1080#define GLB_TRTCM_EN_MASK BIT(31)#define GLB_TRTCM_MODE_MASK BIT(30)
@@ -722,6 +748,17 @@ enum { FE_PSE_PORT_DROP = 0xf, }; +enum tx_sched_mode { +TC_SCH_WRR8 , +TC_SCH_SP , +TC_SCH_WRR7 , +TC_SCH_WRR6 , +TC_SCH_WRR5 , +TC_SCH_WRR4 , +TC_SCH_WRR3 , +TC_SCH_WRR2 , +}; + struct airoha_queue_entry { union { void *buf;
@@ -812,6 +849,10 @@ struct airoha_gdm_port {int id;struct airoha_hw_stats stats; + +/* qos stats counters */ +u64 cpu_tx_packets; +u64 fwd_tx_packets; };struct airoha_eth {
@@ -1968,6 +2009,27 @@ static void airoha_qdma_init_qos(struct airoha_qdma *qdma) FIELD_PREP(SLA_SLOW_TICK_RATIO_MASK, 40)); } +static void airoha_qdma_init_qos_stats (struct airoha_qdma *qdma) +{ +int i; + +for (i =0 ; i <AIROHA_NUM_QOS_CHANNELS ; i++) { +/* Tx-cpu transferred count */ +airoha_qdma_wr (qdma,REG_CNTR_VAL (i <<1 ),0 ); +airoha_qdma_wr (qdma,REG_CNTR_CFG (i <<1 ), +CNTR_EN_MASK |CNTR_ALL_QUEUE_EN_MASK | +CNTR_ALL_DSCP_RING_EN_MASK | +FIELD_PREP (CNTR_CHAN_MASK , i)); +/* Tx-fwd transferred count */ +airoha_qdma_wr (qdma,REG_CNTR_VAL ((i <<1 ) +1 ),0 ); +airoha_qdma_wr (qdma,REG_CNTR_CFG (i <<1 ), +CNTR_EN_MASK |CNTR_ALL_QUEUE_EN_MASK | +CNTR_ALL_DSCP_RING_EN_MASK | +FIELD_PREP (CNTR_SRC_MASK ,1 ) | +FIELD_PREP (CNTR_CHAN_MASK , i)); + } +} +static int airoha_qdma_hw_init (struct airoha_qdma *qdma) {int i;
@@ -2018,6 +2080,7 @@ static int airoha_qdma_hw_init(struct airoha_qdma *qdma)airoha_qdma_set (qdma,REG_TXQ_CNGST_CFG ,TXQ_CNGST_DROP_EN |TXQ_CNGST_DEI_DROP_EN ); +airoha_qdma_init_qos_stats (qdma);return 0 ; }
@@ -2637,6 +2700,135 @@ airoha_ethtool_get_rmon_stats(struct net_device *dev, }while (u64_stats_fetch_retry (&port->stats.syncp, start)); } +static int airoha_qdma_set_chan_tx_sched (struct airoha_gdm_port *port, +int channel,enum tx_sched_mode mode, +const u16 *weights,u8 n_weights) +{ +int i; + +for (i =0 ; i <AIROHA_NUM_TX_RING ; i++) +airoha_qdma_clear (port->qdma,REG_QUEUE_CLOSE_CFG (channel), +TXQ_DISABLE_CHAN_QUEUE_MASK (channel, i)); + +for (i =0 ; i < n_weights; i++) { +u32 status; +int err; + +airoha_qdma_wr (port->qdma,REG_TXWRR_WEIGHT_CFG , +TWRR_RW_CMD_MASK | +FIELD_PREP (TWRR_CHAN_IDX_MASK , channel) | +FIELD_PREP (TWRR_QUEUE_IDX_MASK , i) | +FIELD_PREP (TWRR_VALUE_MASK , weights[i])); + err =read_poll_timeout (airoha_qdma_rr, status, + status &TWRR_RW_CMD_DONE , +USEC_PER_MSEC ,10 *USEC_PER_MSEC , + true, port->qdma, +REG_TXWRR_WEIGHT_CFG ); +if (err) +return err; + } + +airoha_qdma_rmw (port->qdma,REG_CHAN_QOS_MODE (channel >>3 ), +CHAN_QOS_MODE_MASK (channel), + mode <<__ffs (CHAN_QOS_MODE_MASK (channel))); + +return 0 ; +} + +static int airoha_qdma_set_tx_prio_sched (struct airoha_gdm_port *port, +int channel) +{ +static const u16 w[AIROHA_NUM_QOS_QUEUES ] = {}; + +return airoha_qdma_set_chan_tx_sched (port, channel,TC_SCH_SP , w, +ARRAY_SIZE (w)); +} + +static int airoha_qdma_set_tx_ets_sched (struct airoha_gdm_port *port, +int channel, +struct tc_ets_qopt_offload *opt) +{ +struct tc_ets_qopt_offload_replace_params *p = &opt->replace_params; +enum tx_sched_mode mode =TC_SCH_SP ; +u16 w[AIROHA_NUM_QOS_QUEUES ] = {}; +int i, nstrict =0 ; + +if (p->bands >AIROHA_NUM_QOS_QUEUES ) +return -EINVAL ; + +for (i =0 ; i < p->bands; i++) { +if (!p->quanta[i]) + nstrict++; + } + +/* this configuration is not supported by the hw */ +if (nstrict ==AIROHA_NUM_QOS_QUEUES -1 ) +return -EINVAL ; + +for (i =0 ; i < p->bands - nstrict; i++) + w[i] = p->weights[nstrict + i]; + +if (!nstrict) + mode =TC_SCH_WRR8 ; +else if (nstrict <AIROHA_NUM_QOS_QUEUES -1 ) + mode = nstrict +1 ; + +return airoha_qdma_set_chan_tx_sched (port, channel, mode, w, +ARRAY_SIZE (w)); +} + +static int airoha_qdma_get_tx_ets_stats (struct airoha_gdm_port *port, +int channel, +struct tc_ets_qopt_offload *opt) +{ +u64 cpu_tx_packets =airoha_qdma_rr (port->qdma, +REG_CNTR_VAL (channel <<1 )); +u64 fwd_tx_packets =airoha_qdma_rr (port->qdma, +REG_CNTR_VAL ((channel <<1 ) +1 )); +u64 tx_packets = (cpu_tx_packets - port->cpu_tx_packets) + + (fwd_tx_packets - port->fwd_tx_packets); +_bstats_update (opt->stats.bstats,0 , tx_packets); + + port->cpu_tx_packets = cpu_tx_packets; + port->fwd_tx_packets = fwd_tx_packets; + +return 0 ; +} + +static int airoha_tc_setup_qdisc_ets (struct airoha_gdm_port *port, +struct tc_ets_qopt_offload *opt) +{ +int channel =TC_H_MAJ (opt->handle) >>16 ; + +if (opt->parent ==TC_H_ROOT ) +return -EINVAL ; + +switch (opt->command) { +case TC_ETS_REPLACE : +return airoha_qdma_set_tx_ets_sched (port, channel, opt); +case TC_ETS_DESTROY : +/* PRIO is default qdisc scheduler */ +return airoha_qdma_set_tx_prio_sched (port, channel); +case TC_ETS_STATS : +return airoha_qdma_get_tx_ets_stats (port, channel, opt); +default : +return -EOPNOTSUPP ; + } +} + +static int airoha_dev_tc_setup (struct net_device *dev,enum tc_setup_type type, +void *type_data) +{ +struct airoha_gdm_port *port =netdev_priv (dev); + +switch (type) { +case TC_SETUP_QDISC_ETS : +return airoha_tc_setup_qdisc_ets (port, type_data); +default : +return -EOPNOTSUPP ; + } +} +static const struct net_device_ops airoha_netdev_ops = { .ndo_init = airoha_dev_init, .ndo_open = airoha_dev_open,
@@ -2645,6 +2837,7 @@ static const struct net_device_ops airoha_netdev_ops = { .ndo_start_xmit = airoha_dev_xmit, .ndo_get_stats64 = airoha_dev_get_stats64, .ndo_set_mac_address = airoha_dev_set_macaddr, + .ndo_setup_tc = airoha_dev_tc_setup, };static const struct ethtool_ops airoha_ethtool_ops = {
@@ -2694,7 +2887,8 @@ static int airoha_alloc_gdm_port(struct airoha_eth *eth, struct device_node *np) dev->watchdog_timeo =5 *HZ ; dev->hw_features =NETIF_F_IP_CSUM |NETIF_F_RXCSUM |NETIF_F_TSO6 |NETIF_F_IPV6_CSUM | -NETIF_F_SG |NETIF_F_TSO ; +NETIF_F_SG |NETIF_F_TSO | +NETIF_F_HW_TC ; dev->features |= dev->hw_features; dev->dev.of_node = np; dev->irq = qdma->irq;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 395/1276 net: airoha: Fix always-true condition in PPE1 queue reservation loop
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wayen.Yan <[email protected]>
[ Upstream commit c66f8511a8109fa50767941b26d3623e316fde02 ]
In airoha_fe_pse_ports_init(), the inner condition for PPE1 queue reservation is identical to the for-loop bound, making it always true and the else branch dead code:
for (q = 0; q < pse_port_num_queues[FE_PSE_PORT_PPE1]; q++) {
if (q < pse_port_num_queues[FE_PSE_PORT_PPE1]) /* always true */
set RSV_PAGES;
else
set 0; /* unreachable */
}The intended behavior is to reserve pages only for the first half of the queues, matching the PPE2 implementation on line 334 which correctly uses the /2 divisor. Fix the PPE1 condition accordingly.
--- drivers/net/ethernet/mediatek/airoha_eth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mediatek/airoha_eth.c +1 -1
@@ -1238,7 +1238,7 @@ static void airoha_fe_pse_ports_init(struct airoha_eth *eth) PSE_QUEUE_RSV_PAGES);/* PPE1 */ for (q =0 ; q < pse_port_num_queues[FE_PSE_PORT_PPE1 ]; q++) { -if (q < pse_port_num_queues[FE_PSE_PORT_PPE1 ]) +if (q < pse_port_num_queues[FE_PSE_PORT_PPE1 ] /2 )airoha_fe_set_pse_oq_rsv (eth,FE_PSE_PORT_PPE1 , q,PSE_QUEUE_RSV_PAGES );else
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 396/1276 net: ethernet: oa_tc6: mdiobus->parent initialized with NULL
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Selvamani Rajagopal <[email protected]>
[ Upstream commit a221d3f7e3f3ea6a3b4bc511cf2a59242daa06e1 ]
As "dev" pointer in oa_tc6 structure is never initialized, mbiobus->parent was initialized with NULL. This change fixes it by initializing it with device pointer of spi.
--- drivers/net/ethernet/oa_tc6.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/oa_tc6.c +1 -2
@@ -107,7 +107,6 @@/* Internal structure for MAC-PHY drivers */ struct oa_tc6 { -struct device *dev;struct net_device *netdev;struct phy_device *phydev;struct mii_bus *mdiobus;
@@ -518,7 +517,7 @@ static int oa_tc6_mdiobus_register(struc tc6->mdiobus->read_c45 = oa_tc6_mdiobus_read_c45; tc6->mdiobus->write_c45 = oa_tc6_mdiobus_write_c45; tc6->mdiobus->name ="oa-tc6-mdiobus" ; - tc6->mdiobus->parent = tc6->dev; + tc6->mdiobus->parent = &tc6->spi->dev;snprintf (tc6->mdiobus->id,ARRAY_SIZE (tc6->mdiobus->id),"%s" ,dev_name (&tc6->spi->dev));
Greg Kroah-Hartman
maintainerPATCH 397/1276 net: ethernet: oa_tc6: Remove FCS size in RX frame
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Selvamani Rajagopal <[email protected]>
[ Upstream commit a5a1d11dd3729146abe7420b874bab15870a42b4 ]
OA TC6 MAC-PHY appends FCS to the incoming frame. It must be removed from the frame before being passed to the stack.
With FCS in the frame, many applications, like ping or any application that uses IP layer may work as they may carry the packet size information in the protocol.
Application like ptp4l, particularly if it uses layer 2 for its communication, it will fail with "bad message" due to the extra 4 bytes added by the presence of FCS.
--- drivers/net/ethernet/oa_tc6.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/net/ethernet/oa_tc6.c +11 -0
@@ -751,6 +751,17 @@ static int oa_tc6_process_rx_chunk_footestatic void oa_tc6_submit_rx_skb (struct oa_tc6 *tc6) { +/* MAC-PHY delivers each frame with its Ethernet FCS attached. +* Strip it before handing over to the stack, unless the user +* has asked to keep it via NETIF_F_RXFCS. Keeping the FCS +* in the frame is harmless for IP traffic, but is parsed as +* a (malformed) suffix TLV by PTP, which makes ptp4l reject +* every message with "bad message" error. +*/ +if (!(tc6->netdev->features &NETIF_F_RXFCS ) && + tc6->rx_skb->len >ETH_FCS_LEN ) +skb_trim (tc6->rx_skb, tc6->rx_skb->len -ETH_FCS_LEN ); + tc6->rx_skb->protocol =eth_type_trans (tc6->rx_skb, tc6->netdev); tc6->netdev->stats.rx_packets++; tc6->netdev->stats.rx_bytes += tc6->rx_skb->len;
Greg Kroah-Hartman
maintainerPATCH 398/1276 dt-bindings: net: updated interrupt type to be active low, level triggered
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Selvamani Rajagopal <[email protected]>
[ Upstream commit 31e56112e6544afba0a50d60251175585ee62943 ]
According to OPEN Alliance 10BASE-T1x MACPHY Serial Interface (TC6) specification, interrupt type is active low, level triggered interrupt.
Specification calls for when interrupt level will be asserted and what condition it is de-asserted. By using edge triggered interrupt, there is a potential chance to miss it, particularly if it is asserted when interrupt is disabled.
Level triggered interrupt can't be missed as it gets de-asserted only on interrupt handler taking actions on interrupting conditions.
--- Documentation/devicetree/bindings/net/microchip,lan8650.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/net/microchip,lan8650.yaml +1 -1
@@ -67,7 +67,7 @@ examples: pinctrl-names = "default"; pinctrl-0 = <ð0_pins>; interrupt-parent = <&gpio>; - interrupts = <6 IRQ_TYPE_EDGE_FALLING>; + interrupts = <6 IRQ_TYPE_LEVEL_LOW>; local-mac-address = [04 05 06 01 02 03]; spi-max-frequency = <15000000>; };
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 399/1276 ionic: Fix check in ionic_get_link_ext_stats
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brett Creeley <[email protected]>
[ Upstream commit 7678e69079c10b2fb10977f28f44ddb22971ea5b ]
The current check will fail if SR-IOV is not initialized for the physical function; this is because is_physfn is 0 if sriov_init() isn't run or fails. Change the check that prevents getting the link down count to use is_virtfn instead so that VFs don't get this functionality, which was the original intent.
--- drivers/net/ethernet/pensando/ionic/ionic_ethtool.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/net/ethernet/pensando/ionic/ionic_ethtool.c +9 -2
@@ -116,8 +116,15 @@ static void ionic_get_link_ext_stats(struct net_device *netdev, {struct ionic_lif *lif =netdev_priv (netdev); -if (lif->ionic->pdev->is_physfn) - stats->link_down_events = lif->link_down_count; +if (lif->ionic->pdev->is_virtfn) +return ; + +if (!lif->ionic->idev.port_info) { +netdev_err_once (netdev,"port_info not initialized\n" ); +return ; + } + + stats->link_down_events = lif->link_down_count; } static int ionic_get_link_ksettings(struct net_device *netdev,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 400/1276 ksmbd: fix use-after-free in same_client_has_lease()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guangshuo Li <[email protected]>
[ Upstream commit 65b655f65c3ca1ab5d598d3832bb0ff531725858 ]
same_client_has_lease() returns an opinfo pointer from ci->m_op_list after dropping ci->m_lock without taking a reference.
smb_grant_oplock() then dereferences that pointer in copy_lease() and when checking breaking_cnt. A concurrent close can remove the old lease from ci->m_op_list and drop the last reference before the caller uses the returned pointer, leading to a use-after-free.
Take a reference when same_client_has_lease() selects an existing lease, drop any previous match while scanning, and release the returned reference in smb_grant_oplock() after copying the lease state.
--- fs/smb/server/oplock.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/smb/server/oplock.c +6 -0
@@ -531,7 +531,12 @@ static struct oplock_info *same_client_has_lease(struct ksmbd_inode *ci, ret =compare_guid_key (opinfo, client_guid, lctx->lease_key);if (ret) { +if (!atomic_inc_not_zero (&opinfo->refcount)) +continue ; +if (m_opinfo) +opinfo_put (m_opinfo); m_opinfo = opinfo; +/* skip upgrading lease about breaking lease */ if (atomic_read (&opinfo->breaking_cnt))continue ;
@@ -1249,6 +1254,7 @@ int smb_grant_oplock(struct ksmbd_work *work, int req_op_level, u64 pid,if (atomic_read (&m_opinfo->breaking_cnt)) opinfo->o_lease->flags =SMB2_LEASE_FLAG_BREAK_IN_PROGRESS_LE ; +opinfo_put (m_opinfo); goto out; } }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 401/1276 mfd: rsmu: Fix page register setup
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthew Bystrin <[email protected]>
[ Upstream commit 6bc38f26ed07197b11a2b588edf1f43bfbc81d76 ]
Fix writes to page register in 8A3400x family (Clock Matrix).
All calls to rsmu_write_page_register() (both in i2c and spi) have resulted in early return, because all addresses in include/linux/mfd/idt8a340_reg.h are less than RSMU_CM_SCSR_BASE.
There were 2 separate patch series which have to be merged in one time:
mfd and ptp. The latter have been merged, the former[1] have not.
--- drivers/mfd/rsmu_i2c.c | 6 +----- drivers/mfd/rsmu_spi.c | 5 +---- 2 files changed, 2 insertions(+), 9 deletions(-)
drivers/mfd/rsmu_i2c.c +1 -5
@@ -134,14 +134,10 @@ static int rsmu_i2c_write_device(struct rsmu_ddata *rsmu, u8 reg, u8 *buf, u8 bystatic int rsmu_write_page_register (struct rsmu_ddata *rsmu,u32 reg,rsmu_rw_device rsmu_write_device) { -u32 page = reg &RSMU_CM_PAGE_MASK ; +u32 page = (reg |RSMU_CM_SCSR_BASE ) &RSMU_CM_PAGE_MASK ;u8 buf[4 ];int err; -/* Do not modify offset register for none-scsr registers */ -if (reg <RSMU_CM_SCSR_BASE ) -return 0 ; -/* Simply return if we are on the same page */ if (rsmu->page == page)return 0 ;
drivers/mfd/rsmu_spi.c +1 -4
@@ -101,11 +101,8 @@ static int rsmu_write_page_register(struct rsmu_ddata *rsmu, u32 reg)switch (rsmu->type) {case RSMU_CM : -/* Do not modify page register for none-scsr registers */ -if (reg <RSMU_CM_SCSR_BASE ) -return 0 ; page_reg =RSMU_CM_PAGE_ADDR ; - page = reg &RSMU_PAGE_MASK ; + page = (reg |RSMU_CM_SCSR_BASE ) &RSMU_PAGE_MASK ; buf[0 ] = (u8)(page &0xFF ); buf[1 ] = (u8)((page >>8 ) &0xFF ); buf[2 ] = (u8)((page >>16 ) &0xFF );
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 402/1276 mfd: cs42l43: Sanity check firmware size
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Charles Keepax <[email protected]>
[ Upstream commit b6ef1a74b3ec254f87a6a3c554fe8f8083ebd37c ]
Currently the code checks if a firmware was received, however it does not verify that the firmware size is larger than the firmware header. As the firmware pointer is dereferenced as a pointer to the header structure this could lead to an out of bounds memory access. Add the missing check.
--- drivers/mfd/cs42l43.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mfd/cs42l43.c +1 -1
@@ -675,7 +675,7 @@ static void cs42l43_mcu_load_firmware(const struct firmware *firmware, void *conunsigned int loadaddr, val;int ret; -if (!firmware) { +if (!firmware || firmware->size <sizeof (*hdr)) {dev_err (cs42l43->dev,"Failed to load firmware\n" ); cs42l43->firmware_error = -ENODEV ; goto err;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 403/1276 ocfs2: fix circular locking dependency in ocfs2_dio_end_io_write
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aleksandr Nogikh <[email protected]>
[ Upstream commit ff6f26c58421614b02694ac9d219ac61d924bc68 ]
A circular locking dependency involves INODE_ALLOC_SYSTEM_INODE, EXTENT_ALLOC_SYSTEM_INODE, and ORPHAN_DIR_SYSTEM_INODE.
1. ocfs2_mknod() acquires INODE_ALLOC then EXTENT_ALLOC.
2. ocfs2_dio_end_io_write() acquires EXTENT_ALLOC for unwritten extents, then ORPHAN_DIR via ocfs2_del_inode_from_orphan() while still holding EXTENT_ALLOC.
3. ocfs2_wipe_inode() acquires ORPHAN_DIR then INODE_ALLOC via ocfs2_remove_inode.
Break the cycle in ocfs2_dio_end_io_write() by freeing the allocation contexts (releasing EXTENT_ALLOC) before acquiring ORPHAN_DIR.
WARNING: possible circular locking dependency detected
------------------------------------------------------
is trying to acquire lock:ffff8881e78b33a0 (&ocfs2_sysfile_lock_key[INODE_ALLOC_SYSTEM_INODE]){+.+.}-{4:4}, at:ocfs2_evict_inode+0x1539/0x43b0 fs/ocfs2/inode.c:1299
but task is already holding lock:ffff8881e78b4fa0 (&ocfs2_sysfile_lock_key[ORPHAN_DIR_SYSTEM_INODE]){+.+.}-{4:4}, at:ocfs2_evict_inode+0xe97/0x43b0 fs/ocfs2/inode.c:1299
the existing dependency chain (in reverse order) is:
-> #2 (&ocfs2_sysfile_lock_key[ORPHAN_DIR_SYSTEM_INODE]){+.+.}-{4:4}:
inode_lock include/linux/fs.h:1029 [inline]
ocfs2_del_inode_from_orphan+0x12e/0x7a0 fs/ocfs2/namei.c:2728
ocfs2_dio_end_io+0xf9c/0x1370 fs/ocfs2/aops.c:2418
dio_complete+0x25b/0x790 fs/direct-io.c:281-> #1 (&ocfs2_sysfile_lock_key[EXTENT_ALLOC_SYSTEM_INODE]){+.+.}-{4:4}:
inode_lock include/linux/fs.h:1029 [inline]
ocfs2_reserve_suballoc_bits+0x16d/0x4840 fs/ocfs2/suballoc.c:882
ocfs2_reserve_new_metadata_blocks+0x415/0x9a0
fs/ocfs2/suballoc.c:1078
ocfs2_mknod+0x10f3/0x2260 fs/ocfs2/namei.c:351-> #0 (&ocfs2_sysfile_lock_key[INODE_ALLOC_SYSTEM_INODE]){+.+.}-{4:4}:
__lock_acquire+0x15a5/0x2cf0 kernel/locking/lockdep.c:5237
lock_acquire+0x106/0x350 kernel/locking/lockdep.c:5868
down_write+0x96/0x200 kernel/locking/rwsem.c:1625
inode_lock include/linux/fs.h:1029 [inline]
ocfs2_remove_inode fs/ocfs2/inode.c:733 [inline]
ocfs2_wipe_inode fs/ocfs2/inode.c:896 [inline]
ocfs2_delete_inode fs/ocfs2/inode.c:1157 [inline]
ocfs2_evict_inode+0x1539/0x43b0 fs/ocfs2/inode.c:1299
Chain exists of:
&ocfs2_sysfile_lock_key[INODE_ALLOC_SYSTEM_INODE] -->
&ocfs2_sysfile_lock_key[EXTENT_ALLOC_SYSTEM_INODE] -->
&ocfs2_sysfile_lock_key[ORPHAN_DIR_SYSTEM_INODE]
Possible unsafe locking scenario: CPU0 CPU1
---- ----
lock(&ocfs2_sysfile_lock_key[ORPHAN_DIR_SYSTEM_INODE]);
lock(&ocfs2_sysfile_lock_key[EXTENT_ALLOC_SYSTEM_INODE]);
lock(&ocfs2_sysfile_lock_key[ORPHAN_DIR_SYSTEM_INODE]); lock(&ocfs2_sysfile_lock_key[INODE_ALLOC_SYSTEM_INODE]);
*** DEADLOCK ***
--- fs/ocfs2/aops.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
fs/ocfs2/aops.c +9 -4
@@ -2396,6 +2396,15 @@ static int ocfs2_dio_end_io_write(struct inode *inode, unlock:up_write (&oi->ip_alloc_sem); +if (data_ac) { +ocfs2_free_alloc_context (data_ac); + data_ac =NULL ; + } +if (meta_ac) { +ocfs2_free_alloc_context (meta_ac); + meta_ac =NULL ; + } +/* everything looks good, let's start the cleanup */ if (!ret && dwc->dw_orphaned) {BUG_ON (dwc->dw_writer_pid !=task_pid_nr (current));
@@ -2407,10 +2416,6 @@ static int ocfs2_dio_end_io_write(struct inode *inode,ocfs2_inode_unlock (inode,1 );brelse (di_bh); out: -if (data_ac) -ocfs2_free_alloc_context (data_ac); -if (meta_ac) -ocfs2_free_alloc_context (meta_ac);ocfs2_run_deallocs (osb, &dealloc);ocfs2_dio_free_write_ctx (inode, dwc);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 404/1276 net/9p: fix race condition on rdma->state in trans_rdma.c
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yizhou Zhao <[email protected]>
[ Upstream commit 7d54894a1ee265a72d70f7cae1da6cc774cccc71 ]
The rdma->state field is modified without holding req_lock in both recv_done() and p9_cm_event_handler(), while rdma_request() accesses the same field under the req_lock spinlock. This inconsistent locking creates a race condition:
- recv_done() running in softirq completion context sets rdma->state = P9_RDMA_FLUSHING without acquiring req_lock
- p9_cm_event_handler() modifies rdma->state at multiple points (ADDR_RESOLVED, ROUTE_RESOLVED, ESTABLISHED, CLOSED) without req_lock
- rdma_request() uses spin_lock_irqsave(&rdma->req_lock, flags) to protect the read-modify-write of rdma->state
The race can cause lost state transitions: recv_done() or the CM event handler could set state to FLUSHING/CLOSED while rdma_request() is concurrently checking or modifying state under the lock, leading to the FLUSHING transition being silently overwritten by CLOSING. This corrupts the connection state machine and can cause use-after-free on RDMA request objects during teardown.
Fix by adding req_lock protection to all rdma->state modifications in recv_done() and p9_cm_event_handler(), matching the pattern already used in rdma_request(). Use spin_lock_irqsave/spin_unlock_irqrestore in the CM event handler since it can race with recv_done() which runs in softirq context.
Tested with a kernel module that races two threads (simulating rdma_request and recv_done/CM handler) on rdma->state with proper
locking: 5.5M+ FLUSHING writes over 27M iterations with 0 lost transitions.
Message-ID: <[email protected]>
--- net/9p/trans_rdma.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)
net/9p/trans_rdma.c +17 -2
@@ -240,25 +240,36 @@ p9_cm_event_handler(struct rdma_cm_id *id, struct rdma_cm_event *event) {struct p9_client *c = id->context;struct p9_trans_rdma *rdma = c->trans; +unsigned long flags; +switch (event->event) {case RDMA_CM_EVENT_ADDR_RESOLVED : +spin_lock_irqsave (&rdma->req_lock, flags);BUG_ON (rdma->state !=P9_RDMA_INIT ); rdma->state =P9_RDMA_ADDR_RESOLVED ; +spin_unlock_irqrestore (&rdma->req_lock, flags);break ;case RDMA_CM_EVENT_ROUTE_RESOLVED : +spin_lock_irqsave (&rdma->req_lock, flags);BUG_ON (rdma->state !=P9_RDMA_ADDR_RESOLVED ); rdma->state =P9_RDMA_ROUTE_RESOLVED ; +spin_unlock_irqrestore (&rdma->req_lock, flags);break ;case RDMA_CM_EVENT_ESTABLISHED : +spin_lock_irqsave (&rdma->req_lock, flags);BUG_ON (rdma->state !=P9_RDMA_ROUTE_RESOLVED ); rdma->state =P9_RDMA_CONNECTED ; +spin_unlock_irqrestore (&rdma->req_lock, flags);break ;case RDMA_CM_EVENT_DISCONNECTED : -if (rdma) +if (rdma) { +spin_lock_irqsave (&rdma->req_lock, flags); rdma->state =P9_RDMA_CLOSED ; +spin_unlock_irqrestore (&rdma->req_lock, flags); + } c->status = Disconnected;break ;
@@ -296,6 +307,7 @@ recv_done(struct ib_cq *cq, struct ib_wc *wc)struct p9_req_t *req;int err =0 ;int16_t tag; +unsigned long flags; req =NULL ; ib_dma_unmap_single(rdma->cm_id->device, c->busa, client->msize,
@@ -332,7 +344,10 @@ recv_done(struct ib_cq *cq, struct ib_wc *wc) err_out:p9_debug (P9_DEBUG_ERROR ,"req %p err %d status %d\n" , req, err, wc->status); - rdma->state =P9_RDMA_FLUSHING ; +spin_lock_irqsave (&rdma->req_lock, flags); +if (rdma->state <P9_RDMA_FLUSHING ) + rdma->state =P9_RDMA_FLUSHING ; +spin_unlock_irqrestore (&rdma->req_lock, flags); client->status = Disconnected; goto out; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 405/1276 eventpoll: expand top-of-file overview / locking doc
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Brauner <[email protected]>
[ Upstream commit 7c25a0bd4bf7139944c5893ff61211f4b5a3455e ]
The existing ~40-line "LOCKING:" banner covered the three-level lock hierarchy (epnested_mutex > ep->mtx > ep->lock) but nothing else. Lifetime rules, the ready-list state machine, the three removal paths, and the POLLFREE contract are implicit in the code. The recent UAF series (a6dc643c6931, 07712db80857, 8c2e52ebbe88, f2e467a48287) rode on invariants that were only implicit.
Codify them at the top of the file: the subsystem overview, the lock hierarchy and its mutex_lock_nested() subclass convention (reworded from the old banner), a field-protection table for struct eventpoll and struct epitem that names the two faces of the rbn/rcu union (rbn under ep->mtx while linked into ep->rbr; rcu touched only by kfree_rcu(epi) on the free path), the ovflist sentinel encoding and scan-flip invariants, the three removal paths (A ep_remove, B ep_clear_and_put, C eventpoll_release_file) and the epi_fget() pin that orchestrates A vs C, and the POLLFREE store-release / load-acquire handshake.
No functional change.
Stable-dep-of: 0c4aefe3c2d0 ("eventpoll: Fix epoll_wait() report false negative")
--- fs/eventpoll.c | 199 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 162 insertions(+), 37 deletions(-)
fs/eventpoll.c +162 -37
@@ -41,45 +41,170 @@#include <net/busy_poll.h> /* -* LOCKING: -* There are three level of locking required by epoll : +* fs/eventpoll.c - Efficient event polling ("epoll") kernel implementation. * -* 1) epnested_mutex (mutex) -* 2) ep->mtx (mutex) -* 3) ep->lock (spinlock) * -* The acquire order is the one listed above, from 1 to 3. -* We need a spinlock (ep->lock) because we manipulate objects -* from inside the poll callback, that might be triggered from -* a wake_up() that in turn might be called from IRQ context. -* So we can't sleep inside the poll callback and hence we need -* a spinlock. During the event transfer loop (from kernel to -* user space) we could end up sleeping due a copy_to_user(), so -* we need a lock that will allow us to sleep. This lock is a -* mutex (ep->mtx). It is acquired during the event transfer loop, -* during epoll_ctl(EPOLL_CTL_DEL) and during eventpoll_release_file(). -* The epnested_mutex is acquired when inserting an epoll fd onto another -* epoll fd. We do this so that we walk the epoll tree and ensure that this -* insertion does not create a cycle of epoll file descriptors, which -* could lead to deadlock. We need a global mutex to prevent two -* simultaneous inserts (A into B and B into A) from racing and -* constructing a cycle without either insert observing that it is -* going to. -* It is necessary to acquire multiple "ep->mtx"es at once in the -* case when one epoll fd is added to another. In this case, we -* always acquire the locks in the order of nesting (i.e. after -* epoll_ctl(e1, EPOLL_CTL_ADD, e2), e1->mtx will always be acquired -* before e2->mtx). Since we disallow cycles of epoll file -* descriptors, this ensures that the mutexes are well-ordered. In -* order to communicate this nesting to lockdep, when walking a tree -* of epoll file descriptors, we use the current recursion depth as -* the lockdep subkey. -* It is possible to drop the "ep->mtx" and to use the global -* mutex "epnested_mutex" (together with "ep->lock") to have it working, -* but having "ep->mtx" will make the interface more scalable. -* Events that require holding "epnested_mutex" are very rare, while for -* normal operations the epoll private "ep->mtx" will guarantee -* a better scalability. +* Overview +* -------- +* +* Each epoll_create(2) returns an anonymous [eventpoll] file whose +* ->private_data is a struct eventpoll. Each EPOLL_CTL_ADD installs +* a struct epitem linking one (watched file, fd) pair back to that +* eventpoll via the watched file's f_op->poll() wait queue(s). When +* the watched file signals readiness, ep_poll_callback() fires and +* marks the epitem ready. epoll_wait(2) drains the ready list under +* ep->mtx, re-queueing items in level-triggered mode. +* +* epoll instances can watch other epoll instances up to EP_MAX_NESTS +* deep; cycles are forbidden and detected at EPOLL_CTL_ADD time. +* +* +* Locking +* ------- +* +* Three levels, acquired from outer to inner: +* +* epnested_mutex (global; rare; taken only for EPOLL_CTL_ADD +* loop / path checks) +* > ep->mtx (per-eventpoll; sleepable; serializes most ops) +* > ep->lock (per-eventpoll; IRQ-safe spinlock) +* +* file->f_lock (per-file; NOT IRQ-safe; guards f_ep hlist ops; +* nested inside ep->mtx, outside ep->lock) +* +* Rationale: +* - ep->lock is a spinlock because ep_poll_callback() is called from +* wake_up() which may run in hard-IRQ context. All ep->lock +* critical sections use spin_lock_irqsave(). +* - ep->mtx is a sleepable mutex because the event delivery loop +* calls copy_to_user(), and ep_insert() may sleep in +* kmem_cache_alloc() and f_op->poll(). +* - epnested_mutex is global because cycle detection needs a global +* view of the epoll topology; a per-object scheme would let two +* concurrent inserts (A into B, B into A) construct a cycle +* without either observer seeing it. +* - Per-ep ep->mtx is preferred for scalability elsewhere. Events +* that require epnested_mutex are rare. +* +* When EPOLL_CTL_ADD nests one eventpoll inside another we acquire +* ep->mtx on both: outer first, target second. Since cycles are +* forbidden the set of live ep->mtx holds is always a strict chain, +* communicated to lockdep via mutex_lock_nested() subclasses derived +* from the current recursion depth. +* +* +* Field protection +* ---------------- +* +* struct eventpoll: +* mtx - self +* rbr - ep->mtx +* ovflist, rdllist - ep->lock (IRQ-safe) +* wq - ep->lock for queue mutation +* poll_wait - internal waitqueue spinlock +* refs - file->f_lock for adds; ep->mtx for removes; +* RCU for readers (hlist_del_rcu + kfree_rcu(ep)) +* ws - ep->mtx +* gen, loop_check_depth - epnested_mutex +* file, user - immutable after setup +* refcount - atomic (refcount_t) +* napi_* - READ_ONCE / WRITE_ONCE +* +* struct epitem: +* rbn / rcu union - rbn: ep->mtx (while epi is linked in ep->rbr). +* rcu: written only by kfree_rcu(epi) on the free +* path; otherwise untouched by epoll code. +* rdllink, next - ep->lock +* ffd, ep - immutable after ep_insert() +* pwqlist - ep->mtx for writes; POLLFREE clears pwq->whead +* via smp_store_release(), see below +* fllink - file->f_lock for mutation; hlist_del_rcu + +* kfree_rcu(epi) for safe RCU readers +* ws - RCU (rcu_assign_pointer / +* rcu_dereference_check(mtx)) +* event - ep->mtx for writes; lockless read in +* ep_poll_callback pairs with smp_mb() in +* ep_modify() +* +* +* Ready-list state machine +* ------------------------ +* +* Readiness is tracked in two lists under ep->lock: +* +* rdllist - doubly-linked FIFO; the "current" ready list. +* ovflist - singly-linked LIFO; used during a scan to catch +* events that arrive while rdllist is being iterated +* without ep->lock. +* +* Encoded in ep->ovflist: +* EP_UNACTIVE_PTR - no scan active; callback appends to rdllist. +* NULL - scan active, no spill yet. +* pointer to epi - scan active with spilled items (LIFO). +* +* Encoded in epi->next: +* EP_UNACTIVE_PTR - epi is not on ovflist. +* otherwise - next epi on ovflist (NULL at tail). +* +* ep_start_scan() flips "not scanning" to "scanning" and splices +* rdllist into a caller-local txlist. ep_done_scan() drains ovflist +* back to rdllist (list_add head-insert reverses LIFO to FIFO), +* flips back to "not scanning", and re-splices any items the caller +* left in txlist (e.g., level-triggered re-queues). +* +* +* Removal paths +* ------------- +* +* Three paths dispose of epitems and/or eventpolls: +* +* A. ep_remove() - EPOLL_CTL_DEL and ep_insert() +* rollback. Caller holds ep->mtx. +* B. ep_clear_and_put() - close of the epoll fd itself +* (ep_eventpoll_release). +* C. eventpoll_release_file() - close of a watched file, invoked +* from __fput(). +* +* Coordination: +* A and C exclude each other via the watched file's refcount. +* A pins the file with epi_fget() before touching file->f_ep or +* file->f_lock; if the pin fails, __fput() is in flight and C +* will clean this epi up. See the epi_fget() block comment. +* A and B both hold ep->mtx serially. B walks the rbtree with +* rb_next() captured before ep_remove() erases the current node. +* B and C both take ep->mtx; the loser sees fewer entries or an +* empty file->f_ep. +* +* Within every path the internal order is strict: +* ep_unregister_pollwait() - drain pwqlist; synchronizes with any +* in-flight ep_poll_callback via the +* watched wait-queue head's lock. +* ep_remove_file() - hlist_del_rcu of epi->fllink and, +* if last watcher, clear file->f_ep, +* under file->f_lock. +* ep_remove_epi() - rb_erase, rdllist unlink (ep->lock), +* wakeup_source_unregister, +* kfree_rcu(epi). +* +* kfree_rcu(epi) defers the free past RCU readers in +* reverse_path_check_proc(); kfree_rcu(ep) defers past readers in +* ep_get_upwards_depth_proc(). +* +* +* POLLFREE handshake +* ------------------ +* +* When a subsystem tears down a wait-queue head that an epitem is +* registered on (binder, signalfd, ...), it wakes the callback with +* POLLFREE and must RCU-defer the head's free. The store/load pair: +* +* ep_poll_callback() POLLFREE branch: +* smp_store_release(&pwq->whead, NULL) +* +* ep_remove_wait_queue(): +* smp_load_acquire(&pwq->whead) +* +* See those sites for the full argument. */ /* Epoll private bits inside the event mask */
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 406/1276 eventpoll: rename attach_epitem() to ep_attach_file()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Brauner <[email protected]>
[ Upstream commit 6a3f1a494bc91d7976cf0d2b200bb3f1a22eef64 ]
ep_remove_file() tears down the f_ep linkage that attach_epitem() establishes, so the pair should look like one. Rename to ep_attach_file() for the "ep_*" + subject symmetry and to match the naming used elsewhere in the file (ep_insert, ep_modify, ep_remove, ep_remove_file, ep_remove_epi, ep_unregister_pollwait).
Pure rename; no functional change.
Stable-dep-of: 0c4aefe3c2d0 ("eventpoll: Fix epoll_wait() report false negative")
--- fs/eventpoll.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/eventpoll.c +2 -2
@@ -1640,7 +1640,7 @@ static noinline void ep_destroy_wakeup_source(struct epitem *epi)wakeup_source_unregister (ws); } -static int attach_epitem (struct file *file,struct epitem *epi) +static int ep_attach_file (struct file *file,struct epitem *epi) {struct epitems_head *to_free =NULL ;struct hlist_head *head =NULL ;
@@ -1711,7 +1711,7 @@ static int ep_insert(struct eventpoll *ep, const struct epoll_event *event,if (tep)mutex_lock_nested (&tep->mtx,1 );/* Add the current item to the list of active epoll hook for this file */ -if (unlikely (attach_epitem (tfile, epi) <0 )) { +if (unlikely (ep_attach_file (tfile, epi) <0 )) {if (tep)mutex_unlock (&tep->mtx);kmem_cache_free (epi_cache, epi);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 407/1276 eventpoll: split ep_insert() into alloc + register stages
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Brauner <[email protected]>
[ Upstream commit e0e35f4cb983a55a36e79e9b2a20ca0e0688fae6 ]
ep_insert() was 130 lines and mixed four concerns in one body: user quota charge and epitem allocation, attach-into-file-hlist plus rbtree insert plus target-ep locking, reverse-path + EPOLLWAKEUP + poll-queue install with rollback, and ready-list publication. Factor the first two concerns into named helpers so the body reduces to orchestration.
ep_alloc_epitem() charges the user's epoll_watches quota, allocates a fresh epitem, and initializes its fields. On failure it returns ERR_PTR(-ENOSPC) or ERR_PTR(-ENOMEM); on success the epi is not yet linked into anything.
ep_register_epitem() installs @epi into @tfile's f_ep hlist and @ep's rbtree, optionally chains @tfile onto tfile_check_list for the path check, takes the tep->mtx nested lock for the epoll-watches- epoll case, and finally takes the ep_get() reference that pairs with ep_remove()'s ep_put() in ep_insert()'s error paths. On failure it frees the epi and decrements epoll_watches to match ep_alloc_epitem().
ep_insert()'s remaining body is the rollback-via-ep_remove() chain (reverse_path_check, EPOLLWAKEUP source creation, ep_ptable_queue_proc allocation) and the ready-list / wake publication. Remove a few stale comments that duplicated function-level documentation or described obvious code.
No functional change; rollback boundaries unchanged -- every error path after ep_register_epitem() still calls ep_remove(), preserving the ep->refcount invariant that keeps ep_remove()'s WARN_ON_ONCE safe.
Stable-dep-of: 0c4aefe3c2d0 ("eventpoll: Fix epoll_wait() report false negative")
--- fs/eventpoll.c | 111 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 74 insertions(+), 37 deletions(-)
fs/eventpoll.c +74 -37
@@ -1675,68 +1675,112 @@ static int ep_attach_file(struct file *file, struct epitem *epi) }/* -* Must be called with "mtx" held. +* Charge the user's epoll_watches quota, allocate a fresh epitem for +* @tfile/@fd, and initialize its fields. The returned item is not yet +* linked into any data structure; the caller must install it via +* ep_register_epitem() (which takes over on success) or kmem_cache_free() +* it and decrement epoll_watches on its own. +* +* Returns ERR_PTR(-ENOSPC) if the quota is exceeded, ERR_PTR(-ENOMEM) +* if the slab allocation fails. */ -static int ep_insert (struct eventpoll *ep,const struct epoll_event *event, -struct file *tfile,int fd,int full_check) +static struct epitem *ep_alloc_epitem (struct eventpoll *ep, +const struct epoll_event *event, +struct file *tfile,int fd) { -int error, pwake =0 ; -__poll_t revents;struct epitem *epi; -struct ep_pqueue epq; -struct eventpoll *tep =NULL ; - -if (is_file_epoll (tfile)) - tep = tfile->private_data; - -lockdep_assert_irqs_enabled ();if (unlikely (percpu_counter_compare (&ep->user->epoll_watches, max_user_watches) >=0 )) -return -ENOSPC ; +return ERR_PTR (-ENOSPC );percpu_counter_inc (&ep->user->epoll_watches); -if (!(epi =kmem_cache_zalloc (epi_cache,GFP_KERNEL ))) { + epi =kmem_cache_zalloc (epi_cache,GFP_KERNEL ); +if (unlikely (!epi)) {percpu_counter_dec (&ep->user->epoll_watches); -return -ENOMEM ; +return ERR_PTR (-ENOMEM ); } -/* Item initialization follow here ... */ INIT_LIST_HEAD (&epi->rdllink); epi->ep = ep;ep_set_ffd (&epi->ffd, tfile, fd); epi->event = *event; epi->next =EP_UNACTIVE_PTR ; +return epi; +} + +/* +* Install @epi into its target file's f_ep hlist and into @ep's rbtree, +* taking one additional reference on @ep for the lifetime of the item. +* +* If @tep is non-NULL, the target file is itself an eventpoll; we hold +* tep->mtx at subclass 1 across the attach + rbtree insert to serialize +* with the target side. RB tree ops are protected by @ep->mtx, which +* the caller already holds. +* +* On failure the epi is freed and the epoll_watches counter decremented, +* matching ep_alloc_epitem()'s allocation. After this returns +* successfully, ep_insert()'s later error paths use ep_remove() for +* unwind; that cannot drop @ep's refcount to zero because the ep file +* itself still holds the original reference. +*/ +static int ep_register_epitem (struct eventpoll *ep,struct epitem *epi, +struct eventpoll *tep,int full_check) +{ +struct file *tfile = epi->ffd.file; +int error; +if (tep)mutex_lock_nested (&tep->mtx,1 ); -/* Add the current item to the list of active epoll hook for this file */ -if (unlikely (ep_attach_file (tfile, epi) <0 )) { + + error =ep_attach_file (tfile, epi); +if (unlikely (error)) {if (tep)mutex_unlock (&tep->mtx);kmem_cache_free (epi_cache, epi);percpu_counter_dec (&ep->user->epoll_watches); -return -ENOMEM ; +return error; }if (full_check && !tep)list_file (tfile); -/* -* Add the current item to the RB tree. All RB tree operations are -* protected by "mtx", and ep_insert() is called with "mtx" held. -*/ ep_rbtree_insert (ep, epi); +if (tep)mutex_unlock (&tep->mtx); -/* -* ep_remove() calls in the later error paths can't lead to -* ep_free() as the ep file itself still holds an ep reference. -*/ ep_get (ep); +return 0 ; +} + +/* +* Must be called with "mtx" held. +*/ +static int ep_insert (struct eventpoll *ep,const struct epoll_event *event, +struct file *tfile,int fd,int full_check) +{ +int error, pwake =0 ; +__poll_t revents; +struct epitem *epi; +struct ep_pqueue epq; +struct eventpoll *tep =NULL ; + +if (is_file_epoll (tfile)) + tep = tfile->private_data; + +lockdep_assert_irqs_enabled (); + + epi =ep_alloc_epitem (ep, event, tfile, fd); +if (IS_ERR (epi)) +return PTR_ERR (epi); -/* now check if we've created too many backpaths */ + error =ep_register_epitem (ep, epi, tep, full_check); +if (error) +return error; + +/* Reject the insert if the new link would create too many back-paths. */ if (unlikely (full_check &&reverse_path_check ())) {ep_remove (ep, epi);return -EINVAL ;
@@ -1763,28 +1807,21 @@ static int ep_insert(struct eventpoll *ep, const struct epoll_event *event,*/ revents =ep_item_poll (epi, &epq.pt,1 ); -/* -* We have to check if something went wrong during the poll wait queue -* install process. Namely an allocation for a wait queue failed due -* high memory pressure. -*/ +/* ep_ptable_queue_proc() signals allocation failure by clearing epq.epi. */ if (unlikely (!epq.epi)) {ep_remove (ep, epi);return -ENOMEM ; } -/* We have to drop the new item inside our item list to keep track of it */ +/* Drop the new item onto the ready list if it is already ready. */ spin_lock_irq (&ep->lock); -/* record NAPI ID of new item if present */ ep_set_busy_poll_napi_id (epi); -/* If the file is already "ready" we drop it inside the ready list */ if (revents && !ep_is_linked (epi)) {list_add_tail (&epi->rdllink, &ep->rdllist);ep_pm_stay_awake (epi); -/* Notify waiting tasks that events are available */ if (waitqueue_active (&ep->wq))wake_up (&ep->wq);if (waitqueue_active (&ep->poll_wait))
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 408/1276 eventpoll: extract ep_deliver_event() from ep_send_events()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Brauner <[email protected]>
[ Upstream commit 499a5e7f4a57fa08a297c627d007a55069acac9a ]
ep_send_events()'s body covered two concerns: per-item work (PM wakeup-source bookkeeping, re-poll, copy_to_user, level-trigger re-queue, EPOLLONESHOT mask clear) and the scan-level accumulator (maxevents cap, EFAULT preservation, txlist/rdllist splice).
Extract the per-item work as ep_deliver_event(), which returns a tri-state int:
1 one event was delivered; caller advances the counter,
0 re-poll produced no caller-requested events (item drops
out of the ready list; a future callback will re-queue),
-EFAULT copy_to_user() faulted; item is already re-inserted at
the head of the txlist so ep_done_scan() splices it back to rdllist.
The per-item comments (PM ordering, the "sole writer to rdllist" invariant for the LT re-queue, the EFAULT semantics) move into ep_deliver_event(). ep_send_events() reduces to the fatal-signal short-circuit, scan bracket, and a short txlist walk that accumulates the deliveries and preserves the "first error wins" EFAULT contract (res = delivered only if no event was previously delivered; otherwise the success count is returned and -EFAULT is reported on the next call).
No functional change.
Stable-dep-of: 0c4aefe3c2d0 ("eventpoll: Fix epoll_wait() report false negative")
--- fs/eventpoll.c | 138 ++++++++++++++++++++++++++++++------------------- 1 file changed, 84 insertions(+), 54 deletions(-)
fs/eventpoll.c +84 -54
@@ -1913,6 +1913,82 @@ static int ep_modify(struct eventpoll *ep, struct epitem *epi,return 0 ; } +/* +* Attempt to deliver one event for @epi into @*uevents. +* +* Returns 1 if an event was delivered (with *uevents advanced to the +* next slot), 0 if the re-poll reported no caller-requested events +* (@epi drops out of the ready list; a future callback will re-add +* it), or -EFAULT if copy_to_user() faulted (in which case @epi is +* re-inserted at the head of @txlist so ep_done_scan() merges it +* back to rdllist for the next attempt). +* +* PM bookkeeping and level-triggered re-queue are handled here. +* Caller holds ep->mtx and the scan is active. +*/ +static int ep_deliver_event (struct eventpoll *ep,struct epitem *epi, +poll_table *pt, +struct epoll_event __user **uevents, +struct list_head *txlist) +{ +struct epoll_event __user *next; +struct wakeup_source *ws; +__poll_t revents; + +/* +* Activate ep->ws before deactivating epi->ws to prevent +* triggering auto-suspend here (in case we reactivate epi->ws +* below). Rearranging to delay the deactivation would let +* epi->ws drift out of sync with ep_is_linked(). +*/ + ws =ep_wakeup_source (epi); +if (ws) { +if (ws->active) +__pm_stay_awake (ep->ws); +__pm_relax (ws); + } + +list_del_init (&epi->rdllink); + +/* +* Re-poll under ep->mtx so userspace cannot change the item +* out from under us. If no caller-requested events remain, +* @epi stays off the ready list; the poll callback will +* re-queue it when events next appear. +*/ + revents =ep_item_poll (epi, pt,1 ); +if (!revents) +return 0 ; + + next =epoll_put_uevent (revents, epi->event.data, *uevents); +if (!next) { +/* +* copy_to_user() faulted: put the item back so +* ep_done_scan() splices it onto rdllist for the next +* attempt. +*/ +list_add (&epi->rdllink, txlist); +ep_pm_stay_awake (epi); +return -EFAULT ; + } + *uevents = next; + +if (epi->event.events &EPOLLONESHOT ) { + epi->event.events &=EP_PRIVATE_BITS ; + }else if (!(epi->event.events &EPOLLET )) { +/* +* Level-triggered: re-queue so the next epoll_wait() +* rechecks availability. We are the sole writer to +* rdllist here -- epoll_ctl() callers are locked out +* by ep->mtx, and the poll callback queues to ovflist +* during scans. +*/ +list_add_tail (&epi->rdllink, &ep->rdllist); +ep_pm_stay_awake (epi); + } +return 1 ; +} +static int ep_send_events (struct eventpoll *ep,struct epoll_event __user *events,int maxevents) {
@@ -1935,70 +2011,24 @@ static int ep_send_events(struct eventpoll *ep,ep_start_scan (ep, &txlist);/* -* We can loop without lock because we are passed a task private list. -* Items cannot vanish during the loop we are holding ep->mtx. +* We can loop without lock because we are passed a task-private +* txlist; items cannot vanish while we hold ep->mtx. */ list_for_each_entry_safe (epi, tmp, &txlist, rdllink) { -struct wakeup_source *ws; -__poll_t revents; +int delivered;if (res >= maxevents)break ; -/* -* Activate ep->ws before deactivating epi->ws to prevent -* triggering auto-suspend here (in case we reactive epi->ws -* below). -* -* This could be rearranged to delay the deactivation of epi->ws -* instead, but then epi->ws would temporarily be out of sync -* with ep_is_linked(). -*/ - ws =ep_wakeup_source (epi); -if (ws) { -if (ws->active) -__pm_stay_awake (ep->ws); -__pm_relax (ws); - } - -list_del_init (&epi->rdllink); - -/* -* If the event mask intersect the caller-requested one, -* deliver the event to userspace. Again, we are holding ep->mtx, -* so no operations coming from userspace can change the item. -*/ - revents =ep_item_poll (epi, &pt,1 ); -if (!revents) -continue ; - - events =epoll_put_uevent (revents, epi->event.data, events); -if (!events) { -list_add (&epi->rdllink, &txlist); -ep_pm_stay_awake (epi); + delivered =ep_deliver_event (ep, epi, &pt, &events, &txlist); +if (delivered <0 ) {if (!res) - res = -EFAULT ; + res = delivered;break ; } - res++; -if (epi->event.events &EPOLLONESHOT ) - epi->event.events &=EP_PRIVATE_BITS ; -else if (!(epi->event.events &EPOLLET )) { -/* -* If this file has been added with Level -* Trigger mode, we need to insert back inside -* the ready list, so that the next call to -* epoll_wait() will check again the events -* availability. At this point, no one can insert -* into ep->rdllist besides us. The epoll_ctl() -* callers are locked out by -* ep_send_events() holding "mtx" and the -* poll callback will queue them in ep->ovflist. -*/ -list_add_tail (&epi->rdllink, &ep->rdllist); -ep_pm_stay_awake (epi); - } + res += delivered; } +ep_done_scan (ep, &txlist);mutex_unlock (&ep->mtx);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 409/1276 eventpoll: wrap EP_UNACTIVE_PTR in typed sentinel helpers
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Brauner <[email protected]>
[ Upstream commit 0dcb726466a556f273beaadfb76f12d1b0087dd7 ]
ep->ovflist and epi->next both use EP_UNACTIVE_PTR (a cast to (void *)-1) as a sentinel, with distinct meanings at each site:
ep->ovflist == EP_UNACTIVE_PTR no scan in progress
epi->next == EP_UNACTIVE_PTR epi not on ovflist
Call sites had to know the sentinel's value and, by convention, what it meant in each context. Hide both behind inline helpers:
ep_is_scanning(ep) predicate for "scan in progress" ep_enter_scan(ep) WRITE_ONCE flip to NULL (scan start) ep_exit_scan(ep) WRITE_ONCE flip to sentinel (scan end) epi_on_ovflist(epi) predicate for "epi is on ovflist" epi_clear_ovflist(epi) clear epi's ovflist link slot
Convert ep_events_available(), ep_start_scan(), ep_done_scan(), ep_poll_callback(), and ep_alloc_epitem() to use the wrappers. The ovflist state-machine transitions are now named, not encoded in sentinel comparisons, and the top-of-file "Ready-list state machine" section is the single place that spells out the sentinel's meaning.
ep_alloc() keeps the raw "ep->ovflist = EP_UNACTIVE_PTR" init (no concurrent access at that point) with an inline "not scanning" comment, and the tfile_check_list sentinel is left alone -- it will disappear entirely when the loop-check globals move into a stack-allocated ep_ctl_ctx in a later commit.
Also rework ep_done_scan()'s for-loop: the combined initializer + update clause that advanced nepi AND cleared epi->next in one step was clever but hard to read; splitting the update into two statements inside the body makes the epi_clear_ovflist() call visible.
No functional change.
Stable-dep-of: 0c4aefe3c2d0 ("eventpoll: Fix epoll_wait() report false negative")
--- fs/eventpoll.c | 73 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 52 insertions(+), 21 deletions(-)
fs/eventpoll.c +52 -21
@@ -507,6 +507,43 @@ static inline struct epitem *ep_item_from_wait(wait_queue_entry_t *p) return container_of(p, struct eppoll_entry, wait)->base; } +/* +* Ready-list / ovflist state (see "Ready-list state machine" in the +* top-of-file banner for the full state machine). EP_UNACTIVE_PTR is +* the sentinel; these wrappers name each transition and each test so +* call sites do not need to know the sentinel's value. +*/ + +/* True iff @ep is between ep_enter_scan() and ep_exit_scan(). */ +static inline bool ep_is_scanning (struct eventpoll *ep) +{ +return READ_ONCE (ep->ovflist) !=EP_UNACTIVE_PTR ; +} + +/* Called by ep_start_scan(): divert ep_poll_callback() to ovflist. */ +static inline void ep_enter_scan (struct eventpoll *ep) +{ +WRITE_ONCE (ep->ovflist,NULL ); +} + +/* Called by ep_done_scan(): redirect ep_poll_callback() back to rdllist. */ +static inline void ep_exit_scan (struct eventpoll *ep) +{ +WRITE_ONCE (ep->ovflist,EP_UNACTIVE_PTR ); +} + +/* True iff @epi is currently linked on its ep's ovflist. */ +static inline bool epi_on_ovflist (const struct epitem *epi) +{ +return epi->next !=EP_UNACTIVE_PTR ; +} + +/* Mark @epi as not on any ovflist (init and post-drain). */ +static inline void epi_clear_ovflist (struct epitem *epi) +{ + epi->next =EP_UNACTIVE_PTR ; +} +/** * ep_events_available - Checks if ready events might be available. *
@@ -517,8 +554,7 @@ static inline struct epitem *ep_item_from_wait(wait_queue_entry_t *p)*/ static inline int ep_events_available (struct eventpoll *ep) { -return !list_empty_careful (&ep->rdllist) || -READ_ONCE (ep->ovflist) !=EP_UNACTIVE_PTR ; +return !list_empty_careful (&ep->rdllist) ||ep_is_scanning (ep); }#ifdef CONFIG_NET_RX_BUSY_POLL
@@ -843,7 +879,7 @@ static void ep_start_scan(struct eventpoll *ep, struct list_head *txlist)lockdep_assert_irqs_enabled ();spin_lock_irq (&ep->lock);list_splice_init (&ep->rdllist, txlist); -WRITE_ONCE (ep->ovflist,NULL ); +ep_enter_scan (ep);spin_unlock_irq (&ep->lock); }
@@ -858,29 +894,24 @@ static void ep_done_scan(struct eventpoll *ep,* other events might have been queued by the poll callback. * We re-insert them inside the main ready-list here. */ -for (nepi =READ_ONCE (ep->ovflist); (epi = nepi) !=NULL ; - nepi = epi->next, epi->next =EP_UNACTIVE_PTR ) { +for (nepi =READ_ONCE (ep->ovflist); (epi = nepi) !=NULL ; ) { + nepi = epi->next; +epi_clear_ovflist (epi);/* -* We need to check if the item is already in the list. -* During the "sproc" callback execution time, items are -* queued into ->ovflist but the "txlist" might already -* contain them, and the list_splice() below takes care of them. +* Skip items that the caller already returned via @txlist +* -- the list_splice() below takes care of those. */ if (!ep_is_linked (epi)) {/* -* ->ovflist is LIFO, so we have to reverse it in order -* to keep in FIFO. +* ovflist is LIFO; list_add() head-insert here +* reverses the iteration order into FIFO. */ list_add (&epi->rdllink, &ep->rdllist);ep_pm_stay_awake (epi); } } -/* -* We need to set back ep->ovflist to EP_UNACTIVE_PTR, so that after -* releasing the lock, events will be queued in the normal way inside -* ep->rdllist. -*/ -WRITE_ONCE (ep->ovflist,EP_UNACTIVE_PTR ); +/* Back out of scan mode; callbacks target ep->rdllist again. */ +ep_exit_scan (ep);/* * Quickly re-inject items left on "txlist".
@@ -1273,7 +1304,7 @@ static int ep_alloc(struct eventpoll **pep)init_waitqueue_head (&ep->poll_wait);INIT_LIST_HEAD (&ep->rdllist); ep->rbr =RB_ROOT_CACHED ; - ep->ovflist =EP_UNACTIVE_PTR ; + ep->ovflist =EP_UNACTIVE_PTR ;/* not scanning */ ep->user =get_current_user ();refcount_set (&ep->refcount,1 );
@@ -1397,8 +1428,8 @@ static int ep_poll_callback(wait_queue_entry_t *wait, unsigned mode, int sync, v* semantics). All the events that happen during that period of time are * chained in ep->ovflist and requeued later on. */ -if (READ_ONCE (ep->ovflist) !=EP_UNACTIVE_PTR ) { -if (epi->next ==EP_UNACTIVE_PTR ) { +if (ep_is_scanning (ep)) { +if (!epi_on_ovflist (epi)) { epi->next =READ_ONCE (ep->ovflist);WRITE_ONCE (ep->ovflist, epi);ep_pm_stay_awake_rcu (epi);
@@ -1705,7 +1736,7 @@ static struct epitem *ep_alloc_epitem(struct eventpoll *ep, epi->ep = ep;ep_set_ffd (&epi->ffd, tfile, fd); epi->event = *event; - epi->next =EP_UNACTIVE_PTR ; +epi_clear_ovflist (epi);return epi; }
Signature · 1 line
2.53.0