6.12.97-rc1 review
Subsystems (12)
Greg Kroah-Hartman
maintainerPATCH 1119/1276 reset: sunxi: fix memory region leak on ioremap failure
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhao Dongdong <[email protected]>
commit 1a8c89f8c112c75e84ff9a140f969e372aed0c9a upstream.
In sunxi_reset_init(), when ioremap() fails, the memory region obtained via request_mem_region() is not released, leading to a resource leak.
Add an err_mem_region label to properly release the memory region before freeing the data structure.
--- drivers/reset/reset-sunxi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/reset/reset-sunxi.c +3 -1
@@ -44,7 +44,7 @@ static int sunxi_reset_init(struct devic data->membase =ioremap (res.start, size);if (!data->membase) { ret = -ENOMEM ; - goto err_alloc; + goto err_mem_region; }spin_lock_init (&data->lock);
@@ -57,6 +57,8 @@ static int sunxi_reset_init(struct devicreturn reset_controller_register (&data->rcdev); +err_mem_region: +release_mem_region (res.start, size); err_alloc:kfree (data);return ret;
Greg Kroah-Hartman
maintainerPATCH 1120/1276 powerpc/spufs: fix out-of-bounds access in spufs_mem_mmap_access()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Junrui Luo <[email protected]>
commit 47b87f469a35b5ffc81c16eee6b13a9b6c8d55c6 upstream.
spufs_mem_mmap_access() computes the local store offset as address - vma->vm_start, but bounds-checks it against vma->vm_end instead of the local store size. On 64-bit, offset is always well below vma->vm_end, so the clamp never fires and len stays unbounded against the LS_SIZE buffer returned by ctx->ops->get_ls().
Reject offsets at or beyond LS_SIZE and clamp len to the remaining space, mirroring the guard already used by spufs_mem_mmap_fault() and spufs_ps_fault().
--- arch/powerpc/platforms/cell/spufs/file.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/powerpc/platforms/cell/spufs/file.c +4 -2
@@ -268,10 +268,12 @@ static int spufs_mem_mmap_access(structif (write && !(vma->vm_flags &VM_WRITE ))return -EACCES ; +if (offset >=LS_SIZE ) +return -EFAULT ;if (spu_acquire (ctx))return -EINTR ; -if ((offset + len) > vma->vm_end) - len = vma->vm_end - offset; +if ((offset + len) >LS_SIZE ) + len =LS_SIZE - offset; local_store = ctx->ops->get_ls (ctx);if (write)memcpy_toio (local_store + offset, buf, len);
Greg Kroah-Hartman
maintainerPATCH 1121/1276 wifi: mac80211: free ack status frame on TX header build failure
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhiling Zou <[email protected]>
commit 2c51457d930f723e5f2903af90f5847f7df53f42 upstream.
ieee80211_build_hdr() stores an ACK status frame before it has finished all validation and header construction. If a later error path is taken, the transmit skb is freed but the stored ACK status frame remains in local->ack_status_frames.
This can happen for control port frames when the requested MLO link ID does not match the link selected for a non-MLO station. Repeated failures can fill the ACK status IDR and leave pending ACK frames until hardware teardown.
Remove any stored ACK status frame before returning an error after it has been inserted into the IDR.
--- net/mac80211/tx.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
net/mac80211/tx.c +16 -1
@@ -2578,6 +2578,18 @@ static u16 ieee80211_store_ack_skb(strucreturn info_id; } +static void ieee80211_remove_ack_skb (struct ieee80211_local *local,u16 info_id) +{ +struct sk_buff *ack_skb; +unsigned long flags; + +spin_lock_irqsave (&local->ack_status_lock, flags); + ack_skb =idr_remove (&local->ack_status_frames, info_id); +spin_unlock_irqrestore (&local->ack_status_lock, flags); + +kfree_skb (ack_skb); +} +/** * ieee80211_build_hdr - build 802.11 header in the given frame * @sdata: virtual interface to build the header for
@@ -2935,7 +2947,8 @@ static struct sk_buff *ieee80211_build_hif (ieee80211_skb_resize (sdata, skb, head_need,ENCRYPT_DATA )) {ieee80211_free_txskb (&local->hw, skb); skb =NULL ; -return ERR_PTR (-ENOMEM ); + ret = -ENOMEM ; + goto free; } }
@@ -3003,6 +3016,8 @@ static struct sk_buff *ieee80211_build_hreturn skb; free: +if (info_id) +ieee80211_remove_ack_skb (local, info_id);kfree_skb (skb);return ERR_PTR (ret); }
Greg Kroah-Hartman
maintainerPATCH 1122/1276 wifi: mwifiex: fix permanently busy scans after multiple roam iterations
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rafael Beims <[email protected]>
commit d78a407bad6f500884a8606aea1a5a9207be4030 upstream.
In order for the firmware to sleep, the driver has to confirm a previously received sleep request. The normal sequence of evets goes like this:EVENT_SLEEP -> adapter->ps_state = PS_STATE_PRE_SLEEP -> sleep-confirm -> SLEEP -> EVENT_AWAKE -> AWAKE.
Before sending the sleep-confirm command, the driver must make sure there are no commands either running or waiting to be completed.
mwifiex_ret_802_11_associate() unconditionally sets ps_state = PS_STATE_AWAKE when it processes the association command response, outside of the normal powersave management flow. If EVENT_SLEEP arrives while the association command is in flight, ps_state is PRE_SLEEP when the association command response is parsed, and the forced AWAKE overwrites it. The deferred sleep-confirm is never sent.
A subsequent scan_start command is correctly acknowledged, but the firmware doesn't generate scan_result events. The scan request never finishes, and additional requests from userspace fail with -EBUSY.
After testing on both IW412 and W8997, I could only trigger the bug on the IW412 and observed the firmwares behave differently. On the IW412 the firmware still sends EVENT_SLEEP while the authentication / association process is ongoing. A W8997 under the same conditions seems to suppress power-save for the duration of the association, so PRE_SLEEP never coincided with the association response even after extended periods of testing using the loops described below (>12hours).
On the IW412, the delay between commands that triggers an EVENT_SLEEP was empirically determined to be ~20ms. This delay can naturally occur when the driver is outputting debugging information (debug_mask = 0x00000037), in which situation the busy scans issue is repeatable while running "test 1)" as described below. If the delay between commands is less than ~20ms, the firmware stays awake and the issue was not reproducible running the same test.
The host_mlme=false path also behaves differently. In this case, the entire authentication / association transaction is executed by one command (HostCmd_CMD_802_11_ASSOCIATE), and the firmware doesn't emit EVENT_SLEEP while the command is running.
Remove the assignment so the ps_state is only manipulated in the paths that are related to powersave event handling and on the main workqueue for correct sleep confirmation.
The following loop tests were performed (with debugging output enabled):
1) force roaming between two AP's, one 5GHz and one 2.4GHz, same SSID. Use wpa_cli to trigger the roaming behavior, sleep 2s between iterations.
2) force a disconnection to AP 1 and a connection to AP 2, test scan. Use wpa_cli to trigger the connection changes, sleep 2s between iterations.
Each test ran in each device for at least 3 hours.
--- drivers/net/wireless/marvell/mwifiex/join.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/wireless/marvell/mwifiex/join.c +0 -1
@@ -737,7 +737,6 @@ int mwifiex_ret_802_11_associate(struct/* Send a Media Connected event, according to the Spec */ priv->media_connected = true; - priv->adapter->ps_state =PS_STATE_AWAKE ; priv->adapter->pps_uapsd_mode = false; priv->adapter->tx_lock_flag = false;
Greg Kroah-Hartman
maintainerPATCH 1123/1276 mtd: onenand: samsung: report DMA completion timeouts
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pengpeng Hou <[email protected]>
commit d03a19bd6c7f86b99ca8fb61a6ec2345cee1d9d6 upstream.
The S5PC110 OneNAND DMA helpers have bounded waits for transfer completion. The polling helper falls out of its timeout loop and returns success, and the IRQ helper ignores wait_for_completion_timeout().
Return -ETIMEDOUT when the DMA transfer-done bit or completion does not arrive before the timeout so callers can treat the buffer transfer as failed.
--- drivers/mtd/nand/onenand/onenand_samsung.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/mtd/nand/onenand/onenand_samsung.c +6 -1
@@ -554,6 +554,9 @@ static int s5pc110_dma_poll(dma_addr_t d }while (!(status &S5PC110_DMA_TRANS_STATUS_TD ) &&time_before (jiffies, timeout)); +if (!(status &S5PC110_DMA_TRANS_STATUS_TD )) +return -ETIMEDOUT ; +writel (S5PC110_DMA_TRANS_CMD_TDC , base +S5PC110_DMA_TRANS_CMD );return 0 ;
@@ -608,7 +611,9 @@ static int s5pc110_dma_irq(dma_addr_t dswritel (S5PC110_DMA_TRANS_CMD_TR , base +S5PC110_DMA_TRANS_CMD ); -wait_for_completion_timeout (&onenand->complete,msecs_to_jiffies (20 )); +if (!wait_for_completion_timeout (&onenand->complete, +msecs_to_jiffies (20 ))) +return -ETIMEDOUT ;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 1124/1276 mtd: mchp23k256: use SPI match data for chip caps
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pengpeng Hou <[email protected]>
commit d322e40f4edf92bf0ca329e5aa4ae1c0316feb38 upstream.
The driver stores chip capacity information in both the OF match table and the SPI id table. Probe currently uses of_device_get_match_data(), so a non-OF SPI modalias match falls back to mchp23k256_caps even when the SPI id table selected a different part.
Use spi_get_device_match_data() so SPI id-table driver_data is consumed when OF match data is absent. This keeps the existing default fallback while avoiding the wrong MTD geometry for id-table-only matches.
--- drivers/mtd/devices/mchp23k256.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/devices/mchp23k256.c +1 -1
@@ -188,7 +188,7 @@ static int mchp23k256_probe(struct spi_d data =dev_get_platdata (&spi->dev); - flash->caps =of_device_get_match_data (&spi->dev); + flash->caps =spi_get_device_match_data (spi);if (!flash->caps) flash->caps = &mchp23k256_caps;
Greg Kroah-Hartman
maintainerPATCH 1125/1276 mmc: vub300: defer reset until cmd_mutex is unlocked
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Runyu Xiao <[email protected]>
commit ee5fb641c4ccac8406c668d3e947eb20ce44f233 upstream.
vub300_cmndwork_thread() holds cmd_mutex while it sends a command and waits for the command response. If the response wait times out, __vub300_command_response() kills the command URBs and then synchronously resets the USB device through usb_reset_device().
That reset path re-enters the driver through vub300_pre_reset(), which also takes cmd_mutex. The worker therefore tries to acquire the same mutex recursively while it is still holding it from the command path.
This issue was found by our static analysis tool and then manually reviewed against the current tree.
The grounded PoC kept the real worker and timeout/reset carrier:
vub300_cmndwork_thread()
__vub300_command_response()
usb_lock_device_for_reset()
usb_reset_device()
vub300_pre_reset()
Lockdep reported the same-task recursive acquisition on cmd_mutex:
WARNING: possible recursive locking detected
... (&test_vub300.cmd_mutex) ... at: usb_reset_device... [vuln_msv] ... (&test_vub300.cmd_mutex) ... at: vub300_cmndwork_thread+0x12/0x20 [vuln_msv]
Workqueue: vub300_cmd_wq vub300_cmndwork_thread [vuln_msv] *** DEADLOCK ***
Return a flag from __vub300_command_response() when the timeout path needs a device reset, then perform the reset after vub300_cmndwork_thread() has cleared the in-flight command state and dropped cmd_mutex. The reset is still attempted before mmc_request_done(), preserving the existing request completion ordering while avoiding the recursive lock.
--- drivers/mmc/host/vub300.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-)
drivers/mmc/host/vub300.c +17 -9
@@ -1585,7 +1585,7 @@ static int __command_write_data(struct vreturn linear_length; } -static void __vub300_command_response (struct vub300_mmc_host *vub300, +static bool __vub300_command_response (struct vub300_mmc_host *vub300,struct mmc_command *cmd,struct mmc_data *data,int data_length) {
@@ -1597,17 +1597,11 @@ static void __vub300_command_response(st msecs_to_jiffies(msec_timeout));if (respretval ==0 ) {/* TIMED OUT */ /* we don't know which of "out" and "res" if any failed */ -int result; vub300->usb_timed_out =1 ;usb_kill_urb (vub300->command_out_urb);usb_kill_urb (vub300->command_res_urb); cmd->error = -ETIMEDOUT ; - result =usb_lock_device_for_reset (vub300->udev, - vub300->interface); -if (result ==0 ) { - result =usb_reset_device (vub300->udev); -usb_unlock_device (vub300->udev); - } +return true; }else if (respretval <0 ) {/* we don't know which of "out" and "res" if any failed */ usb_kill_urb (vub300->command_out_urb);
@@ -1703,6 +1697,8 @@ static void __vub300_command_response(st }else { cmd->error = -EINVAL ; } + +return false; } static void construct_request_response(struct vub300_mmc_host *vub300,
@@ -1748,6 +1744,7 @@ static void vub300_cmndwork_thread(strucstruct mmc_request *req = vub300->req;struct mmc_command *cmd = vub300->cmd;struct mmc_data *data = vub300->data; +bool reset_device;int data_length;mutex_lock (&vub300->cmd_mutex);init_completion (&vub300->command_complete);
@@ -1770,7 +1767,8 @@ static void vub300_cmndwork_thread(struc data_length =__command_read_data (vub300, cmd, data); else data_length =__command_write_data (vub300, cmd, data); -__vub300_command_response (vub300, cmd, data, data_length); + reset_device =__vub300_command_response (vub300, cmd, + data, data_length); vub300->req =NULL ; vub300->cmd =NULL ; vub300->data =NULL ;
@@ -1778,6 +1776,16 @@ static void vub300_cmndwork_thread(strucif (cmd->error == -ENOMEDIUM )check_vub300_port_status (vub300);mutex_unlock (&vub300->cmd_mutex); +if (reset_device) { +int result; + + result =usb_lock_device_for_reset (vub300->udev, + vub300->interface); +if (result ==0 ) { + result =usb_reset_device (vub300->udev); +usb_unlock_device (vub300->udev); + } + }mmc_request_done (vub300->mmc, req);kref_put (&vub300->kref, vub300_delete);return ;
Greg Kroah-Hartman
maintainerPATCH 1126/1276 mtd: rawnand: fsl_ifc: return errors for failed page reads
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pengpeng Hou <[email protected]>
commit f9a13e05a327080c3a1c8165adf9e678fb68fef2 upstream.
fsl_ifc_run_command() logs controller timeout and other non-OPC completion states in ctrl->nand_stat. fsl_ifc_read_page() then only increments the ECC failure counter for non-OPC status and still returns max_bitflips, which can be zero.
Return -ETIMEDOUT when the command did not complete at all and -EIO for other non-OPC read completions so the NAND core does not treat a failed page read as a clean page.
--- drivers/mtd/nand/raw/fsl_ifc_nand.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/mtd/nand/raw/fsl_ifc_nand.c +8 -1
@@ -683,8 +683,15 @@ static int fsl_ifc_read_page(struct nandreturn check_erased_page (chip, buf); } -if (ctrl->nand_stat !=IFC_NAND_EVTER_STAT_OPC ) +if (!ctrl->nand_stat) { mtd->ecc_stats.failed++; +return -ETIMEDOUT ; + } + +if (ctrl->nand_stat !=IFC_NAND_EVTER_STAT_OPC ) { + mtd->ecc_stats.failed++; +return -EIO ; + }return nctrl->max_bitflips; }
Greg Kroah-Hartman
maintainerPATCH 1127/1276 mtd: rawnand: lpc32xx_mlc: fail DMA transfers on timeout
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pengpeng Hou <[email protected]>
commit dbf590b662695b16fbf5917ef129697be4410ea9 upstream.
lpc32xx_xmit_dma() starts a DMA transfer and waits up to one second for its completion, but it ignores the wait result and returns success after unmapping the buffer.
A timed out read can therefore return success with incomplete data, and a timed out write can continue the NAND operation without proof that the DMA payload reached the controller.
Terminate the DMA channel on timeout, unmap the scatterlist through the existing cleanup path, and return -ETIMEDOUT to the NAND read/write callers. Initialize the shared cleanup-path result before using it for dmaengine_prep_slave_sg() failures.
--- drivers/mtd/nand/raw/lpc32xx_mlc.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/mtd/nand/raw/lpc32xx_mlc.c +10 -2
@@ -396,6 +396,7 @@ static int lpc32xx_xmit_dma(struct mtd_istruct lpc32xx_nand_host *host =nand_get_controller_data (chip);struct dma_async_tx_descriptor *desc;int flags =DMA_CTRL_ACK |DMA_PREP_INTERRUPT ; +unsigned long time_left;int res;sg_init_one (&host->sgl, mem, len);
@@ -410,6 +411,7 @@ static int lpc32xx_xmit_dma(struct mtd_i flags);if (!desc) {dev_err (mtd->dev.parent,"Failed to prepare slave sg\n" ); + res = -ENXIO ; goto out1; }
@@ -420,7 +422,13 @@ static int lpc32xx_xmit_dma(struct mtd_idmaengine_submit (desc);dma_async_issue_pending (host->dma_chan); -wait_for_completion_timeout (&host->comp_dma,msecs_to_jiffies (1000 )); + time_left =wait_for_completion_timeout (&host->comp_dma, +msecs_to_jiffies (1000 )); +if (!time_left) { +dmaengine_terminate_sync (host->dma_chan); + res = -ETIMEDOUT ; + goto out1; + }dma_unmap_sg (host->dma_chan->device->dev, &host->sgl,1 ,DMA_BIDIRECTIONAL );
@@ -428,7 +436,7 @@ static int lpc32xx_xmit_dma(struct mtd_i out1:dma_unmap_sg (host->dma_chan->device->dev, &host->sgl,1 ,DMA_BIDIRECTIONAL ); -return -ENXIO ; +return res; } static int lpc32xx_read_page(struct nand_chip *chip, uint8_t *buf,
Greg Kroah-Hartman
maintainerPATCH 1128/1276 mtd: rawnand: lpc32xx_slc: fail DMA transfer on completion timeout
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pengpeng Hou <[email protected]>
commit 17a8ce84964f243c8f89dc7353ac7e8d3137bc74 upstream.
lpc32xx_xmit_dma() waits for the DMA completion callback but ignores wait_for_completion_timeout(). A timed out DMA transfer is therefore unmapped and reported as successful to the NAND read/write path.
Return -ETIMEDOUT when the completion wait expires. Terminate the DMA channel before unmapping the scatterlist so the timed out transfer cannot continue to access the buffer after the error is returned.
--- drivers/mtd/nand/raw/lpc32xx_slc.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/mtd/nand/raw/lpc32xx_slc.c +10 -2
@@ -430,6 +430,7 @@ static int lpc32xx_xmit_dma(struct mtd_istruct dma_async_tx_descriptor *desc;int flags =DMA_CTRL_ACK |DMA_PREP_INTERRUPT ;int res; +unsigned long time_left; host->dma_slave_config.direction = dir; host->dma_slave_config.src_addr = dma;
@@ -467,12 +468,19 @@ static int lpc32xx_xmit_dma(struct mtd_idmaengine_submit (desc);dma_async_issue_pending (host->dma_chan); -wait_for_completion_timeout (&host->comp,msecs_to_jiffies (1000 )); + time_left =wait_for_completion_timeout (&host->comp, +msecs_to_jiffies (1000 )); +if (!time_left) { +dmaengine_terminate_sync (host->dma_chan); + res = -ETIMEDOUT ; + }else { + res =0 ; + }dma_unmap_sg (host->dma_chan->device->dev, &host->sgl,1 ,DMA_BIDIRECTIONAL ); -return 0 ; +return res; out1:dma_unmap_sg (host->dma_chan->device->dev, &host->sgl,1 ,DMA_BIDIRECTIONAL );
Greg Kroah-Hartman
maintainerPATCH 1129/1276 mmc: block: fix RPMB device unregister ordering
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ao Sun <[email protected]>
commit 86152fef52cac15cd662ed3bfc7604fbfef378f0 upstream.
Since commit 7852028a35f0 ("mmc: block: register RPMB partition with the RPMB subsystem"), each mmc RPMB partition is represented by two device objects:
- the mmc-owned device (rpmb->dev, backing the legacy /dev/mmcblkXrpmb char device) and
- the rpmb-core device (rdev, backing /dev/rpmbN).
The child RPMB device holds a reference to its parent, so the parent's release callback cannot be invoked if the child device is still registered.
Remove rpmb_dev_unregister() from the parent release handler and unregister the child RPMB device in the remove path before tearing down the parent device.
Also delete the extra blank line between mmc_blk_remove_rpmb_part() and {.
--- drivers/mmc/core/block.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/mmc/core/block.c +1 -2
@@ -2768,7 +2768,6 @@ static void mmc_blk_rpmb_device_release( {struct mmc_rpmb_data *rpmb =dev_get_drvdata (dev); -rpmb_dev_unregister (rpmb->rdev);mmc_blk_put (rpmb->md);ida_free (&mmc_rpmb_ida, rpmb->id);kfree (rpmb);
@@ -2989,8 +2988,8 @@ out_put_device: }static void mmc_blk_remove_rpmb_part (struct mmc_rpmb_data *rpmb) - { +rpmb_dev_unregister (rpmb->rdev);cdev_device_del (&rpmb->chrdev, &rpmb->dev);put_device (&rpmb->dev); }
Greg Kroah-Hartman
maintainerPATCH 1130/1276 mmc: sdhci-of-dwcmshc: check bus clock enable result in the probe() method
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sergey Shtylyov <[email protected]>
commit 521f39ca93cc43ce1b3eae8d44201f8f55dd9151 upstream.
In the driver's probe() method, clk_disable_unprepare() for the bus clock is called on the error path even if the prior clk_prepare_enable() call has failed (and the same thing happens in the remove() method as well) -- that would cause the prepare/enable counter imbalance. Also, the same problem can happen in the driver's suspend() method; note that the resume() method does check the clk_prepare_enable()'s result -- let's be consistent and do that in probe() method as well. BTW, I don't know for sure what does the bus clock control -- if it affects the register accesses, the driver will likely cause (e.g. on ARM) a kernel oops if it fails to prepare/enable the bus clock in the probe() method...
Found by Linux Verification Center (linuxtesting.org) with the Svace static analysis tool.
--- drivers/mmc/host/sdhci-of-dwcmshc.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
drivers/mmc/host/sdhci-of-dwcmshc.c +9 -5
@@ -1464,13 +1464,16 @@ static int dwcmshc_probe(struct platform goto free_pltfm; priv->bus_clk =devm_clk_get (dev,"bus" ); -if (!IS_ERR (priv->bus_clk)) -clk_prepare_enable (priv->bus_clk); +if (!IS_ERR (priv->bus_clk)) { + err =clk_prepare_enable (priv->bus_clk); +if (err) + goto err_clk; + } } err =mmc_of_parse (host->mmc);if (err) - goto err_clk; + goto err_bus_clk;sdhci_get_of_property (pdev);
@@ -1484,7 +1487,7 @@ static int dwcmshc_probe(struct platformif (pltfm_data->init) { err = pltfm_data->init (&pdev->dev, host, priv);if (err) - goto err_clk; + goto err_bus_clk; }#ifdef CONFIG_ACPI
@@ -1530,9 +1533,10 @@ err_setup_host: err_rpm:pm_runtime_disable (dev);pm_runtime_put_noidle (dev); +err_bus_clk: +clk_disable_unprepare (priv->bus_clk); err_clk:clk_disable_unprepare (pltfm_host->clk); -clk_disable_unprepare (priv->bus_clk);clk_bulk_disable_unprepare (priv->num_other_clks, priv->other_clks); free_pltfm:sdhci_pltfm_free (pdev);
Greg Kroah-Hartman
maintainerPATCH 1131/1276 rust: block: fix GenDisk cleanup paths
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Haoze Xie <[email protected]>
[ Upstream commit 2957771379fa335103a4b539db57bb2271e12142 ]
GenDiskBuilder::build() still has fallible work after __blk_mq_alloc_disk(), but its error path only recovers the foreign queue data. That leaks the temporary gendisk and request_queue until later teardown. If the caller moved the last Arc<TagSet<T>> into build(), the leaked queue can retain blk-mq state after the tag set is dropped.
Fix the pre-registration failure path by dropping the temporary gendisk reference with put_disk() before recovering queue_data, so disk_release() can tear down the owned queue.
Also pair GenDisk::drop() with put_disk() after del_gendisk(). Once a Rust GenDisk has been added with device_add_disk(), del_gendisk() only unregisters it; the final gendisk reference still has to be dropped to complete the release path.
--- rust/kernel/block/mq/gen_disk.rs | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
rust/kernel/block/mq/gen_disk.rs +14 -1
@@ -6,7 +6,7 @@//! C header: [`include/linux/blk-mq.h`](srctree/include/linux/blk-mq.h) use crate ::block::mq::{raw_writer::RawWriter ,Operations ,TagSet }; -use crate ::{bindings, error::from_err_ptr, error::Result , sync::Arc }; +use crate ::{bindings, error::from_err_ptr, error::Result , sync::Arc , types::ScopeGuard };use crate ::{error, static_lock_class};use core::fmt::{self,Write };
@@ -139,6 +139,12 @@ impl GenDiskBuilder {// SAFETY: `gendisk` is a valid pointer as we initialized it above unsafe { (*gendisk).fops = &TABLE }; +let cleanup_failure =ScopeGuard ::new_with_data (gendisk, |gendisk| { +// SAFETY: `gendisk` came from `__blk_mq_alloc_disk()` above and +// has not been added to the VFS on this cleanup path. +unsafe { bindings::put_disk (gendisk) }; + }); + let mut raw_writer = RawWriter::from_array(// SAFETY: `gendisk` points to a valid and initialized instance. We // have exclusive access, since the disk is not added to the VFS
@@ -161,6 +167,8 @@ impl GenDiskBuilder { }, )?; + cleanup_failure.dismiss (); +// INVARIANT: `gendisk` was initialized above. // INVARIANT: `gendisk` was added to the VFS via `device_add_disk` above. Ok (GenDisk {
@@ -192,5 +200,10 @@ impl<T: Operations> Drop for GenDisk<T>// initialized instance of `struct gendisk`, and it was previously added // to the VFS. unsafe { bindings::del_gendisk (self.gendisk) }; + +// SAFETY: By type invariant, `self.gendisk` was added to the VFS, so +// `put_disk()` must follow `del_gendisk()` to drop the final gendisk +// reference and trigger the remaining release path. +unsafe { bindings::put_disk (self.gendisk) }; } }
Greg Kroah-Hartman
maintainerPATCH 1132/1276 ACPI: NFIT: core: Fix acpi_nfit_init() error cleanup
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Rafael J. Wysocki" <[email protected]>
[ Upstream commit 38bf27511ef41bffebd157ec3eba41fc89ba59cd ]
If acpi_nfit_init() fails after adding the acpi_desc object to the acpi_descs list, that object is never removed from that list because the acpi_nfit_shutdown() devm action is not added for the NFIT device in that case. Next, the acpi_nfit_init() failure causes acpi_nfit_probe() to fail, the acpi_desc object is freed, and a dangling pointer is left behind in the acpi_descs. Any subsequent ACPI Machine Check Exception will trigger nfit_handle_mce() which iterates over acpi_descs and so a use-after-free will occur.
Moreover, if acpi_nfit_probe() returns 0 after installing a notify handler for the NFIT device and without allocating the acpi_desc object and setting the NFIT device's driver data pointer, the acpi_desc object will be allocated by acpi_nfit_update_notify() and acpi_nfit_init() will be called to initialize it. Regardless of whether or not acpi_nfit_init() fails in that case, the acpi_nfit_shutdown() devm action is not added for the NFIT device and acpi_desc is never removed from the acpi_descs list. If the acpi_desc object is freed subsequently on driver removal, any subsequent ACPI MCE will lead to a use-after-free like in the previous case.
To address the first issue mentioned above, make acpi_nfit_probe() call acpi_nfit_shutdown() directly on acpi_nfit_init() failures and to address the other one, add a remove callback to the driver and make it call acpi_nfit_shutdown(). Also, since it is now possible to pass NULL to acpi_nfit_shutdown() or the acpi_desc object passed to it may not have been initialized, add checks against NULL for acpi_desc and its nvdimm_bus field to that function and make acpi_nfit_unregister() clear the latter after unregistering the NVDIMM bus.
--- drivers/acpi/nfit/core.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
drivers/acpi/nfit/core.c +15 -3
@@ -3061,6 +3061,8 @@ static void acpi_nfit_unregister(void *dstruct acpi_nfit_desc *acpi_desc = data;nvdimm_bus_unregister (acpi_desc->nvdimm_bus); +/* The nvdimm_bus object may have been freed, so clear the pointer. */ + acpi_desc->nvdimm_bus =NULL ; }int acpi_nfit_init (struct acpi_nfit_desc *acpi_desc,void *data,acpi_size sz)
@@ -3301,7 +3303,10 @@ static void acpi_nfit_remove_notify_handvoid acpi_nfit_shutdown (void *data) {struct acpi_nfit_desc *acpi_desc = data; -struct device *bus_dev =to_nvdimm_bus_dev (acpi_desc->nvdimm_bus); +struct device *bus_dev; + +if (!acpi_desc || !acpi_desc->nvdimm_bus) +return ;/* * Destruct under acpi_desc_lock so that nfit_handle_mce does not
@@ -3316,6 +3321,7 @@ void acpi_nfit_shutdown(void *data)mutex_unlock (&acpi_desc->init_mutex);cancel_delayed_work_sync (&acpi_desc->dwork); + bus_dev =to_nvdimm_bus_dev (acpi_desc->nvdimm_bus);/* * Bounce the nvdimm bus lock to make sure any in-flight * acpi_nfit_ars_rescan() submissions have had a chance to
@@ -3393,9 +3399,14 @@ static int acpi_nfit_add(struct acpi_dev sz - sizeof(struct acpi_table_nfit));if (rc) -return rc; +acpi_nfit_shutdown (acpi_desc); -return devm_add_action_or_reset (dev, acpi_nfit_shutdown, acpi_desc); +return rc; +} + +static void acpi_nfit_remove (struct acpi_device *adev) +{ +acpi_nfit_shutdown (dev_get_drvdata (&adev->dev)); }static void acpi_nfit_update_notify (struct device *dev,acpi_handle handle)
@@ -3482,6 +3493,7 @@ static struct acpi_driver acpi_nfit_driv .ids = acpi_nfit_ids, .ops = { .add = acpi_nfit_add, + .remove = acpi_nfit_remove, }, };
Greg Kroah-Hartman
maintainerPATCH 1133/1276 ACPI: driver: Check ACPI_COMPANION() against NULL during probe
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Rafael J. Wysocki" <[email protected]>
[ Upstream commit e4865a56d013e86e46ea6acea15bb6eae01898ff ]
Since every platform driver can be forced to match a device that doesn't match its list of device IDs because of device_match_driver_override(), platform drivers that rely on the existence of a device's ACPI companion object should verify its presence.
Accordingly, add requisite ACPI_COMPANION() or ACPI_HANDLE() checks against NULL to 13 platform drivers handling core ACPI devices.
Also change the value returned by the ACPI thermal zone driver when the device's ACPI companion is not present to -ENODEV for consistency with the other drivers.
Stable-dep-of: 18a00ed0e718 ("ACPI: NFIT: core: Fix possible deadlock and missing notifications")
--- drivers/acpi/ac.c | 6 +++++- drivers/acpi/acpi_pad.c | 6 +++++- drivers/acpi/acpi_tad.c | 6 +++++- drivers/acpi/pfr_telemetry.c | 6 +++++- drivers/acpi/pfr_update.c | 6 +++++- drivers/acpi/thermal.c | 2 +- 6 files changed, 26 insertions(+), 6 deletions(-)
drivers/acpi/ac.c +5 -1
@@ -203,11 +203,15 @@ static const struct dmi_system_id ac_dmistatic int acpi_ac_probe (struct platform_device *pdev) { -struct acpi_device *adev =ACPI_COMPANION (&pdev->dev);struct power_supply_config psy_cfg = {}; +struct acpi_device *adev;struct acpi_ac *ac;int result; + adev =ACPI_COMPANION (&pdev->dev); +if (!adev) +return -ENODEV ; + ac =kzalloc (sizeof (struct acpi_ac ),GFP_KERNEL );if (!ac)return -ENOMEM ;
drivers/acpi/acpi_pad.c +5 -1
@@ -427,9 +427,13 @@ static void acpi_pad_notify(acpi_handlestatic int acpi_pad_probe (struct platform_device *pdev) { -struct acpi_device *adev =ACPI_COMPANION (&pdev->dev); +struct acpi_device *adev;acpi_status status; + adev =ACPI_COMPANION (&pdev->dev); +if (!adev) +return -ENODEV ; +strscpy (acpi_device_name (adev),ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME );strscpy (acpi_device_class (adev),ACPI_PROCESSOR_AGGREGATOR_CLASS );
drivers/acpi/acpi_tad.c +5 -1
@@ -588,12 +588,16 @@ static void acpi_tad_remove(struct platfstatic int acpi_tad_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev; -acpi_handle handle =ACPI_HANDLE (dev);struct acpi_tad_driver_data *dd; +acpi_handle handle;acpi_status status;unsigned long long caps;int ret; + handle =ACPI_HANDLE (dev); +if (!handle) +return -ENODEV ; + ret =acpi_install_cmos_rtc_space_handler (handle);if (ret <0 ) {dev_info (dev,"Unable to install space handler\n" );
drivers/acpi/pfr_telemetry.c +5 -1
@@ -363,10 +363,14 @@ static void pfrt_log_put_idx(void *data)static int acpi_pfrt_log_probe (struct platform_device *pdev) { -acpi_handle handle =ACPI_HANDLE (&pdev->dev);struct pfrt_log_device *pfrt_log_dev; +acpi_handle handle;int ret; + handle =ACPI_HANDLE (&pdev->dev); +if (!handle) +return -ENODEV ; +if (!acpi_has_method (handle,"_DSM" )) {dev_dbg (&pdev->dev,"Missing _DSM\n" );return -ENODEV ;
drivers/acpi/pfr_update.c +5 -1
@@ -505,10 +505,14 @@ static void pfru_put_idx(void *data)static int acpi_pfru_probe (struct platform_device *pdev) { -acpi_handle handle =ACPI_HANDLE (&pdev->dev);struct pfru_device *pfru_dev; +acpi_handle handle;int ret; + handle =ACPI_HANDLE (&pdev->dev); +if (!handle) +return -ENODEV ; +if (!acpi_has_method (handle,"_DSM" )) {dev_dbg (&pdev->dev,"Missing _DSM\n" );return -ENODEV ;
drivers/acpi/thermal.c +1 -1
@@ -789,7 +789,7 @@ static int acpi_thermal_add(struct acpi_int i;if (!device) -return -EINVAL ; +return -ENODEV ; tz =kzalloc (sizeof (struct acpi_thermal ),GFP_KERNEL );if (!tz)
Greg Kroah-Hartman
maintainerPATCH 1134/1276 ACPI: bus: Introduce devm_acpi_install_notify_handler()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Rafael J. Wysocki" <[email protected]>
[ Upstream commit ca70ce555a1eb8edf5fb1d5575f1fe19c9ae17f4 ]
Introduce devm_acpi_install_notify_handler() for installing an ACPI notify handler managed by devres that will be removed automatically on driver detach.
It installs the notify handler on the device object in the ACPI namespace that corresponds to the owner device's ACPI companion, if present (an error is returned if the owner device doesn't have an ACPI companion).
Currently, there is no way to manually remove the notify handler installed by it because none of its users brought on subsequently will need to do that.
Stable-dep-of: 18a00ed0e718 ("ACPI: NFIT: core: Fix possible deadlock and missing notifications")
--- drivers/acpi/bus.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++ include/acpi/acpi_bus.h | 2 + 2 files changed, 68 insertions(+)
drivers/acpi/bus.c +66 -0
@@ -622,6 +622,72 @@ void acpi_dev_remove_notify_handler(stru }EXPORT_SYMBOL_GPL (acpi_dev_remove_notify_handler); +struct acpi_notify_handler_devres { +acpi_notify_handler handler; +u32 handler_type; +}; + +static void devm_acpi_notify_handler_release (struct device *dev,void *res) +{ +struct acpi_notify_handler_devres *dr = res; + +acpi_dev_remove_notify_handler (ACPI_COMPANION (dev), dr->handler_type, + dr->handler); +} + +/** +* devm_acpi_install_notify_handler - Install an ACPI notify handler for a +* managed device +* @dev: Device to install a notify handler for +* @handler_type: Type of the notify handler +* @handler: Handler function to install +* @context: Data passed back to the handler function +* +* This function performs the same function as acpi_dev_install_notify_handler() +* called for the ACPI companion of @dev with the same @handler_type, @handler, +* and @context arguments, but the ACPI notify handler installed by it will be +* automatically removed on driver detach. +* +* Callers should ensure that all resources used by @handler have been allocated +* prior to invoking this function, in which case those resources should be +* devres-managed so that they won't be released before the notify handler +* removal. Otherwise, special synchronization between @handler and the +* management of those resources is required. +* +* When the request fails, an error message is printed. Don't add extra error +* messages at the call sites. +* +* Return: 0 on success or a negative error number. +*/ +int devm_acpi_install_notify_handler (struct device *dev,u32 handler_type, +acpi_notify_handler handler,void *context) +{ +struct acpi_notify_handler_devres *dr; +struct acpi_device *adev; +int ret; + + adev =ACPI_COMPANION (dev); +if (!adev) +return dev_err_probe (dev, -ENODEV ,"No ACPI companion in %s()\n" , __func__); + + dr =devres_alloc (devm_acpi_notify_handler_release,sizeof (*dr),GFP_KERNEL ); +if (!dr) +return -ENOMEM ; + + ret =acpi_dev_install_notify_handler (adev, handler_type, handler, context); +if (ret) { +devres_free (dr); +return dev_err_probe (dev, ret,"Failed to install an ACPI notify handler\n" ); + } + + dr->handler = handler; + dr->handler_type = handler_type; +devres_add (dev, dr); + +return 0 ; +} +EXPORT_SYMBOL_GPL (devm_acpi_install_notify_handler); +/* Handle events targeting \_SB device (at present only graceful shutdown) */ #define ACPI_SB_NOTIFY_SHUTDOWN_REQUEST 0x81
include/acpi/acpi_bus.h +2 -0
@@ -625,6 +625,8 @@ int acpi_dev_install_notify_handler(struvoid acpi_dev_remove_notify_handler (struct acpi_device *adev,u32 handler_type,acpi_notify_handler handler); +int devm_acpi_install_notify_handler (struct device *dev,u32 handler_type, +acpi_notify_handler handler,void *context);extern int acpi_notifier_call_chain (struct acpi_device *,u32 ,u32 );extern int register_acpi_notifier (struct notifier_block *);extern int unregister_acpi_notifier (struct notifier_block *);
Greg Kroah-Hartman
maintainerPATCH 1135/1276 ACPI: NFIT: core: Use devm_acpi_install_notify_handler()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Rafael J. Wysocki" <[email protected]>
[ Upstream commit 198541ad53c0d0d891fedea4098f9953a0f566c0 ]
Now that devm_acpi_install_notify_handler() is available, use it in acpi_nfit_probe() instead of a custom devm action removing an ACPI notify handler installed via acpi_dev_install_notify_handler().
Also drop the explicit ACPI_COMPANION() check against NULL that is not necessary any more becuase devm_acpi_install_notify_handler() carries out an equivalent check internally and use ACPI_HANDLE() to retrieve the platform device's ACPI handle.
No intentional functional impact.
Stable-dep-of: 18a00ed0e718 ("ACPI: NFIT: core: Fix possible deadlock and missing notifications")
--- drivers/acpi/nfit/core.c | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-)
drivers/acpi/nfit/core.c +7 -20
@@ -3285,19 +3285,11 @@ static void acpi_nfit_put_table(void *tastatic void acpi_nfit_notify (acpi_handle handle,u32 event,void *data) { -struct acpi_device *adev = data; +struct device *dev = data; -device_lock (&adev->dev); -__acpi_nfit_notify (&adev->dev, handle, event); -device_unlock (&adev->dev); -} - -static void acpi_nfit_remove_notify_handler (void *data) -{ -struct acpi_device *adev = data; - -acpi_dev_remove_notify_handler (adev,ACPI_DEVICE_NOTIFY , - acpi_nfit_notify); +device_lock (dev); +__acpi_nfit_notify (dev, handle, event); +device_unlock (dev); }void acpi_nfit_shutdown (void *data)
@@ -3344,13 +3336,8 @@ static int acpi_nfit_add(struct acpi_devacpi_size sz;int rc =0 ; - rc =acpi_dev_install_notify_handler (adev,ACPI_DEVICE_NOTIFY , - acpi_nfit_notify, adev); -if (rc) -return rc; - - rc =devm_add_action_or_reset (dev, acpi_nfit_remove_notify_handler, - adev); + rc =devm_acpi_install_notify_handler (dev,ACPI_DEVICE_NOTIFY , + acpi_nfit_notify, dev);if (rc)return rc;
@@ -3381,7 +3368,7 @@ static int acpi_nfit_add(struct acpi_dev acpi_desc->acpi_header = *tbl;/* Evaluate _FIT and override with that if present */ - status =acpi_evaluate_object (adev->handle,"_FIT" ,NULL , &buf); + status =acpi_evaluate_object (ACPI_HANDLE (dev),"_FIT" ,NULL , &buf);if (ACPI_SUCCESS (status) && buf.length >0 ) {union acpi_object *obj = buf.pointer;
Greg Kroah-Hartman
maintainerPATCH 1136/1276 ACPI: NFIT: core: Fix possible deadlock and missing notifications
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Rafael J. Wysocki" <[email protected]>
[ Upstream commit 18a00ed0e718473f5c3fcfa49df46c944575e60c ]
After commit 9b311b7313d6 ("ACPI: NFIT: Install Notify() handler before getting NFIT table"), ACPI NFIT driver removal may deadlock if an ACPI notify on the NFIT device is triggered concurrently. A similar deadlock may occur if an ACPI notify on the NFIT device is triggered during a failing driver probe.
The deadlock is possible because acpi_dev_remove_notify_handler() calls acpi_os_wait_events_complete() after removing the notify handler and the driver core invokes it under the NFIT platform device lock which is also acquired by acpi_nfit_notify(). Thus acpi_os_wait_events_complete() may be waiting for acpi_nfit_notify() to complete, but the latter may not be able to acquire the device lock which is being held by the driver core while the former is being executed.
Moreover, after commit 03667e146f81 ("ACPI: NFIT: core: Convert the driver to a platform one"), there are no sysfs notifications regarding NVDIMM devices because __acpi_nvdimm_notify() always bails out after checking the driver data pointer of the device's parent. That parent is the ACPI companion of the platform device used for driver binding, so its driver data pointer is always NULL after the commit in question which was overlooked by it.
A remedy for the deadlock is to use a special separate lock for ACPI notify synchronization with driver probe and removal instead of the device lock of the NFIT device, while a remedy for the second issue is to populate the driver data pointer of the NFIT device's ACPI companion when the driver is ready to operate, so do both these things. However, since the new lock is not held across the entire teardown and acpi_nfit_notify() should do nothing when teardown is in progress, make it check the driver data pointer of the NFIT device's ACPI companion, in analogy with the existing check in __acpi_nvdimm_notify(), and bail out if that pointer is NULL.
--- drivers/acpi/bus.c | 6 +++- drivers/acpi/nfit/core.c | 62 +++++++++++++++++++++++++++++++++++++---------- 2 files changed, 54 insertions(+), 14 deletions(-)
drivers/acpi/bus.c +5 -1
@@ -623,6 +623,7 @@ void acpi_dev_remove_notify_handler(struEXPORT_SYMBOL_GPL (acpi_dev_remove_notify_handler);struct acpi_notify_handler_devres { +struct acpi_device *adev;acpi_notify_handler handler;u32 handler_type; };
@@ -631,7 +632,7 @@ static void devm_acpi_notify_handler_rel {struct acpi_notify_handler_devres *dr = res; -acpi_dev_remove_notify_handler (ACPI_COMPANION (dev), dr->handler_type, +acpi_dev_remove_notify_handler (dr->adev, dr->handler_type, dr->handler); }
@@ -667,6 +668,8 @@ int devm_acpi_install_notify_handler(strint ret; adev =ACPI_COMPANION (dev); +if (!adev && dev->bus == &acpi_bus_type) + adev =to_acpi_device (dev);if (!adev)return dev_err_probe (dev, -ENODEV ,"No ACPI companion in %s()\n" , __func__);
@@ -680,6 +683,7 @@ int devm_acpi_install_notify_handler(strreturn dev_err_probe (dev, ret,"Failed to install an ACPI notify handler\n" ); } + dr->adev = adev; dr->handler = handler; dr->handler_type = handler_type;devres_add (dev, dr);
drivers/acpi/nfit/core.c +49 -13
118 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 1137/1276 iio: hid-sensor-rotation: Fix stale or zero output when reading raw values
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhang Lixu <[email protected]>
[ Upstream commit 3ce8d099e0afc5a7da75a2007a67f67c4f5a4af1 ]
When reading the raw quaternion attribute (in_rot_quaternion_raw), the driver currently returns either all zeros (if the sensor was never enabled) or stale data (if the sensor was previously enabled) because it reads from the internal buffer without explicitly requesting a new sample from the sensor.
To fix this, power up the sensor, call sensor_hub_input_attr_read_values() to issue a synchronous GET_REPORT and receive the full quaternion data directly into a local buffer, then decode the four components.
--- drivers/iio/orientation/hid-sensor-rotation.c | 40 ++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-)
drivers/iio/orientation/hid-sensor-rotation.c +38 -2
@@ -69,6 +69,13 @@ static int dev_rot_read_raw(struct iio_d long mask) {struct dev_rot_state *rot_state =iio_priv (indio_dev); +struct hid_sensor_hub_device *hsdev = rot_state->common_attributes.hsdev; +struct hid_sensor_hub_attribute_info *info = &rot_state->quaternion; +u32 usage_id =HID_USAGE_SENSOR_ORIENT_QUATERNION ; +union { +s16 val16[4 ]; +s32 val32[4 ]; + } raw_buf;int ret_type;int i;
@@ -78,8 +85,37 @@ static int dev_rot_read_raw(struct iio_dswitch (mask) {case IIO_CHAN_INFO_RAW :if (size >=4 ) { -for (i =0 ; i <4 ; ++i) - vals[i] = rot_state->scan.sampled_vals[i]; +if (info->size <=0 || info->size >sizeof (raw_buf)) +return -EINVAL ; + +hid_sensor_power_state (&rot_state->common_attributes, true); + + ret_type =sensor_hub_input_attr_read_values (hsdev, + hsdev->usage, + usage_id, + info->report_id, +SENSOR_HUB_SYNC , + info->size, + (u8 *)&raw_buf); + +hid_sensor_power_state (&rot_state->common_attributes, false); + +if (ret_type <0 ) +return ret_type; + +switch (info->size) { +case sizeof (raw_buf.val16): +for (i =0 ; i <ARRAY_SIZE (raw_buf.val16); i++) + vals[i] = raw_buf.val16[i]; +break ; +case sizeof (raw_buf.val32): +for (i =0 ; i <ARRAY_SIZE (raw_buf.val32); i++) + vals[i] = raw_buf.val32[i]; +break ; +default : +return -EINVAL ; + } + ret_type =IIO_VAL_INT_MULTIPLE ; *val_len =4 ; }else
Greg Kroah-Hartman
maintainerPATCH 1138/1276 iio: adc: ad7380: select REGMAP
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 6697091b386a4e2830bdd38512c87a4befff2b32 ]
The AD7380 driver uses generic regmap types and APIs. However, its Kconfig entry does not select REGMAP.
As a result, AD7380 can be enabled from an allnoconfig-derived config with SPI_MASTER=y while REGMAP remains unset, causing ad7380.o to fail to build.
--- drivers/iio/adc/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/iio/adc/Kconfig +1 -0
@@ -188,6 +188,7 @@ config AD7298 config AD7380 tristate "Analog Devices AD7380 ADC driver" depends on SPI_MASTER + select REGMAP select IIO_BUFFER select IIO_TRIGGER select IIO_TRIGGERED_BUFFER
Greg Kroah-Hartman
maintainerPATCH 1139/1276 iio: pressure: Remove redundant pm_runtime_mark_last_busy() calls
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sakari Ailus <[email protected]>
[ Upstream commit dfb68a8ebb2e8d9af6e356ae0806bfd8e854ab44 ]
pm_runtime_put_autosuspend(), pm_runtime_put_sync_autosuspend(), pm_runtime_autosuspend() and pm_request_autosuspend() now include a call to pm_runtime_mark_last_busy(). Remove the now-reduntant explicit call to pm_runtime_mark_last_busy().
Stable-dep-of: fbe67ff37a6f ("iio: pressure: mpl115: fix runtime PM leak on read error")
--- drivers/iio/pressure/bmp280-core.c | 5 ----- drivers/iio/pressure/icp10100.c | 1 - drivers/iio/pressure/mpl115.c | 2 -- drivers/iio/pressure/zpa2326.c | 2 -- 4 files changed, 10 deletions(-)
drivers/iio/pressure/bmp280-core.c +0 -5
@@ -747,7 +747,6 @@ static int bmp280_read_raw(struct iio_depm_runtime_get_sync (data->dev); ret =bmp280_read_raw_impl (indio_dev, chan, val, val2, mask); -pm_runtime_mark_last_busy (data->dev);pm_runtime_put_autosuspend (data->dev);return ret;
@@ -922,7 +921,6 @@ static int bmp280_write_raw(struct iio_dpm_runtime_get_sync (data->dev); ret =bmp280_write_raw_impl (indio_dev, chan, val, val2, mask); -pm_runtime_mark_last_busy (data->dev);pm_runtime_put_autosuspend (data->dev);return ret;
@@ -1951,7 +1949,6 @@ static int bmp580_nvmem_read(void *priv,pm_runtime_get_sync (data->dev); ret =bmp580_nvmem_read_impl (priv, offset, val, bytes); -pm_runtime_mark_last_busy (data->dev);pm_runtime_put_autosuspend (data->dev);return ret;
@@ -2026,7 +2023,6 @@ static int bmp580_nvmem_write(void *privpm_runtime_get_sync (data->dev); ret =bmp580_nvmem_write_impl (priv, offset, val, bytes); -pm_runtime_mark_last_busy (data->dev);pm_runtime_put_autosuspend (data->dev);return ret;
@@ -2634,7 +2630,6 @@ static int bmp280_buffer_postdisable(str {struct bmp280_data *data =iio_priv (indio_dev); -pm_runtime_mark_last_busy (data->dev);pm_runtime_put_autosuspend (data->dev);return 0 ;
drivers/iio/pressure/icp10100.c +0 -1
@@ -265,7 +265,6 @@ static int icp10100_get_measures(struct (be16_to_cpu (measures[1 ]) >>8 ); *temperature =be16_to_cpu (measures[2 ]); -pm_runtime_mark_last_busy (&st->client->dev); error_measure:pm_runtime_put_autosuspend (&st->client->dev);return ret;
drivers/iio/pressure/mpl115.c +0 -2
@@ -108,7 +108,6 @@ static int mpl115_read_raw(struct iio_de ret =mpl115_comp_pressure (data, val, val2);if (ret <0 )return ret; -pm_runtime_mark_last_busy (data->dev);pm_runtime_put_autosuspend (data->dev);return IIO_VAL_INT_PLUS_MICRO ;
@@ -118,7 +117,6 @@ static int mpl115_read_raw(struct iio_de ret =mpl115_read_temp (data);if (ret <0 )return ret; -pm_runtime_mark_last_busy (data->dev);pm_runtime_put_autosuspend (data->dev); *val = ret >>6 ;
drivers/iio/pressure/zpa2326.c +0 -2
@@ -699,7 +699,6 @@ static void zpa2326_suspend(struct iio_dzpa2326_sleep (indio_dev); -pm_runtime_mark_last_busy (parent);pm_runtime_put_autosuspend (parent); }
@@ -710,7 +709,6 @@ static void zpa2326_init_runtime(structpm_runtime_enable (parent);pm_runtime_set_autosuspend_delay (parent,1000 );pm_runtime_use_autosuspend (parent); -pm_runtime_mark_last_busy (parent);pm_runtime_put_autosuspend (parent); }
Re: [PATCH 6.12 1139/1276] iio: pressure: Remove redundant pm_runtime_mark_last_busy() calls
Hi Greg/Sasha,
Quoted 4 lines · Greg Kroah-Hartman
6.12-stable review patch. If anyone has any objections, please let me know.
------------------
Quoted 8 lines
From: Sakari Ailus <[email protected]>
[ Upstream commit
dfb68a8ebb2e8d9af6e356ae0806bfd8e854ab44]
pm_runtime_put_autosuspend(),pm_runtime_put_sync_autosuspend(),pm_runtime_autosuspend()andpm_request_autosuspend()now include a call topm_runtime_mark_last_busy(). Remove the now-reduntant explicit call topm_runtime_mark_last_busy().
I ran an AI-assisted backport review and verified one issue.
The 6.12.y backport e23d3671bc0a ("iio: pressure: Remove redundantpm_runtime_mark_last_busy() calls") removes ten explicit last-busy updates before pm_runtime_put_autosuspend(). However, in this branch that helper only calls __pm_runtime_suspend() and does not update power.last_busy.
Upstream dfb68a8ebb2e removes those calls only after b3db492e8335
("PM: runtime: Mark last busy stamp in pm_runtime_put_autosuspend()") moved the update into pm_runtime_put_autosuspend().
I think 6.12.y misses commit b3db492e8335 ("PM: runtime: Mark last busy stamp in pm_runtime_put_autosuspend()"), so this backport probably is not be complete.
Lets drop this from the queues, I see this is a stable dep of other patch, and the missing commit is not a clean cherry-pick, so we could deal with backporting that later and along with that we could probably include this. Thoughts ?
thanks,
Harshit
Quoted 105 lines
Signed-off-by Sakari Ailus <[email protected]>Signed-off-by Jonathan Cameron <[email protected]>Stable-dep-of:
fbe67ff37a6f("iio: pressure: mpl115: fix runtime PM leak on read error")Signed-off-by Sasha Levin <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- drivers/iio/pressure/bmp280-core.c | 5 ----- drivers/iio/pressure/icp10100.c | 1 - drivers/iio/pressure/mpl115.c | 2 -- drivers/iio/pressure/zpa2326.c | 2 -- 4 files changed, 10 deletions(-)drivers/iio/pressure/bmp280-core.c +0
-5@@ -747,7 +747,6 @@ static int bmp280_read_raw(struct iio_depm_runtime_get_sync (data->dev); ret =bmp280_read_raw_impl (indio_dev, chan, val, val2, mask); -pm_runtime_mark_last_busy (data->dev);pm_runtime_put_autosuspend (data->dev);return ret;@@ -922,7 +921,6 @@ static int bmp280_write_raw(struct iio_dpm_runtime_get_sync (data->dev); ret =bmp280_write_raw_impl (indio_dev, chan, val, val2, mask); -pm_runtime_mark_last_busy (data->dev);pm_runtime_put_autosuspend (data->dev);return ret;@@ -1951,7 +1949,6 @@ static int bmp580_nvmem_read(void *priv,pm_runtime_get_sync (data->dev); ret =bmp580_nvmem_read_impl (priv, offset, val, bytes); -pm_runtime_mark_last_busy (data->dev);pm_runtime_put_autosuspend (data->dev);return ret;@@ -2026,7 +2023,6 @@ static int bmp580_nvmem_write(void *privpm_runtime_get_sync (data->dev); ret =bmp580_nvmem_write_impl (priv, offset, val, bytes); -pm_runtime_mark_last_busy (data->dev);pm_runtime_put_autosuspend (data->dev);return ret;@@ -2634,7 +2630,6 @@ static int bmp280_buffer_postdisable(str {struct bmp280_data *data =iio_priv (indio_dev); -pm_runtime_mark_last_busy (data->dev);pm_runtime_put_autosuspend (data->dev);return 0 ;drivers/iio/pressure/icp10100.c +0
-1@@ -265,7 +265,6 @@ static int icp10100_get_measures(struct (be16_to_cpu (measures[1 ]) >>8 ); *temperature =be16_to_cpu (measures[2 ]); -pm_runtime_mark_last_busy (&st->client->dev); error_measure:pm_runtime_put_autosuspend (&st->client->dev);return ret;drivers/iio/pressure/mpl115.c +0
-2@@ -108,7 +108,6 @@ static int mpl115_read_raw(struct iio_de ret =mpl115_comp_pressure (data, val, val2);if (ret <0 )return ret; -pm_runtime_mark_last_busy (data->dev);pm_runtime_put_autosuspend (data->dev);return IIO_VAL_INT_PLUS_MICRO ;@@ -118,7 +117,6 @@ static int mpl115_read_raw(struct iio_de ret =mpl115_read_temp (data);if (ret <0 )return ret; -pm_runtime_mark_last_busy (data->dev);pm_runtime_put_autosuspend (data->dev); *val = ret >>6 ;drivers/iio/pressure/zpa2326.c +0
-2@@ -699,7 +699,6 @@ static void zpa2326_suspend(struct iio_dzpa2326_sleep (indio_dev); -pm_runtime_mark_last_busy (parent);pm_runtime_put_autosuspend (parent); }@@ -710,7 +709,6 @@ static void zpa2326_init_runtime(structpm_runtime_enable (parent);pm_runtime_set_autosuspend_delay (parent,1000 );pm_runtime_use_autosuspend (parent); -pm_runtime_mark_last_busy (parent);pm_runtime_put_autosuspend (parent); }
Sasha Levin
maintainerRe: [PATCH 6.12 1139/1276] iio: pressure: Remove redundant pm_runtime_mark_last_busy() calls
Quoted 5 lines
I think 6.12.y misses commit
b3db492e8335("PM: runtime: Mark last busy stamp inpm_runtime_put_autosuspend()"), so this backport probably is not be complete.Lets drop this from the queues [...]
Your analysis is correct: without b3db492e8335 the last-busy timestamp is never updated on 6.12, so removing the explicit pm_runtime_mark_last_busy() calls would cause premature autosuspend. Since this cleanup was only pulled in as a stable-dep of the mpl115 runtime-PM-leak fix, I'll drop both from 6.12 for now and redo the pair properly on top of b3db492e8335 later. Thanks.
Signature · 2 lines
Thanks, Sasha
Re: [PATCH 6.12 1139/1276] iio: pressure: Remove redundant pm_runtime_mark_last_busy() calls
Hi Sasha,
Quoted 4 lines · Sasha Levin
Quoted 4 lines
I think 6.12.y misses commit
b3db492e8335("PM: runtime: Mark last busy stamp inpm_runtime_put_autosuspend()"), so this backport probably is not be complete.
Quoted 9 lines
Quoted 1 line
Lets drop this from the queues [...]
Your analysis is correct: without
b3db492e8335the last-busy timestamp is never updated on 6.12, so removing the explicitpm_runtime_mark_last_busy()calls would cause premature autosuspend. Since this cleanup was only pulled in as a stable-dep of the mpl115 runtime-PM-leak fix, I'll drop both from 6.12 for now and redo the pair properly on top ofb3db492e8335later. Thanks.
Looks like we already merged it so a revert and redo ?
thanks,
Harshit
Sasha Levin
maintainerRe: [PATCH 6.12 1139/1276] iio: pressure: Remove redundant pm_runtime_mark_last_busy() calls
Quoted 1 line · Harshit Mogalapalli
Looks like we already merged it so a revert and redo ?
Yes - v6.12.97 went out before I got to it, so dropping is no longer an option and a revert on top is the only way back.
Could you (or Sakari/Jonathan) send a [PATCH 6.12.y] doing that? The pair can then be redone properly later on top of b3db492e8335 ("PM: runtime:
Mark last busy stamp in pm_runtime_put_autosuspend()") if anyone wants the cleanup back on 6.12.
Signature · 2 lines
Thanks, Sasha
Re: [PATCH 6.12 1139/1276] iio: pressure: Remove redundant pm_runtime_mark_last_busy() calls
Hi Sasha.
Quoted 11 lines · Sasha Levin
Quoted 1 line · Harshit Mogalapalli
Looks like we already merged it so a revert and redo ?
Yes - v6.12.97 went out before I got to it, so dropping is no longer an option and a revert on top is the only way back.
Could you (or Sakari/Jonathan) send a [PATCH 6.12.y] doing that? The pair can then be redone properly later on top of
b3db492e8335("PM: runtime:
Mark last busy stamp inpm_runtime_put_autosuspend()") if anyone wants the cleanup back on 6.12.
I will do that.
thanks,
Harshit
Greg Kroah-Hartman
maintainerPATCH 1140/1276 iio: pressure: mpl115: fix runtime PM leak on read error
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Biren Pandya <[email protected]>
[ Upstream commit fbe67ff37a6fd855a6c097f84f3738bd13d0a898 ]
mpl115_read_raw() takes a runtime PM reference with pm_runtime_get_sync() before reading the processed pressure or raw temperature, but on the read error path it returns without calling pm_runtime_put_autosuspend(). Each failed read therefore leaks a runtime PM reference and prevents the device from autosuspending.
Drop the reference before checking the return value so both the success and error paths are balanced.
--- drivers/iio/pressure/mpl115.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/pressure/mpl115.c +2 -2
@@ -106,18 +106,18 @@ static int mpl115_read_raw(struct iio_decase IIO_CHAN_INFO_PROCESSED :pm_runtime_get_sync (data->dev); ret =mpl115_comp_pressure (data, val, val2); +pm_runtime_put_autosuspend (data->dev);if (ret <0 )return ret; -pm_runtime_put_autosuspend (data->dev);return IIO_VAL_INT_PLUS_MICRO ;case IIO_CHAN_INFO_RAW :pm_runtime_get_sync (data->dev);/* temperature -5.35 C / LSB, 472 LSB is 25 C */ ret =mpl115_read_temp (data); +pm_runtime_put_autosuspend (data->dev);if (ret <0 )return ret; -pm_runtime_put_autosuspend (data->dev); *val = ret >>6 ;return IIO_VAL_INT ;
Greg Kroah-Hartman
maintainerPATCH 1141/1276 ALSA: aoa: check snd_ctl_new1() return value
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 8df560fefe6fed6a20b7e06720eeaeccec349ac0 ]
snd_ctl_new1() can return NULL when memory allocation fails. In layout.c, the function does not check the return value before dereferencing ctl->id.name or passing to aoa_snd_ctl_add(), which can lead to a NULL pointer dereference.
Add NULL checks after snd_ctl_new1() calls and return early if any fails.
--- sound/aoa/fabrics/layout.c | 6 ++++++ 1 file changed, 6 insertions(+)
sound/aoa/fabrics/layout.c +6 -0
@@ -948,6 +948,8 @@ static void layout_attached_codec(structif (lineout ==1 ) ldev->gpio.methods->set_lineout (codec->gpio,1 ); ctl =snd_ctl_new1 (&lineout_ctl, codec->gpio); +if (!ctl) +return ;if (cc->connected &CC_LINEOUT_LABELLED_HEADPHONE )strscpy (ctl->id.name,"Headphone Switch" ,sizeof (ctl->id.name));
@@ -962,6 +964,8 @@ static void layout_attached_codec(structif (ldev->have_lineout_detect) { ctl =snd_ctl_new1 (&lineout_detect_choice, ldev); +if (!ctl) +return ;if (cc->connected &CC_LINEOUT_LABELLED_HEADPHONE ) strscpy(ctl->id.name, "Headphone Detect Autoswitch",
@@ -969,6 +973,8 @@ static void layout_attached_codec(structaoa_snd_ctl_add (ctl); ctl =snd_ctl_new1 (&lineout_detected, ldev); +if (!ctl) +return ;if (cc->connected &CC_LINEOUT_LABELLED_HEADPHONE ) strscpy(ctl->id.name, "Headphone Detected",
Greg Kroah-Hartman
maintainerPATCH 1142/1276 ALSA: hda/cs35l41: Fix firmware load work teardown
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cássio Gabriel <[email protected]>
[ Upstream commit b65020d5398f499c09498c9786dba6d67ae57664 ]
cs35l41_hda creates ALSA controls whose private data points at the cs35l41_hda object. The firmware load control can also queue fw_load_work.
Those controls are not removed on component unbind, and device remove only cancels fw_load_work through cs35l41_remove_dsp(). That helper is skipped when halo_initialized is false. With firmware_autostart disabled, a firmware load can be requested before the DSP has been initialized. If the component or device is removed before the queued work runs, the worker can run after teardown and dereference driver state that is no longer valid.
Track the created controls and remove them on unbind so no new control callback can reach the driver data or queue more work. Then cancel fw_load_work to drain any request that was already queued. Also cancel the work unconditionally during device remove before runtime PM teardown.
--- sound/pci/hda/cs35l41_hda.c | 77 +++++++++++++++++++++++++++++++------------- sound/pci/hda/cs35l41_hda.h | 5 ++ 2 files changed, 60 insertions(+), 22 deletions(-)
sound/pci/hda/cs35l41_hda.c +55 -22
@@ -1293,6 +1293,43 @@ static int cs35l41_fw_type_ctl_info(strureturn snd_ctl_enum_info (uinfo,1 ,ARRAY_SIZE (hda_cs_dsp_fw_ids), hda_cs_dsp_fw_ids); } +static void cs35l41_remove_controls (struct cs35l41_hda *cs35l41) +{ +if (!cs35l41->codec) +return ; + +snd_ctl_remove (cs35l41->codec->card, cs35l41->mute_override_ctl); + cs35l41->mute_override_ctl =NULL ; + +snd_ctl_remove (cs35l41->codec->card, cs35l41->fw_load_ctl); + cs35l41->fw_load_ctl =NULL ; + +snd_ctl_remove (cs35l41->codec->card, cs35l41->fw_type_ctl); + cs35l41->fw_type_ctl =NULL ; +} + +static int cs35l41_add_control (struct cs35l41_hda *cs35l41, +struct snd_kcontrol_new *ctl, +struct snd_kcontrol **kctl) +{ +int ret; + + *kctl =snd_ctl_new1 (ctl, cs35l41); +if (!*kctl) +return -ENOMEM ; + + ret =snd_ctl_add (cs35l41->codec->card, *kctl); +if (ret) { +dev_err (cs35l41->dev,"Failed to add KControl %s = %d\n" , ctl->name, ret); + *kctl =NULL ; +return ret; + } + +dev_dbg (cs35l41->dev,"Added Control %s\n" , ctl->name); + +return 0 ; +} +static int cs35l41_create_controls (struct cs35l41_hda *cs35l41) {char fw_type_ctl_name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN ];
@@ -1328,32 +1365,23 @@ static int cs35l41_create_controls(strucscnprintf (mute_override_ctl_name,SNDRV_CTL_ELEM_ID_NAME_MAXLEN ,"%s Forced Mute Status" , cs35l41->amp_name); - ret =snd_ctl_add (cs35l41->codec->card,snd_ctl_new1 (&fw_type_ctl, cs35l41)); -if (ret) { -dev_err (cs35l41->dev,"Failed to add KControl %s = %d\n" , fw_type_ctl.name, ret); -return ret; - } - -dev_dbg (cs35l41->dev,"Added Control %s\n" , fw_type_ctl.name); - - ret =snd_ctl_add (cs35l41->codec->card,snd_ctl_new1 (&fw_load_ctl, cs35l41)); -if (ret) { -dev_err (cs35l41->dev,"Failed to add KControl %s = %d\n" , fw_load_ctl.name, ret); -return ret; - } - -dev_dbg (cs35l41->dev,"Added Control %s\n" , fw_load_ctl.name); + ret =cs35l41_add_control (cs35l41, &fw_type_ctl, &cs35l41->fw_type_ctl); +if (ret) + goto err; - ret =snd_ctl_add (cs35l41->codec->card,snd_ctl_new1 (&mute_override_ctl, cs35l41)); -if (ret) { -dev_err (cs35l41->dev,"Failed to add KControl %s = %d\n" , mute_override_ctl.name, - ret); -return ret; - } + ret =cs35l41_add_control (cs35l41, &fw_load_ctl, &cs35l41->fw_load_ctl); +if (ret) + goto err; -dev_dbg (cs35l41->dev,"Added Control %s\n" , mute_override_ctl.name); + ret =cs35l41_add_control (cs35l41, &mute_override_ctl, &cs35l41->mute_override_ctl); +if (ret) + goto err;return 0 ; + +err: +cs35l41_remove_controls (cs35l41); +return ret; }static bool cs35l41_dsm_supported (acpi_handle handle,unsigned int commands)
@@ -1491,6 +1519,10 @@ static void cs35l41_hda_unbind(struct dedevice_link_remove (&cs35l41->codec->core.dev, cs35l41->dev);unlock_system_sleep (sleep_flags);memset (comp,0 ,sizeof (*comp)); + +cs35l41_remove_controls (cs35l41); +cancel_work_sync (&cs35l41->fw_load_work); + cs35l41->codec =NULL ; } }
@@ -2030,6 +2062,7 @@ void cs35l41_hda_remove(struct device *dstruct cs35l41_hda *cs35l41 =dev_get_drvdata (dev);component_del (cs35l41->dev, &cs35l41_hda_comp_ops); +cancel_work_sync (&cs35l41->fw_load_work);pm_runtime_get_sync (cs35l41->dev);pm_runtime_dont_use_autosuspend (cs35l41->dev);
sound/pci/hda/cs35l41_hda.h +5 -0
@@ -56,6 +56,8 @@ enum control_bus {SPI }; +struct snd_kcontrol ; +struct cs35l41_hda {struct device *dev;struct regmap *regmap;
@@ -74,6 +76,9 @@ struct cs35l41_hda {int speaker_id;struct mutex fw_mutex;struct work_struct fw_load_work; +struct snd_kcontrol *fw_type_ctl; +struct snd_kcontrol *fw_load_ctl; +struct snd_kcontrol *mute_override_ctl;struct regmap_irq_chip_data *irq_data;bool firmware_running;
Greg Kroah-Hartman
maintainerPATCH 1143/1276 ALSA: scarlett2: Allow selecting config_set by firmware version
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Geoffrey D. Bennett" <[email protected]>
[ Upstream commit 732a6397a526c025cd29c3c9309b0db6a2c08837 ]
The Scarlett 2i2 Gen 4 firmware 2417 moved the direct monitor gain parameters, so we now need to allow each device to list multiple scarlett2_config_set entries, one per applicable firmware version range, and pick the matching one at probe time.
No functional change yet: each device gets a single config_sets entry whose from_firmware_version matches the existing min_firmware_version (0 where none was set). This both prepares for selection and lets a follow-up commit remove the now-redundant min_firmware_version field.
scarlett2_count_io() depends on the resolved config_set so it moves out of scarlett2_init_private() into snd_scarlett2_controls_create() after the firmware version has been read.
Stable-dep-of: 3ca15754b561 ("ALSA: scarlett2: Update offsets for 2i2 Gen 4 firmware 2417")
--- sound/usb/mixer_scarlett2.c | 143 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 121 insertions(+), 22 deletions(-)
sound/usb/mixer_scarlett2.c +121 -22
@@ -588,6 +588,20 @@ struct scarlett2_config_set {const struct scarlett2_config items[SCARLETT2_CONFIG_COUNT ]; }; +/* Map firmware versions to config sets per-device. +* +* Each device lists one or more entries, sorted in ascending order of +* from_firmware_version. At probe time the running firmware version +* is looked up against this list and the last entry whose +* from_firmware_version is <= the running version is selected. +* +* The list is terminated by a sentinel entry with config_set == NULL. +*/ +struct scarlett2_config_set_entry { +u16 from_firmware_version; +const struct scarlett2_config_set *config_set; +}; +/* Input gain TLV dB ranges */ static const DECLARE_TLV_DB_MINMAX(
@@ -1073,8 +1087,8 @@ struct scarlett2_meter_entry { };struct scarlett2_device_info { -/* which set of configuration parameters the device uses */ -const struct scarlett2_config_set *config_set; +/* which sets of configuration parameters the device uses */ +const struct scarlett2_config_set_entry *config_sets;/* minimum firmware version required */ u16 min_firmware_version;
@@ -1309,7 +1323,10 @@ struct scarlett2_data {/*** Model-specific data ***/ static const struct scarlett2_device_info s6i6_gen2_info = { - .config_set = &scarlett2_config_set_gen2a, + .config_sets = (const struct scarlett2_config_set_entry []) { + {0 , &scarlett2_config_set_gen2a }, + { } + }, .level_input_count =2 , .pad_input_count =2 ,
@@ -1359,7 +1376,10 @@ static const struct scarlett2_device_inf };static const struct scarlett2_device_info s18i8_gen2_info = { - .config_set = &scarlett2_config_set_gen2a, + .config_sets = (const struct scarlett2_config_set_entry []) { + {0 , &scarlett2_config_set_gen2a }, + { } + }, .level_input_count =2 , .pad_input_count =4 ,
@@ -1412,7 +1432,10 @@ static const struct scarlett2_device_inf };static const struct scarlett2_device_info s18i20_gen2_info = { - .config_set = &scarlett2_config_set_gen2b, + .config_sets = (const struct scarlett2_config_set_entry []) { + {0 , &scarlett2_config_set_gen2b }, + { } + }, .line_out_descrs = {"Monitor L" ,
@@ -1469,7 +1492,10 @@ static const struct scarlett2_device_inf };static const struct scarlett2_device_info solo_gen3_info = { - .config_set = &scarlett2_config_set_gen3a, + .config_sets = (const struct scarlett2_config_set_entry []) { + {0 , &scarlett2_config_set_gen3a }, + { } + }, .level_input_count =1 , .level_input_first =1 , .air_input_count =1 ,
@@ -1479,7 +1505,10 @@ static const struct scarlett2_device_inf };static const struct scarlett2_device_info s2i2_gen3_info = { - .config_set = &scarlett2_config_set_gen3a, + .config_sets = (const struct scarlett2_config_set_entry []) { + {0 , &scarlett2_config_set_gen3a }, + { } + }, .level_input_count =2 , .air_input_count =2 , .phantom_count =1 ,
@@ -1488,7 +1517,10 @@ static const struct scarlett2_device_inf };static const struct scarlett2_device_info s4i4_gen3_info = { - .config_set = &scarlett2_config_set_gen3b, + .config_sets = (const struct scarlett2_config_set_entry []) { + {0 , &scarlett2_config_set_gen3b }, + { } + }, .level_input_count =2 , .pad_input_count =2 , .air_input_count =2 ,
@@ -1537,7 +1569,10 @@ static const struct scarlett2_device_inf };static const struct scarlett2_device_info s8i6_gen3_info = { - .config_set = &scarlett2_config_set_gen3b, + .config_sets = (const struct scarlett2_config_set_entry []) { + {0 , &scarlett2_config_set_gen3b }, + { } + }, .level_input_count =2 , .pad_input_count =2 , .air_input_count =2 ,
@@ -1603,7 +1638,10 @@ static const char * const scarlett2_spdi };static const struct scarlett2_device_info s18i8_gen3_info = { - .config_set = &scarlett2_config_set_gen3c, + .config_sets = (const struct scarlett2_config_set_entry []) { + {0 , &scarlett2_config_set_gen3c }, + { } + }, .has_speaker_switching =1 , .level_input_count =2 , .pad_input_count =4 ,
@@ -1695,7 +1733,10 @@ static const char * const scarlett2_spdi };static const struct scarlett2_device_info s18i20_gen3_info = { - .config_set = &scarlett2_config_set_gen3c, + .config_sets = (const struct scarlett2_config_set_entry []) { + {0 , &scarlett2_config_set_gen3c }, + { } + }, .has_speaker_switching =1 , .has_talkback =1 , .level_input_count =2 ,
@@ -1769,7 +1810,10 @@ static const struct scarlett2_device_inf };static const struct scarlett2_device_info vocaster_one_info = { - .config_set = &scarlett2_config_set_vocaster, + .config_sets = (const struct scarlett2_config_set_entry []) { + {1769 , &scarlett2_config_set_vocaster }, + { } + }, .min_firmware_version =1769 , .phantom_count =1 ,
@@ -1811,7 +1855,10 @@ static const struct scarlett2_device_inf };static const struct scarlett2_device_info vocaster_two_info = { - .config_set = &scarlett2_config_set_vocaster, + .config_sets = (const struct scarlett2_config_set_entry []) { + {1769 , &scarlett2_config_set_vocaster }, + { } + }, .min_firmware_version =1769 , .phantom_count =2 ,
@@ -1854,7 +1901,10 @@ static const struct scarlett2_device_inf };static const struct scarlett2_device_info solo_gen4_info = { - .config_set = &scarlett2_config_set_gen4_solo, + .config_sets = (const struct scarlett2_config_set_entry []) { + {2115 , &scarlett2_config_set_gen4_solo }, + { } + }, .min_firmware_version =2115 , .level_input_count =1 ,
@@ -1908,7 +1958,10 @@ static const struct scarlett2_device_inf };static const struct scarlett2_device_info s2i2_gen4_info = { - .config_set = &scarlett2_config_set_gen4_2i2, + .config_sets = (const struct scarlett2_config_set_entry []) { + {2115 , &scarlett2_config_set_gen4_2i2 }, + { } + }, .min_firmware_version =2115 , .level_input_count =2 ,
@@ -1962,7 +2015,10 @@ static const struct scarlett2_device_inf };static const struct scarlett2_device_info s4i4_gen4_info = { - .config_set = &scarlett2_config_set_gen4_4i4, + .config_sets = (const struct scarlett2_config_set_entry []) { + {2089 , &scarlett2_config_set_gen4_4i4 }, + { } + }, .min_firmware_version =2089 , .level_input_count =2 ,
@@ -2010,7 +2066,10 @@ static const struct scarlett2_device_inf };static const struct scarlett2_device_info clarett_2pre_info = { - .config_set = &scarlett2_config_set_clarett, + .config_sets = (const struct scarlett2_config_set_entry []) { + {0 , &scarlett2_config_set_clarett }, + { } + }, .level_input_count =2 , .air_input_count =2 ,
@@ -2066,7 +2125,10 @@ static const char * const scarlett2_spdi };static const struct scarlett2_device_info clarett_4pre_info = { - .config_set = &scarlett2_config_set_clarett, + .config_sets = (const struct scarlett2_config_set_entry []) { + {0 , &scarlett2_config_set_clarett }, + { } + }, .level_input_count =2 , .air_input_count =4 ,
@@ -2122,7 +2184,10 @@ static const struct scarlett2_device_inf };static const struct scarlett2_device_info clarett_8pre_info = { - .config_set = &scarlett2_config_set_clarett, + .config_sets = (const struct scarlett2_config_set_entry []) { + {0 , &scarlett2_config_set_clarett }, + { } + }, .level_input_count =2 , .air_input_count =8 ,
@@ -8539,10 +8604,32 @@ static void scarlett2_private_suspend(st/*** Initialisation ***/ +/* Select the config_set matching the running firmware version. +* +* The device info's config_sets array is ordered by ascending +* from_firmware_version; pick the last entry whose version is <= the +* running firmware version. If the running firmware is older than the +* first entry's from_firmware_version (i.e. older than the driver's +* minimum supported version for this device), the first entry's +* config_set is selected anyway so firmware updates can still be done +* (requires only the ACK handler), but the usual mixer controls +* aren't created. +*/ +static void scarlett2_resolve_config_set (struct scarlett2_data *private) +{ +const struct scarlett2_config_set_entry *entry = + private->info->config_sets; + + private->config_set = entry->config_set; +for (entry++; entry->config_set; entry++) +if (entry->from_firmware_version <= private->firmware_version) + private->config_set = entry->config_set; +} +static void scarlett2_count_io (struct scarlett2_data *private) {const struct scarlett2_device_info *info = private->info; -const struct scarlett2_config_set *config_set = info->config_set; +const struct scarlett2_config_set *config_set = private->config_set;const int (*port_count)[SCARLETT2_PORT_DIRNS ] = info->port_count;int port_type, srcs =0 , dsts =0 , i;
@@ -8640,9 +8727,14 @@ static int scarlett2_init_private(struct mixer->private_suspend = scarlett2_private_suspend; private->info = entry->info; - private->config_set = entry->info->config_set; + +/* Set config_set to the first entry's config_set so the +* notify handler has a valid pointer while USB init runs; it +* is re-resolved once the firmware version has been read. +*/ + private->config_set = entry->info->config_sets[0 ].config_set; + private->series_name = entry->series_name; -scarlett2_count_io (private); private->scarlett2_seq =0 ; private->mixer = mixer;
@@ -9046,6 +9138,13 @@ static int snd_scarlett2_controls_createif (err <0 )return err; +/* Now that the firmware version is known, pick the matching +* config_set +*/ +scarlett2_resolve_config_set (private); + +scarlett2_count_io (private); +/* Get the upgrade & settings flash segment numbers */ err =scarlett2_get_flash_segment_nums (mixer);if (err <0 )
Greg Kroah-Hartman
maintainerPATCH 1144/1276 ALSA: scarlett2: Update offsets for 2i2 Gen 4 firmware 2417
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Geoffrey D. Bennett" <[email protected]>
[ Upstream commit 3ca15754b561483aa7a1bce51677d6389f8ff5bb ]
Firmware 2417 for the Scarlett 4th Gen 2i2 moved the direct monitor gain parameters, so add a second config_set with the shifted offset and select it for firmware versions >= 2417.
--- sound/usb/mixer_scarlett2.c | 58 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+)
sound/usb/mixer_scarlett2.c +58 -0
@@ -910,6 +910,63 @@ static const struct scarlett2_config_set } }; +/* 2i2 Gen 4, firmware version 2417 and above +* +* Firmware 2417 shifted DIRECT_MONITOR_GAIN by 4 bytes; all other +* offsets are unchanged from scarlett2_config_set_gen4_2i2. +*/ +static const struct scarlett2_config_set scarlett2_config_set_gen4_2i2_2417 = { + .notifications = scarlett4_2i2_notifications, + .param_buf_addr =0xfc , + .input_gain_tlv = db_scale_gen4_gain, + .autogain_status_texts = scarlett2_autogain_status_gen4, + .items = { + [SCARLETT2_CONFIG_MSD_SWITCH ] = { + .offset =0x49 , .size =8 , .activate =4 }, + + [SCARLETT2_CONFIG_DIRECT_MONITOR ] = { + .offset =0x14a , .size =8 , .activate =16 , .pbuf =1 }, + + [SCARLETT2_CONFIG_AUTOGAIN_SWITCH ] = { + .offset =0x135 , .size =8 , .activate =10 , .pbuf =1 }, + + [SCARLETT2_CONFIG_AUTOGAIN_STATUS ] = { + .offset =0x137 , .size =8 }, + + [SCARLETT2_CONFIG_AG_MEAN_TARGET ] = { + .offset =0x131 , .size =8 , .activate =29 , .pbuf =1 }, + + [SCARLETT2_CONFIG_AG_PEAK_TARGET ] = { + .offset =0x132 , .size =8 , .activate =30 , .pbuf =1 }, + + [SCARLETT2_CONFIG_PHANTOM_SWITCH ] = { + .offset =0x48 , .size =8 , .activate =11 , .pbuf =1 , + .mute =1 }, + + [SCARLETT2_CONFIG_INPUT_GAIN ] = { + .offset =0x4b , .size =8 , .activate =12 , .pbuf =1 }, + + [SCARLETT2_CONFIG_LEVEL_SWITCH ] = { + .offset =0x3c , .size =8 , .activate =13 , .pbuf =1 , + .mute =1 }, + + [SCARLETT2_CONFIG_SAFE_SWITCH ] = { + .offset =0x147 , .size =8 , .activate =14 , .pbuf =1 }, + + [SCARLETT2_CONFIG_AIR_SWITCH ] = { + .offset =0x3e , .size =8 , .activate =15 , .pbuf =1 }, + + [SCARLETT2_CONFIG_INPUT_SELECT_SWITCH ] = { + .offset =0x14b , .size =8 , .activate =17 , .pbuf =1 }, + + [SCARLETT2_CONFIG_INPUT_LINK_SWITCH ] = { + .offset =0x14e , .size =8 , .activate =18 , .pbuf =1 }, + + [SCARLETT2_CONFIG_DIRECT_MONITOR_GAIN ] = { + .offset =0x2a4 , .size =16 , .activate =36 } + } +}; +/* 4i4 Gen 4 */ static const struct scarlett2_config_set scarlett2_config_set_gen4_4i4 = { .notifications = scarlett4_4i4_notifications,
@@ -1960,6 +2017,7 @@ static const struct scarlett2_device_infstatic const struct scarlett2_device_info s2i2_gen4_info = { .config_sets = (const struct scarlett2_config_set_entry []) { {2115 , &scarlett2_config_set_gen4_2i2 }, + {2417 , &scarlett2_config_set_gen4_2i2_2417 }, { } }, .min_firmware_version =2115 ,
Greg Kroah-Hartman
maintainerPATCH 1145/1276 vfio/mlx5: Fix racy bitfields and tighten struct layout
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Williamson <[email protected]>
[ Upstream commit f2365a63b02ddea32e7db78b742c2503ec7b81f1 ]
Bitfield operations are not atomic, they use a read-modify-write pattern, therefore we should be careful not to pack bitfields that can be concurrently updated into the same storage unit.
This split takes a binary approach: flags that are only modified pre/post open/close remain bitfields, flags modified from user action, including actions that reach across to another device (ex. reset) use dedicated storage units.
Note mlx5_vhca_page_tracker.status is relocated to fill the alignment hole this split exposes.
Bitfield justifications:
migrate_cap: written only in mlx5vf_cmd_set_migratable() at probe
chunk_mode: written only in mlx5vf_cmd_set_migratable() at probe
mig_state_cap: written only in mlx5vf_cmd_set_migratable() at probe
Dedicated storage units:
mdev_detach: written in the VF attach/detach event notifier
mlx5fv_vf_event() at runtime
log_active: written in mlx5vf_start_page_tracker()/
mlx5vf_stop_page_tracker() during runtime dirty tracking
deferred_reset: written in mlx5vf_state_mutex_unlock()/
mlx5vf_pci_aer_reset_done() during runtime reset handling
is_err: set by tracker error handling and dirty-log polling at runtime
object_changed: set by tracker event handling and cleared by dirty-log
polling at runtime
--- drivers/vfio/pci/mlx5/cmd.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/vfio/pci/mlx5/cmd.h +9 -6
@@ -157,25 +157,28 @@ struct mlx5_vhca_qp {struct mlx5_vhca_page_tracker {u32 id;u32 pdn; -u8 is_err:1 ; -u8 object_changed:1 ; +/* Flags modified at runtime - dedicated storage unit */ +u8 is_err; +u8 object_changed; +int status;struct mlx5_uars_page *uar;struct mlx5_vhca_cq cq;struct mlx5_vhca_qp *host_qp;struct mlx5_vhca_qp *fw_qp;struct mlx5_nb nb; -int status; };struct mlx5vf_pci_core_device {struct vfio_pci_core_device core_device;int vf_id;u16 vhca_id; +/* Flags only modified on setup/release - bitfield ok */ u8 migrate_cap:1 ; -u8 deferred_reset:1 ; -u8 mdev_detach:1 ; -u8 log_active:1 ;u8 chunk_mode:1 ; +/* Flags modified at runtime - dedicated storage unit */ +u8 mdev_detach; +u8 log_active; +u8 deferred_reset;struct completion tracker_comp;/* protect migration state */ struct mutex state_mutex;
Greg Kroah-Hartman
maintainerPATCH 1146/1276 PCI: altera: Fix resource leaks on probe failure
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mahesh Vaidya <[email protected]>
[ Upstream commit 7a94138caeb27f3c49c1dbd93bf422098925bb28 ]
The chained IRQ handler is set during probe, but is only removed during the driver remove(). If pci_host_probe() fails, the handler and INTx IRQ domain remain set even though the devm-managed host bridge storage containing struct altera_pcie will be released, leaving the handler with a stale data pointer.
Interrupts are also enabled before pci_host_probe() is called. If probe fails after that point, the controller interrupt source should be disabled before the chained handler and INTx domain are removed.
So set the chained handler only after the INTx domain has been created. Disable controller interrupts during IRQ teardown, and tear the IRQ setup down if pci_host_probe() fails.
--- drivers/pci/controller/pcie-altera.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-)
drivers/pci/controller/pcie-altera.c +26 -2
@@ -679,8 +679,18 @@ static int altera_pcie_init_irq_domain(sreturn 0 ; } +static void altera_pcie_disable_irq (struct altera_pcie *pcie) +{ +if (pcie->pcie_data->version ==ALTERA_PCIE_V1 || + pcie->pcie_data->version ==ALTERA_PCIE_V2 ) { +/* Disable all P2A interrupts */ +cra_writel (pcie,0 ,P2A_INT_ENABLE ); + } +} +static void altera_pcie_irq_teardown (struct altera_pcie *pcie) { +altera_pcie_disable_irq (pcie);irq_set_chained_handler_and_data (pcie->irq,NULL ,NULL );irq_domain_remove (pcie->irq_domain); }
@@ -705,7 +715,6 @@ static int altera_pcie_parse_dt(struct aif (pcie->irq <0 )return pcie->irq; -irq_set_chained_handler_and_data (pcie->irq, altera_pcie_isr, pcie);return 0 ; }
@@ -790,6 +799,12 @@ static int altera_pcie_probe(struct platreturn ret; } +/* +* The chained handler uses pcie->irq_domain, so set it only after the +* INTx domain has been created. +*/ +irq_set_chained_handler_and_data (pcie->irq, altera_pcie_isr, pcie); +/* clear all interrupts */ cra_writel (pcie,P2A_INT_STS_ALL ,P2A_INT_STATUS );/* enable all interrupts */
@@ -800,7 +815,16 @@ static int altera_pcie_probe(struct plat bridge->busnr = pcie->root_bus_nr; bridge->ops = &altera_pcie_ops; -return pci_host_probe (bridge); + ret =pci_host_probe (bridge); +if (ret) + goto err_teardown_irq; + +return 0 ; + +err_teardown_irq: +altera_pcie_irq_teardown (pcie); + +return ret; }static void altera_pcie_remove (struct platform_device *pdev)
Greg Kroah-Hartman
maintainerPATCH 1147/1276 PCI: controller: Use dev_fwnode() instead of of_fwnode_handle()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Jiri Slaby (SUSE)" <[email protected]>
[ Upstream commit a103d2dede5683dabbac2c3374bc24b6a9434478 ]
All irq_domain functions now accept fwnode instead of of_node. But many PCI controllers still extract dev to of_node and then of_node to fwnode.
Instead, clean this up and simply use the dev_fwnode() helper to extract fwnode directly from dev. Internally, it still does dev => of_node => fwnode steps, but it's now hidden from the users.
In the case of altera, this also removes an unused 'node' variable that is only used when CONFIG_OF is enabled:
drivers/pci/controller/pcie-altera.c: In function 'altera_pcie_init_irq_domain':
drivers/pci/controller/pcie-altera.c:855:29: error: unused variable 'node' [-Werror=unused-variable]
855 | struct device_node *node = dev->of_node;
Stable-dep-of: f865a57896bd ("PCI: mediatek: Fix IRQ domain leak when port fails to enable")
--- drivers/pci/controller/dwc/pcie-designware-host.c | 2 +- drivers/pci/controller/mobiveil/pcie-mobiveil-host.c | 8 +++----- drivers/pci/controller/pcie-altera-msi.c | 2 +- drivers/pci/controller/pcie-altera.c | 3 +-- drivers/pci/controller/pcie-mediatek-gen3.c | 4 ++-- drivers/pci/controller/pcie-mediatek.c | 2 +- drivers/pci/controller/pcie-xilinx-dma-pl.c | 2 +- drivers/pci/controller/pcie-xilinx-nwl.c | 2 +- drivers/pci/controller/plda/pcie-plda-host.c | 2 +- 9 files changed, 12 insertions(+), 15 deletions(-)
drivers/pci/controller/dwc/pcie-designware-host.c +1 -1
@@ -227,7 +227,7 @@ static const struct irq_domain_ops dw_pcint dw_pcie_allocate_domains (struct dw_pcie_rp *pp) {struct dw_pcie *pci =to_dw_pcie_from_pp (pp); -struct fwnode_handle *fwnode =of_node_to_fwnode (pci->dev->of_node); +struct fwnode_handle *fwnode =dev_fwnode (pci->dev); pp->irq_domain =irq_domain_create_linear (fwnode, pp->num_vectors, &dw_pcie_msi_domain_ops, pp);
drivers/pci/controller/mobiveil/pcie-mobiveil-host.c +3 -5
@@ -435,7 +435,7 @@ static const struct irq_domain_ops msi_dstatic int mobiveil_allocate_msi_domains (struct mobiveil_pcie *pcie) {struct device *dev = &pcie->pdev->dev; -struct fwnode_handle *fwnode =of_node_to_fwnode (dev->of_node); +struct fwnode_handle *fwnode =dev_fwnode (dev);struct mobiveil_msi *msi = &pcie->rp.msi;mutex_init (&msi->lock);
@@ -461,13 +461,11 @@ static int mobiveil_allocate_msi_domainsstatic int mobiveil_pcie_init_irq_domain (struct mobiveil_pcie *pcie) {struct device *dev = &pcie->pdev->dev; -struct device_node *node = dev->of_node;struct mobiveil_root_port *rp = &pcie->rp;/* setup INTx */ - rp->intx_domain =irq_domain_add_linear (node,PCI_NUM_INTX , - &intx_domain_ops, pcie); - + rp->intx_domain =irq_domain_create_linear (dev_fwnode (dev),PCI_NUM_INTX , &intx_domain_ops, + pcie);if (!rp->intx_domain) {dev_err (dev,"Failed to get a INTx IRQ domain\n" );return -ENOMEM ;
drivers/pci/controller/pcie-altera-msi.c +1 -1
@@ -164,7 +164,7 @@ static const struct irq_domain_ops msi_dstatic int altera_allocate_domains (struct altera_msi *msi) { -struct fwnode_handle *fwnode =of_node_to_fwnode (msi->pdev->dev.of_node); +struct fwnode_handle *fwnode =dev_fwnode (&msi->pdev->dev); msi->inner_domain =irq_domain_add_linear (NULL , msi->num_of_vectors, &msi_domain_ops, msi);
drivers/pci/controller/pcie-altera.c +1 -2
@@ -666,10 +666,9 @@ static void altera_pcie_isr(struct irq_dstatic int altera_pcie_init_irq_domain (struct altera_pcie *pcie) {struct device *dev = &pcie->pdev->dev; -struct device_node *node = dev->of_node;/* Setup INTx */ - pcie->irq_domain =irq_domain_add_linear (node,PCI_NUM_INTX , + pcie->irq_domain =irq_domain_create_linear (dev_fwnode (dev),PCI_NUM_INTX , &intx_domain_ops, pcie);if (!pcie->irq_domain) {dev_err (dev,"Failed to get a INTx IRQ domain\n" );
drivers/pci/controller/pcie-mediatek-gen3.c +2 -2
@@ -695,8 +695,8 @@ static int mtk_pcie_init_irq_domains(str/* Setup MSI */ mutex_init (&pcie->lock); - pcie->msi_bottom_domain =irq_domain_add_linear (node,PCIE_MSI_IRQS_NUM , - &mtk_msi_bottom_domain_ops, pcie); + pcie->msi_bottom_domain =irq_domain_create_linear (dev_fwnode (dev),PCIE_MSI_IRQS_NUM , + &mtk_msi_bottom_domain_ops, pcie);if (!pcie->msi_bottom_domain) {dev_err (dev,"failed to create MSI bottom domain\n" ); ret = -ENODEV ;
drivers/pci/controller/pcie-mediatek.c +1 -1
@@ -488,7 +488,7 @@ static struct msi_domain_info mtk_msi_dostatic int mtk_pcie_allocate_msi_domains (struct mtk_pcie_port *port) { -struct fwnode_handle *fwnode =of_node_to_fwnode (port->pcie->dev->of_node); +struct fwnode_handle *fwnode =dev_fwnode (port->pcie->dev);mutex_init (&port->lock);
drivers/pci/controller/pcie-xilinx-dma-pl.c +1 -1
@@ -470,7 +470,7 @@ static int xilinx_pl_dma_pcie_init_msi_istruct device *dev = port->dev;struct xilinx_msi *msi = &port->msi;int size =BITS_TO_LONGS (XILINX_NUM_MSI_IRQS ) *sizeof (long ); -struct fwnode_handle *fwnode =of_node_to_fwnode (port->dev->of_node); +struct fwnode_handle *fwnode =dev_fwnode (port->dev); msi->dev_domain =irq_domain_add_linear (NULL ,XILINX_NUM_MSI_IRQS , &dev_msi_domain_ops, port);
drivers/pci/controller/pcie-xilinx-nwl.c +1 -1
@@ -495,7 +495,7 @@ static int nwl_pcie_init_msi_irq_domain( {#ifdef CONFIG_PCI_MSI struct device *dev = pcie->dev; -struct fwnode_handle *fwnode =of_node_to_fwnode (dev->of_node); +struct fwnode_handle *fwnode =dev_fwnode (dev);struct nwl_msi *msi = &pcie->msi; msi->dev_domain = irq_domain_add_linear(NULL, INT_PCI_MSI_NR,
drivers/pci/controller/plda/pcie-plda-host.c +1 -1
@@ -150,7 +150,7 @@ static struct msi_domain_info plda_msi_dstatic int plda_allocate_msi_domains (struct plda_pcie_rp *port) {struct device *dev = port->dev; -struct fwnode_handle *fwnode =of_node_to_fwnode (dev->of_node); +struct fwnode_handle *fwnode =dev_fwnode (dev);struct plda_msi *msi = &port->msi;mutex_init (&port->msi.lock);
Greg Kroah-Hartman
maintainerPATCH 1148/1276 PCI: mediatek: Switch to msi_create_parent_irq_domain()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nam Cao <[email protected]>
[ Upstream commit e449cb9afc963cf9cf47139bb873c412605c83e7 ]
Switch to msi_create_parent_irq_domain() from pci_msi_create_irq_domain() which was using legacy MSI domain setup.
Stable-dep-of: f865a57896bd ("PCI: mediatek: Fix IRQ domain leak when port fails to enable")
--- drivers/pci/controller/Kconfig | 1 drivers/pci/controller/pcie-mediatek.c | 50 +++++++++++++++------------------ 2 files changed, 24 insertions(+), 27 deletions(-)
drivers/pci/controller/Kconfig +1 -0
@@ -190,6 +190,7 @@ config PCIE_MEDIATEK depends on ARCH_AIROHA || ARCH_MEDIATEK || COMPILE_TEST depends on OF depends on PCI_MSI + select IRQ_MSI_LIB help Say Y here if you want to enable PCIe controller support on MediaTek SoCs.
drivers/pci/controller/pcie-mediatek.c +23 -27
91 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 1149/1276 PCI: mediatek: Convert bool to single quirks entry and bitmap
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Marangi <[email protected]>
[ Upstream commit 04305367fab7ec9c98eeba315ad09c8b20abce93 ]
To clean Mediatek SoC PCIe struct, convert all the bool to a bitmap and use a single quirks to reference all the values. This permits cleaner addition of new quirk without having to define a new bool in the struct.
Stable-dep-of: f865a57896bd ("PCI: mediatek: Fix IRQ domain leak when port fails to enable")
--- drivers/pci/controller/pcie-mediatek.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-)
drivers/pci/controller/pcie-mediatek.c +20 -13
@@ -144,23 +144,31 @@struct mtk_pcie_port ;/** +* enum mtk_pcie_quirks - MTK PCIe quirks +* @MTK_PCIE_FIX_CLASS_ID: host's class ID needed to be fixed +* @MTK_PCIE_FIX_DEVICE_ID: host's device ID needed to be fixed +* @MTK_PCIE_NO_MSI: Bridge has no MSI support, and relies on an external block +*/ +enum mtk_pcie_quirks { +MTK_PCIE_FIX_CLASS_ID =BIT (0 ), +MTK_PCIE_FIX_DEVICE_ID =BIT (1 ), +MTK_PCIE_NO_MSI =BIT (2 ), +}; + +/** * struct mtk_pcie_soc - differentiate between host generations -* @need_fix_class_id: whether this host's class ID needed to be fixed or not -* @need_fix_device_id: whether this host's device ID needed to be fixed or not -* @no_msi: Bridge has no MSI support, and relies on an external block * @device_id: device ID which this host need to be fixed * @ops: pointer to configuration access functions * @startup: pointer to controller setting functions * @setup_irq: pointer to initialize IRQ functions +* @quirks: PCIe device quirks. */ struct mtk_pcie_soc { -bool need_fix_class_id; -bool need_fix_device_id; -bool no_msi;unsigned int device_id;struct pci_ops *ops;int (*startup)(struct mtk_pcie_port *port);int (*setup_irq)(struct mtk_pcie_port *port,struct device_node *node); +enum mtk_pcie_quirks quirks; };/**
@@ -708,7 +716,7 @@ static int mtk_pcie_startup_port_v2(struwritel (val, port->base +PCIE_RST_CTRL );/* Set up vendor ID and class code */ -if (soc->need_fix_class_id) { +if (soc->quirks &MTK_PCIE_FIX_CLASS_ID ) { val =PCI_VENDOR_ID_MEDIATEK ;writew (val, port->base +PCIE_CONF_VEND_ID );
@@ -716,7 +724,7 @@ static int mtk_pcie_startup_port_v2(struwritew (val, port->base +PCIE_CONF_CLASS_ID ); } -if (soc->need_fix_device_id) +if (soc->quirks &MTK_PCIE_FIX_DEVICE_ID )writew (soc->device_id, port->base +PCIE_CONF_DEVICE_ID );/* 100ms timeout value should be enough for Gen1/2 training */
@@ -1117,7 +1125,7 @@ static int mtk_pcie_probe(struct platfor host->ops = pcie->soc->ops; host->sysdata = pcie; - host->msi_domain = pcie->soc->no_msi; + host->msi_domain = !!(pcie->soc->quirks &MTK_PCIE_NO_MSI ); err =pci_host_probe (host);if (err)
@@ -1205,9 +1213,9 @@ static const struct dev_pm_ops mtk_pcie_ };static const struct mtk_pcie_soc mtk_pcie_soc_v1 = { - .no_msi = true, .ops = &mtk_pcie_ops, .startup = mtk_pcie_startup_port, + .quirks =MTK_PCIE_NO_MSI , };static const struct mtk_pcie_soc mtk_pcie_soc_mt2712 = {
@@ -1217,19 +1225,18 @@ static const struct mtk_pcie_soc mtk_pci };static const struct mtk_pcie_soc mtk_pcie_soc_mt7622 = { - .need_fix_class_id = true, .ops = &mtk_pcie_ops_v2, .startup = mtk_pcie_startup_port_v2, .setup_irq = mtk_pcie_setup_irq, + .quirks =MTK_PCIE_FIX_CLASS_ID , };static const struct mtk_pcie_soc mtk_pcie_soc_mt7629 = { - .need_fix_class_id = true, - .need_fix_device_id = true, .device_id =PCI_DEVICE_ID_MEDIATEK_7629 , .ops = &mtk_pcie_ops_v2, .startup = mtk_pcie_startup_port_v2, .setup_irq = mtk_pcie_setup_irq, + .quirks =MTK_PCIE_FIX_CLASS_ID |MTK_PCIE_FIX_DEVICE_ID , };static const struct of_device_id mtk_pcie_ids[] = {
Greg Kroah-Hartman
maintainerPATCH 1150/1276 PCI: mediatek: Use generic MACRO for TPVPERL delay
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Marangi <[email protected]>
[ Upstream commit 2d58bc777728bfc37aa35dce7b90e72296cceb9f ]
Use the generic PCI MACRO for TPVPERL delay to wait for clock and power stabilization after PERST# Signal instead of the raw value of 100 ms.
Stable-dep-of: f865a57896bd ("PCI: mediatek: Fix IRQ domain leak when port fails to enable")
--- drivers/pci/controller/pcie-mediatek.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/pci/controller/pcie-mediatek.c +1 -6
@@ -702,12 +702,7 @@ static int mtk_pcie_startup_port_v2(stru*/ writel (PCIE_LINKDOWN_RST_EN , port->base +PCIE_RST_CTRL ); -/* -* Described in PCIe CEM specification sections 2.2 (PERST# Signal) and -* 2.2.1 (Initial Power-Up (G3 to S0)). The deassertion of PERST# should -* be delayed 100ms (TPVPERL) for the power and clock to become stable. -*/ -msleep (100 ); +msleep (PCIE_T_PVPERL_MS );/* De-assert PHY, PE, PIPE, MAC and configuration reset */ val =readl (port->base +PCIE_RST_CTRL );
Greg Kroah-Hartman
maintainerPATCH 1151/1276 PCI: mediatek: Fix IRQ domain leak when port fails to enable
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Manivannan Sadhasivam <[email protected]>
[ Upstream commit f865a57896bd92d7662eb2818d8f48872e2cbbc7 ]
When mtk_pcie_enable_port() fails, mtk_pcie_port_free() removes the port from pcie->ports and frees the port structure. However, the IRQ domains set up earlier by mtk_pcie_init_irq_domain() are never freed.
Fix this by refactoring mtk_pcie_irq_teardown() into a per-port helper, mtk_pcie_irq_teardown_port(), and calling it from mtk_pcie_setup() when mtk_pcie_enable_port() fails. Since the IRQ teardown must only happen in the probe error path (during resume, child devices may have active MSI mappings and the NOIRQ context prohibits sleeping locks), mtk_pcie_enable_port() is changed to return an error code so callers can distinguish the two paths and act accordingly.
This issue was reported by Sashiko while reviewing the EcoNet EN7528 SoC support series.
--- drivers/pci/controller/pcie-mediatek.c | 75 +++++++++++++++++++++------------ 1 file changed, 48 insertions(+), 27 deletions(-)
drivers/pci/controller/pcie-mediatek.c +48 -27
@@ -13,7 +13,7 @@#include <linux/iopoll.h> #include <linux/irq.h> #include <linux/irqchip/chained_irq.h> -#include <linux/irqchip/irq-msi-lib.h> +#include "../../irqchip/irq-msi-lib.h" #include <linux/irqdomain.h> #include <linux/kernel.h> #include <linux/mfd/syscon.h>
@@ -491,7 +491,6 @@ static const struct msi_parent_ops mtk_m .required_flags = MTK_MSI_FLAGS_REQUIRED, .supported_flags = MTK_MSI_FLAGS_SUPPORTED, .bus_select_token = DOMAIN_BUS_PCI_MSI, - .chip_flags = MSI_CHIP_FLAG_SET_ACK, .prefix = "MTK-", .init_dev_msi_info = msi_lib_init_dev_msi_info, };
@@ -505,13 +504,18 @@ static int mtk_pcie_allocate_msi_domains .ops = &msi_domain_ops, .host_data = port, .size = MTK_MSI_IRQS_NUM, + .hwirq_max = MTK_MSI_IRQS_NUM, + .bus_token = DOMAIN_BUS_PCI_MSI, + .domain_flags = IRQ_DOMAIN_FLAG_MSI_PARENT, }; - port->inner_domain =msi_create_parent_irq_domain (&info, &mtk_msi_parent_ops); -if (!port->inner_domain) { + port->inner_domain =irq_domain_instantiate (&info); +if (IS_ERR (port->inner_domain)) {dev_err (port->pcie->dev,"failed to create IRQ domain\n" ); + port->inner_domain =NULL ;return -ENOMEM ; } + port->inner_domain->msi_parent_ops = &mtk_msi_parent_ops;return 0 ; }
@@ -530,23 +534,27 @@ static void mtk_pcie_enable_msi(struct mwritel (val, port->base +PCIE_INT_MASK ); } -static void mtk_pcie_irq_teardown (struct mtk_pcie *pcie) +static void mtk_pcie_irq_teardown_port (struct mtk_pcie_port *port) { -struct mtk_pcie_port *port, *tmp; +irq_set_chained_handler_and_data (port->irq,NULL ,NULL ); -list_for_each_entry_safe (port, tmp, &pcie->ports, list) { -irq_set_chained_handler_and_data (port->irq,NULL ,NULL ); +if (port->irq_domain) +irq_domain_remove (port->irq_domain); -if (port->irq_domain) -irq_domain_remove (port->irq_domain); +if (IS_ENABLED (CONFIG_PCI_MSI )) { +if (port->inner_domain) +irq_domain_remove (port->inner_domain); + } -if (IS_ENABLED (CONFIG_PCI_MSI )) { -if (port->inner_domain) -irq_domain_remove (port->inner_domain); - } +irq_dispose_mapping (port->irq); +} -irq_dispose_mapping (port->irq); - } +static void mtk_pcie_irq_teardown (struct mtk_pcie *pcie) +{ +struct mtk_pcie_port *port, *tmp; + +list_for_each_entry_safe (port, tmp, &pcie->ports, list) +mtk_pcie_irq_teardown_port (port); } static int mtk_pcie_intx_map(struct irq_domain *domain, unsigned int irq,
@@ -829,7 +837,7 @@ static int mtk_pcie_startup_port(structreturn 0 ; } -static void mtk_pcie_enable_port (struct mtk_pcie_port *port) +static int mtk_pcie_enable_port (struct mtk_pcie_port *port) {struct mtk_pcie *pcie = port->pcie;struct device *dev = pcie->dev;
@@ -838,7 +846,7 @@ static void mtk_pcie_enable_port(struct err =clk_prepare_enable (port->sys_ck);if (err) {dev_err (dev,"failed to enable sys_ck%d clock\n" , port->slot); - goto err_sys_clk; +return err; } err =clk_prepare_enable (port->ahb_ck);
@@ -886,11 +894,15 @@ static void mtk_pcie_enable_port(struct goto err_phy_on; } -if (!pcie->soc->startup (port)) -return ; + err = pcie->soc->startup (port); +if (err) { +dev_info (dev,"Port%d link down\n" , port->slot); + goto err_soc_startup; + } -dev_info (dev,"Port%d link down\n" , port->slot); +return 0 ; +err_soc_startup:phy_power_off (port->phy); err_phy_on:phy_exit (port->phy);
@@ -906,8 +918,8 @@ err_aux_clk:clk_disable_unprepare (port->ahb_ck); err_ahb_clk:clk_disable_unprepare (port->sys_ck); -err_sys_clk: -mtk_pcie_port_free (port); + +return err; } static int mtk_pcie_parse_port(struct mtk_pcie *pcie,
@@ -1083,8 +1095,13 @@ static int mtk_pcie_setup(struct mtk_pcireturn err;/* enable each port, and then check link status */ -list_for_each_entry_safe (port, tmp, &pcie->ports, list) -mtk_pcie_enable_port (port); +list_for_each_entry_safe (port, tmp, &pcie->ports, list) { + err =mtk_pcie_enable_port (port); +if (err) { +mtk_pcie_irq_teardown_port (port); +mtk_pcie_port_free (port); + } + }/* power down PCIe subsys if slots are all empty (link down) */ if (list_empty (&pcie->ports))
@@ -1186,14 +1203,18 @@ static int mtk_pcie_resume_noirq(struct {struct mtk_pcie *pcie =dev_get_drvdata (dev);struct mtk_pcie_port *port, *tmp; +int err;if (list_empty (&pcie->ports))return 0 ;clk_prepare_enable (pcie->free_ck); -list_for_each_entry_safe (port, tmp, &pcie->ports, list) -mtk_pcie_enable_port (port); +list_for_each_entry_safe (port, tmp, &pcie->ports, list) { + err =mtk_pcie_enable_port (port); +if (err) +mtk_pcie_port_free (port); + }/* In case of EP was removed while system suspend. */ if (list_empty (&pcie->ports))
Greg Kroah-Hartman
maintainerPATCH 1152/1276 PCI: Use pbus_select_window() during BAR resize
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit 7dc58aa7f1b32a215fb0b7c6ca30ddf4663dedf4 ]
Prior to a BAR resize, __resource_resize_store() loops through the normal resources of the PCI device and releases those that match to the flags of the BAR to be resized. This is necessary to allow resizing also the upstream bridge window as only childless bridge windows can be resized.
While the flags check (mostly) works (if corner cases are ignored), the more straightforward way is to check if the resources share the bridge window. Change __resource_resize_store() to do the check using pbus_select_window().
Stable-dep-of: ee7471fe968d ("PCI: Skip Resizable BAR restore on read error")
--- drivers/pci/pci-sysfs.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)
drivers/pci/pci-sysfs.c +13 -7
@@ -1426,13 +1426,19 @@ static ssize_t __resource_resize_store(s const char *buf, size_t count) {struct pci_dev *pdev =to_pci_dev (dev); -unsigned long size, flags; +struct pci_bus *bus = pdev->bus; +struct resource *b_win, *res; +unsigned long size;int ret, i;u16 cmd;if (kstrtoul (buf,0 , &size) <0 )return -EINVAL ; + b_win =pbus_select_window (bus,pci_resource_n (pdev, n)); +if (!b_win) +return -EINVAL ; +device_lock (dev);if (dev->driver ||pci_num_vf (pdev)) { ret = -EBUSY ;
@@ -1452,19 +1458,19 @@ static ssize_t __resource_resize_store(spci_write_config_word (pdev,PCI_COMMAND , cmd & ~PCI_COMMAND_MEMORY ); - flags =pci_resource_flags (pdev, n); -pci_remove_resource_files (pdev); -for (i =0 ; i <PCI_BRIDGE_RESOURCES ; i++) { -if (pci_resource_len (pdev, i) && -pci_resource_flags (pdev, i) == flags) +pci_dev_for_each_resource (pdev, res, i) { +if (i >=PCI_BRIDGE_RESOURCES ) +break ; + +if (b_win ==pbus_select_window (bus, res))pci_release_resource (pdev, i); } ret =pci_resize_resource (pdev, n, size); -pci_assign_unassigned_bus_resources (pdev->bus); +pci_assign_unassigned_bus_resources (bus);if (pci_create_resource_files (pdev))pci_warn (pdev,"Failed to recreate resource files after BAR resizing\n" );
Greg Kroah-Hartman
maintainerPATCH 1153/1276 PCI: Prevent resource tree corruption when BAR resize fails
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit 91c4c89db41499eea1b29c56655f79c3bae66e93 ]
pbus_reassign_bridge_resources() saves bridge windows into the saved list before attempting to adjust resource assignments to perform a BAR resize operation. If resource adjustments cannot be completed fully, rollback is attempted by restoring the resource from the saved list.
The rollback, however, does not check whether the resources it restores were assigned by the partial resize attempt. If restore changes addresses of the resource, it can result in corrupting the resource tree.
An example of a corrupted resource tree with overlapping addresses:
6200000000000-6203fbfffffff : pciex@620c3c0000000
6200000000000-6203fbff0ffff : PCI Bus 0030:01
6200020000000-62000207fffff : 0030:01:00.0
6200000000000-6203fbff0ffff : PCI Bus 0030:02A resource that are assigned into the resource tree must remain unchanged. Thus, release such a resource before attempting to restore and claim it back.
For simplicity, always do the release and claim back for the resource even in the cases where it is restored to the same address range.
Note: this fix may "break" some cases where devices "worked" because the resource tree corruption allowed address space double counting to fit more resource than what can now be assigned without double counting. The upcoming changes to BAR resizing should address those scenarios (to the extent possible).
Stable-dep-of: ee7471fe968d ("PCI: Skip Resizable BAR restore on read error")
--- drivers/pci/setup-bus.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/pci/setup-bus.c +5 -0
@@ -2388,6 +2388,11 @@ cleanup: bridge = dev_res->dev; i = res - bridge->resource; +if (res->parent) { +release_child_resources (res); +pci_release_resource (bridge, i); + } + res->start = dev_res->start; res->end = dev_res->end; res->flags = dev_res->flags;
Greg Kroah-Hartman
maintainerPATCH 1154/1276 PCI: Free saved list without holding pci_bus_sem
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit 1d8a0506f69895b7cfd9d5c4546761c508231a8a ]
Freeing the saved list does not require holding pci_bus_sem, so the critical section can be made shorter.
Stable-dep-of: ee7471fe968d ("PCI: Skip Resizable BAR restore on read error")
--- drivers/pci/setup-bus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/setup-bus.c +1 -1
@@ -2400,8 +2400,8 @@ cleanup:pci_claim_resource (bridge, i);pci_setup_bridge (bridge->subordinate); } -free_list (&saved);up_read (&pci_bus_sem); +free_list (&saved);return ret; }
Greg Kroah-Hartman
maintainerPATCH 1155/1276 PCI: Fix restoring BARs on BAR resize rollback path
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit 337b1b566db087347194e4543ddfdfa5645275cc ]
BAR resize operation is implemented in the pci_resize_resource() and pbus_reassign_bridge_resources() functions. pci_resize_resource() can be called either from __resource_resize_store() from sysfs or directly by the driver for the Endpoint Device.
The pci_resize_resource() requires that caller has released the device resources that share the bridge window with the BAR to be resized as otherwise the bridge window is pinned in place and cannot be changed.
pbus_reassign_bridge_resources() rolls back resources if the resize operation fails, but rollback is performed only for the bridge windows. Because releasing the device resources are done by the caller of the BAR resize interface, these functions performing the BAR resize do not have access to the device resources as they were before the resize.
pbus_reassign_bridge_resources() could try __pci_bridge_assign_resources() after rolling back the bridge windows as they were, however, it will not guarantee the resource are assigned due to differences in how FW and the kernel assign the resources (alignment of the start address and tail).
To perform rollback robustly, the BAR resize interface has to be altered to also release the device resources that share the bridge window with the BAR to be resized.
Also, remove restoring from the entries failed list as saved list should now contain both the bridge windows and device resources so the extra restore is duplicated work.
Some drivers (currently only amdgpu) want to prevent releasing some resources. Add exclude_bars param to pci_resize_resource() and make amdgpu pass its register BAR (BAR 2 or 5), which should never be released during resize operation. Normally 64-bit prefetchable resources do not share a bridge window with the 32-bit only register BAR, but there are various fallbacks in the resource assignment logic which may make the resources share the bridge window in rare cases.
This change (together with the driver side changes) is to counter the resource releases that had to be done to prevent resource tree corruption in the ("PCI: Release assigned resource before restoring them") change. As such, it likely restores functionality in cases where device resources were released to avoid resource tree conflicts which appeared to be "working" when such conflicts were not correctly detected by the kernel.
[bhelgaas: squash amdgpu BAR selection from
https: //lore.kernel.org/r/[email protected]]
Stable-dep-of: ee7471fe968d ("PCI: Skip Resizable BAR restore on read error")
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 - drivers/gpu/drm/i915/gt/intel_region_lmem.c | 2 drivers/gpu/drm/xe/xe_vram.c | 2 drivers/pci/pci-sysfs.c | 17 ---- drivers/pci/pci.h | 3 drivers/pci/setup-bus.c | 101 +++++++++++++++++++--------- drivers/pci/setup-res.c | 19 +---- include/linux/pci.h | 4 - 8 files changed, 87 insertions(+), 65 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3 -1
@@ -1611,7 +1611,9 @@ int amdgpu_device_resize_fb_bar(struct apci_release_resource (adev->pdev,0 ); - r =pci_resize_resource (adev->pdev,0 , rbar_size); + r =pci_resize_resource (adev->pdev,0 , rbar_size, + (adev->asic_type >=CHIP_BONAIRE ) ?1 <<5 + :1 <<2 );if (r == -ENOSPC )DRM_INFO ("Not enough PCI address space for a large BAR." );else if (r && r != -ENOTSUPP )
drivers/gpu/drm/i915/gt/intel_region_lmem.c +1 -1
@@ -37,7 +37,7 @@ _resize_bar(struct drm_i915_private *i91_release_bars (pdev); - ret =pci_resize_resource (pdev, resno, bar_size); + ret =pci_resize_resource (pdev, resno, bar_size,0 );if (ret) {drm_info (&i915->drm,"Failed to resize BAR%d to %dM (%pe)\n" , resno,1 << bar_size,ERR_PTR (ret));
drivers/gpu/drm/xe/xe_vram.c +1 -1
@@ -33,7 +33,7 @@ _resize_bar(struct xe_device *xe, int reif (pci_resource_len (pdev, resno))pci_release_resource (pdev, resno); - ret =pci_resize_resource (pdev, resno, bar_size); + ret =pci_resize_resource (pdev, resno, bar_size,0 );if (ret) {drm_info (&xe->drm,"Failed to resize BAR%d to %dM (%pe). Consider enabling 'Resizable BAR' support in your BIOS\n" , resno,1 << bar_size,ERR_PTR (ret));
drivers/pci/pci-sysfs.c +2 -15
@@ -1427,18 +1427,13 @@ static ssize_t __resource_resize_store(s {struct pci_dev *pdev =to_pci_dev (dev);struct pci_bus *bus = pdev->bus; -struct resource *b_win, *res;unsigned long size; -int ret, i; +int ret;u16 cmd;if (kstrtoul (buf,0 , &size) <0 )return -EINVAL ; - b_win =pbus_select_window (bus,pci_resource_n (pdev, n)); -if (!b_win) -return -EINVAL ; -device_lock (dev);if (dev->driver ||pci_num_vf (pdev)) { ret = -EBUSY ;
@@ -1460,15 +1455,7 @@ static ssize_t __resource_resize_store(spci_remove_resource_files (pdev); -pci_dev_for_each_resource (pdev, res, i) { -if (i >=PCI_BRIDGE_RESOURCES ) -break ; - -if (b_win ==pbus_select_window (bus, res)) -pci_release_resource (pdev, i); - } - - ret =pci_resize_resource (pdev, n, size); + ret =pci_resize_resource (pdev, n, size,0 );pci_assign_unassigned_bus_resources (bus);
drivers/pci/pci.h +3 -0
@@ -330,6 +330,9 @@ enum pci_bar_type {struct device *pci_get_host_bridge_device (struct pci_dev *dev);void pci_put_host_bridge_device (struct device *dev); +int pci_do_resource_release_and_resize (struct pci_dev *dev,int resno,int size, +int exclude_bars); +int pci_configure_extended_tags (struct pci_dev *dev,void *ign);bool pci_bus_read_dev_vendor_id (struct pci_bus *bus,int devfn,u32 *pl,int rrs_timeout);
drivers/pci/setup-bus.c +70 -31
164 lines not on this page · raw message
drivers/pci/setup-res.c +5 -14
@@ -429,9 +429,9 @@ void pci_release_resource(struct pci_dev }EXPORT_SYMBOL (pci_release_resource); -int pci_resize_resource (struct pci_dev *dev,int resno,int size) +int pci_resize_resource (struct pci_dev *dev,int resno,int size, +int exclude_bars) { -struct resource *res = dev->resource + resno;struct pci_host_bridge *host;int old, ret;u32 sizes;
@@ -442,10 +442,6 @@ int pci_resize_resource(struct pci_dev *if (host->preserve_config)return -ENOTSUPP ; -/* Make sure the resource isn't assigned before resizing it. */ -if (!(res->flags &IORESOURCE_UNSET )) -return -EBUSY ; -pci_read_config_word (dev,PCI_COMMAND , &cmd);if (cmd &PCI_COMMAND_MEMORY )return -EBUSY ;
@@ -465,19 +461,14 @@ int pci_resize_resource(struct pci_dev *if (ret)return ret; - res->end = res->start +pci_rebar_size_to_bytes (size) -1 ; + ret =pci_do_resource_release_and_resize (dev, resno, size, exclude_bars); +if (ret) + goto error_resize; -/* Check if the new config works by trying to assign everything. */ -if (dev->bus->self) { - ret =pci_reassign_bridge_resources (dev->bus->self, res->flags); -if (ret) - goto error_resize; - }return 0 ; error_resize:pci_rebar_set_size (dev, resno, old); - res->end = res->start +pci_rebar_size_to_bytes (old) -1 ;return ret; }EXPORT_SYMBOL (pci_resize_resource);
include/linux/pci.h +2 -2
@@ -1418,7 +1418,8 @@ static inline int pci_rebar_bytes_to_siz }u32 pci_rebar_get_possible_sizes (struct pci_dev *pdev,int bar); -int __must_check pci_resize_resource (struct pci_dev *dev,int i,int size); +int __must_check pci_resize_resource (struct pci_dev *dev,int i,int size, +int exclude_bars);int pci_select_bars (struct pci_dev *dev,unsigned long flags);bool pci_device_is_present (struct pci_dev *pdev);void pci_ignore_hotplug (struct pci_dev *dev);
@@ -1488,7 +1489,6 @@ void pci_assign_unassigned_resources(voivoid pci_assign_unassigned_bridge_resources (struct pci_dev *bridge);void pci_assign_unassigned_bus_resources (struct pci_bus *bus);void pci_assign_unassigned_root_bus_resources (struct pci_bus *bus); -int pci_reassign_bridge_resources (struct pci_dev *bridge,unsigned long type);int pci_enable_resources (struct pci_dev *,int mask);void pci_assign_irq (struct pci_dev *dev);struct resource *pci_find_resource (struct pci_dev *dev,struct resource *res);
Re: [PATCH 6.12 1155/1276] PCI: Fix restoring BARs on BAR resize rollback path
Hi Greg/Sasha,
Quoted 257 lines · Greg Kroah-Hartman
6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit
337b1b566db087347194e4543ddfdfa5645275cc]BAR resize operation is implemented in the
pci_resize_resource()andpbus_reassign_bridge_resources()functions.pci_resize_resource()can be called either from__resource_resize_store()from sysfs or directly by the driver for the Endpoint Device.The
pci_resize_resource()requires that caller has released the device resources that share the bridge window with the BAR to be resized as otherwise the bridge window is pinned in place and cannot be changed.
pbus_reassign_bridge_resources()rolls back resources if the resize operation fails, but rollback is performed only for the bridge windows. Because releasing the device resources are done by the caller of the BAR resize interface, these functions performing the BAR resize do not have access to the device resources as they were before the resize.
pbus_reassign_bridge_resources()could try__pci_bridge_assign_resources()after rolling back the bridge windows as they were, however, it will not guarantee the resource are assigned due to differences in how FW and the kernel assign the resources (alignment of the start address and tail).To perform rollback robustly, the BAR resize interface has to be altered to also release the device resources that share the bridge window with the BAR to be resized.
Also, remove restoring from the entries failed list as saved list should now contain both the bridge windows and device resources so the extra restore is duplicated work.
Some drivers (currently only amdgpu) want to prevent releasing some resources. Add
exclude_barsparam topci_resize_resource()and make amdgpu pass its register BAR (BAR 2 or 5), which should never be released during resize operation. Normally 64-bit prefetchable resources do not share a bridge window with the 32-bit only register BAR, but there are various fallbacks in the resource assignment logic which may make the resources share the bridge window in rare cases.This change (together with the driver side changes) is to counter the resource releases that had to be done to prevent resource tree corruption in the ("PCI: Release assigned resource before restoring them") change. As such, it likely restores functionality in cases where device resources were released to avoid resource tree conflicts which appeared to be "working" when such conflicts were not correctly detected by the kernel.
Reported-by Simon Richter <[email protected]>Reported-by Alex Bennée <[email protected]>Signed-off-by Ilpo Järvinen <[email protected]>[bhelgaas: squash amdgpu BAR selection from
https: //lore.kernel.org/r/[email protected]]Signed-off-by Bjorn Helgaas <[email protected]>Reviewed-by Christian König <[email protected]>Stable-dep-of:
ee7471fe968d("PCI: Skip Resizable BAR restore on read error")Signed-off-by Sasha Levin <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 - drivers/gpu/drm/i915/gt/intel_region_lmem.c | 2 drivers/gpu/drm/xe/xe_vram.c | 2 drivers/pci/pci-sysfs.c | 17 ---- drivers/pci/pci.h | 3 drivers/pci/setup-bus.c | 101 +++++++++++++++++++--------- drivers/pci/setup-res.c | 19 +---- include/linux/pci.h | 4 - 8 files changed, 87 insertions(+), 65 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3
-1@@ -1611,7 +1611,9 @@ int amdgpu_device_resize_fb_bar(struct apci_release_resource (adev->pdev,0 ); - r =pci_resize_resource (adev->pdev,0 , rbar_size); + r =pci_resize_resource (adev->pdev,0 , rbar_size, + (adev->asic_type >=CHIP_BONAIRE ) ?1 <<5 + :1 <<2 );if (r == -ENOSPC )DRM_INFO ("Not enough PCI address space for a large BAR." );else if (r && r != -ENOTSUPP )drivers/gpu/drm/i915/gt/intel_region_lmem.c +1
-1@@ -37,7 +37,7 @@ _resize_bar(struct drm_i915_private *i91_release_bars (pdev); - ret =pci_resize_resource (pdev, resno, bar_size); + ret =pci_resize_resource (pdev, resno, bar_size,0 );if (ret) {drm_info (&i915->drm,"Failed to resize BAR%d to %dM (%pe)\n" , resno,1 << bar_size,ERR_PTR (ret));drivers/gpu/drm/xe/xe_vram.c +1
-1@@ -33,7 +33,7 @@ _resize_bar(struct xe_device *xe, int reif (pci_resource_len (pdev, resno))pci_release_resource (pdev, resno); - ret =pci_resize_resource (pdev, resno, bar_size); + ret =pci_resize_resource (pdev, resno, bar_size,0 );if (ret) {drm_info (&xe->drm,"Failed to resize BAR%d to %dM (%pe). Consider enabling 'Resizable BAR' support in your BIOS\n" , resno,1 << bar_size,ERR_PTR (ret));drivers/pci/pci-sysfs.c +2
-15@@ -1427,18 +1427,13 @@ static ssize_t __resource_resize_store(s {struct pci_dev *pdev =to_pci_dev (dev);struct pci_bus *bus = pdev->bus; -struct resource *b_win, *res;unsigned long size; -int ret, i; +int ret;u16 cmd;if (kstrtoul (buf,0 , &size) <0 )return -EINVAL ; - b_win =pbus_select_window (bus,pci_resource_n (pdev, n)); -if (!b_win) -return -EINVAL ; -device_lock (dev);if (dev->driver ||pci_num_vf (pdev)) { ret = -EBUSY ;@@ -1460,15 +1455,7 @@ static ssize_t __resource_resize_store(spci_remove_resource_files (pdev); -pci_dev_for_each_resource (pdev, res, i) { -if (i >=PCI_BRIDGE_RESOURCES ) -break ; - -if (b_win ==pbus_select_window (bus, res)) -pci_release_resource (pdev, i); - } - - ret =pci_resize_resource (pdev, n, size); + ret =pci_resize_resource (pdev, n, size,0 );pci_assign_unassigned_bus_resources (bus);drivers/pci/pci.h +3
-0@@ -330,6 +330,9 @@ enum pci_bar_type {struct device *pci_get_host_bridge_device (struct pci_dev *dev);void pci_put_host_bridge_device (struct device *dev); +int pci_do_resource_release_and_resize (struct pci_dev *dev,int resno,int size, +int exclude_bars); +int pci_configure_extended_tags (struct pci_dev *dev,void *ign);bool pci_bus_read_dev_vendor_id (struct pci_bus *bus,int devfn,u32 *pl,int rrs_timeout);drivers/pci/setup-bus.c +25
-21@@ -2297,18 +2297,16 @@ enable_all: }EXPORT_SYMBOL_GPL (pci_assign_unassigned_bridge_resources); -int pci_reassign_bridge_resources (struct pci_dev *bridge,unsigned long type) +static int pci_reassign_bridge_resources (struct pci_dev *bridge,unsigned long type, +struct list_head *saved) {struct pci_dev_resource *dev_res;struct pci_dev *next; -LIST_HEAD (saved);LIST_HEAD (added);LIST_HEAD (failed);unsigned int i;int ret; -down_read (&pci_bus_sem); -/* Walk to the root hub, releasing bridge BARs when possible */ next = bridge; do {@@ -2325,9 +2323,9 @@ int pci_reassign_bridge_resources(structif (res->child)continue ; - ret =add_to_list (&saved, bridge, res,0 ,0 ); + ret =add_to_list (saved, bridge, res,0 ,0 );if (ret) - goto cleanup; +return ret;pci_info (bridge,"%s %pR: releasing\n" , res_name, res);@@ -2343,67 +2341,108 @@ int pci_reassign_bridge_resources(struct next = bridge->bus ? bridge->bus->self :NULL ; }while (next); -if (list_empty (&saved)) { -up_read (&pci_bus_sem); +if (list_empty (saved))return -ENOENT ; - }__pci_bus_size_bridges (bridge->subordinate, &added);__pci_bridge_assign_resources (bridge, &added, &failed);BUG_ON (!list_empty (&added));if (!list_empty (&failed)) { - ret = -ENOSPC ; - goto cleanup; +free_list (&failed); +return -ENOSPC ; } -list_for_each_entry (dev_res, &saved, list) { +list_for_each_entry (dev_res, saved, list) {/* Skip the bridge we just assigned resources for */ if (bridge == dev_res->dev)continue ; +if (!dev_res->dev->subordinate) +continue ; + bridge = dev_res->dev;pci_setup_bridge (bridge->subordinate); } -free_list (&saved); -up_read (&pci_bus_sem);return 0 ; +} -cleanup: -/* Restore size and flags */ -list_for_each_entry (dev_res, &failed, list) { -struct resource *res = dev_res->res; +int pci_do_resource_release_and_resize (struct pci_dev *pdev,int resno,int size, +int exclude_bars) +{ +struct resource *res = pdev->resource + resno; +unsigned long flags = res->flags; +struct pci_dev_resource *dev_res; +struct pci_bus *bus = pdev->bus; +struct resource *r; +LIST_HEAD (saved); +unsigned int i; +int ret =0 ; - res->start = dev_res->start; - res->end = dev_res->end; - res->flags = dev_res->flags; +down_read (&pci_bus_sem); +
drivers/pci/setup-bus.c int pci_reassign_bridge_resources(struct · line 2394
Quoted 10 lines
drivers/pci/setup-bus.c +10
-0+pci_dev_for_each_resource (pdev, r, i) { +if (i >=PCI_BRIDGE_RESOURCES ) +break ; + +if (exclude_bars &BIT (i)) +continue ; + +if (!pci_resource_len (pdev, i) || r->flags != flags) +continue ; +
^^ observe this:
I ran an AI-assisted backport review and verified one issue with afc90d2fc3b8 ("PCI: Fix restoring BARs on BAR resize rollback path").
In 6.12.y, pci_do_resource_release_and_resize() releases sibling BARs only when their resource flags exactly match the resized BAR:
if (!pci_resource_len(pdev, i) || r->flags != flags) continue;
Upstream 337b1b566db0 instead selects resources by the actual bridge window:
b_win = pbus_select_window(bus, res); ... if (b_win != pbus_select_window(bus, r)) continue;
Those are not equivalent. I think this backport is incomplete without pbus_select_window() semantics, or an equivalent branch-specific adaptation. Upstream gets that via 74afce3dfcba ("PCI: Add bridge window selection functions").
Without an equivalent fix, I think this backport should be dropped.
Thoughts ?
Thanks,
Harshit
Quoted 135 lines
drivers/pci/setup-bus.c +35
-10+ ret =add_to_list (&saved, pdev, r,0 ,0 ); +if (ret) + goto restore; +pci_release_resource (pdev, i); } -free_list (&failed); + res->end = res->start +pci_rebar_size_to_bytes (size) -1 ; + +if (!bus->self) + goto out; + + ret =pci_reassign_bridge_resources (bus->self, res->flags, &saved); +if (ret) + goto restore; + +out: +up_read (&pci_bus_sem); +free_list (&saved); +return ret; + +restore:/* Revert to the old configuration */ list_for_each_entry (dev_res, &saved, list) {struct resource *res = dev_res->res; +struct pci_dev *dev = dev_res->dev; - bridge = dev_res->dev; - i = res - bridge->resource; + i = res - dev->resource;if (res->parent) {release_child_resources (res); -pci_release_resource (bridge, i); +pci_release_resource (dev, i); } res->start = dev_res->start; res->end = dev_res->end; res->flags = dev_res->flags; -pci_claim_resource (bridge, i); -pci_setup_bridge (bridge->subordinate); - } -up_read (&pci_bus_sem); -free_list (&saved); +if (pci_claim_resource (dev, i)) +continue ; -return ret; +if (i <PCI_BRIDGE_RESOURCES ) { +const char *res_name =pci_resource_name (dev, i); + +pci_update_resource (dev, i); +pci_info (dev,"%s %pR: old value restored\n" , + res_name, res); + } +if (dev->subordinate) +pci_setup_bridge (dev->subordinate); + } + goto out; }void pci_assign_unassigned_bus_resources (struct pci_bus *bus)drivers/pci/setup-res.c +5
-14@@ -429,9 +429,9 @@ void pci_release_resource(struct pci_dev }EXPORT_SYMBOL (pci_release_resource); -int pci_resize_resource (struct pci_dev *dev,int resno,int size) +int pci_resize_resource (struct pci_dev *dev,int resno,int size, +int exclude_bars) { -struct resource *res = dev->resource + resno;struct pci_host_bridge *host;int old, ret;u32 sizes;@@ -442,10 +442,6 @@ int pci_resize_resource(struct pci_dev *if (host->preserve_config)return -ENOTSUPP ; -/* Make sure the resource isn't assigned before resizing it. */ -if (!(res->flags &IORESOURCE_UNSET )) -return -EBUSY ; -pci_read_config_word (dev,PCI_COMMAND , &cmd);if (cmd &PCI_COMMAND_MEMORY )return -EBUSY ;@@ -465,19 +461,14 @@ int pci_resize_resource(struct pci_dev *if (ret)return ret; - res->end = res->start +pci_rebar_size_to_bytes (size) -1 ; + ret =pci_do_resource_release_and_resize (dev, resno, size, exclude_bars); +if (ret) + goto error_resize; -/* Check if the new config works by trying to assign everything. */ -if (dev->bus->self) { - ret =pci_reassign_bridge_resources (dev->bus->self, res->flags); -if (ret) - goto error_resize; - }return 0 ; error_resize:pci_rebar_set_size (dev, resno, old); - res->end = res->start +pci_rebar_size_to_bytes (old) -1 ;return ret; }EXPORT_SYMBOL (pci_resize_resource);include/linux/pci.h +2
-2@@ -1418,7 +1418,8 @@ static inline int pci_rebar_bytes_to_siz }u32 pci_rebar_get_possible_sizes (struct pci_dev *pdev,int bar); -int __must_check pci_resize_resource (struct pci_dev *dev,int i,int size); +int __must_check pci_resize_resource (struct pci_dev *dev,int i,int size, +int exclude_bars);int pci_select_bars (struct pci_dev *dev,unsigned long flags);bool pci_device_is_present (struct pci_dev *pdev);void pci_ignore_hotplug (struct pci_dev *dev);@@ -1488,7 +1489,6 @@ void pci_assign_unassigned_resources(voivoid pci_assign_unassigned_bridge_resources (struct pci_dev *bridge);void pci_assign_unassigned_bus_resources (struct pci_bus *bus);void pci_assign_unassigned_root_bus_resources (struct pci_bus *bus); -int pci_reassign_bridge_resources (struct pci_dev *bridge,unsigned long type);int pci_enable_resources (struct pci_dev *,int mask);void pci_assign_irq (struct pci_dev *dev);struct resource *pci_find_resource (struct pci_dev *dev,struct resource *res);
Sasha Levin
maintainerRe: [PATCH 6.12 1155/1276] PCI: Fix restoring BARs on BAR resize rollback path
Quoted 4 lines
Those are not equivalent. I think this backport is incomplete without
pbus_select_window()semantics, or an equivalent branch-specific adaptation. [...]
Without an equivalent fix, I think this backport should be dropped.
You're correct that pbus_select_window() (74afce3dfcba) isn't in 6.12 and older, so the backport uses an "r->flags != flags" sibling check instead of the window comparison. But that adaptation is strictly more
conservative: identical-flag BARs always map to the same bridge window, so it never over-releases and can't corrupt state. The only shortfall versus upstream is that in a rare mixed-window fallback config a resize may fail (return an error) instead of succeeding - exactly the corner case the commit message calls out - and the common amdgpu ReBAR path is equivalent either way. Given that, I'd rather keep the backport than drop the whole rebar refactor chain it sits under. Thanks for the review.
Signature · 2 lines
Thanks, Sasha
Re: [PATCH 6.12 1155/1276] PCI: Fix restoring BARs on BAR resize rollback path
Hi Sasha,
Quoted 5 lines · Sasha Levin
Quoted 4 lines
Those are not equivalent. I think this backport is incomplete without
pbus_select_window()semantics, or an equivalent branch-specific adaptation. [...]
Without an equivalent fix, I think this backport should be dropped.
Quoted 11 lines
You're correct that
pbus_select_window()(74afce3dfcba) isn't in 6.12 and older, so the backport uses an "r->flags!= flags" sibling check instead of the window comparison. But that adaptation is strictly more
conservative: identical-flag BARs always map to the same bridge window, so it never over-releases and can't corrupt state. The only shortfall versus upstream is that in a rare mixed-window fallback config a resize may fail (return an error) instead of succeeding - exactly the corner case the commit message calls out - and the common amdgpu ReBAR path is equivalent either way. Given that, I'd rather keep the backport than drop the whole rebar refactor chain it sits under. Thanks for the review.
Alright, lets see if we run into this corner case then :)
thanks,
Harshit
Greg Kroah-Hartman
maintainerPATCH 1156/1276 PCI: Move Resizable BAR code to rebar.c
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit 9f71938cd77f32a448f40a288e409eca60e55486 ]
For lack of a better place to put it, Resizable BAR code has been placed inside pci.c and setup-res.c that do not use it for anything. Upcoming changes are going to add more Resizable BAR related functions, increasing the code size.
As pci.c is huge as is, move the Resizable BAR related code and the BAR resize code from setup-res.c to rebar.c.
Stable-dep-of: ee7471fe968d ("PCI: Skip Resizable BAR restore on read error")
--- Documentation/driver-api/pci/pci.rst | 3 drivers/pci/Makefile | 2 drivers/pci/pci.c | 134 ------------------------ drivers/pci/pci.h | 1 drivers/pci/rebar.c | 191 +++++++++++++++++++++++++++++++++++ drivers/pci/setup-res.c | 44 -------- 6 files changed, 196 insertions(+), 179 deletions(-) create mode 100644 drivers/pci/rebar.c
Documentation/driver-api/pci/pci.rst +3 -0
@@ -37,6 +37,9 @@ PCI Support Library .. kernel-doc:: drivers/pci/slot.c :export: +.. kernel-doc:: drivers/pci/rebar.c + :export: + .. kernel-doc:: drivers/pci/rom.c :export:
drivers/pci/Makefile +1 -1
@@ -4,7 +4,7 @@ obj-$(CONFIG_PCI) += access.o bus.o probe.o host-bridge.o \ remove.o pci.o pci-driver.o search.o \ - rom.o setup-res.o irq.o vpd.o \ + rebar.o rom.o setup-res.o irq.o vpd.o \ setup-bus.o vc.o mmap.o devres.o obj-$(CONFIG_PCI) += msi/
drivers/pci/pci.c +0 -134
146 lines not on this page · raw message
drivers/pci/pci.h +1 -0
@@ -751,6 +751,7 @@ static inline int acpi_get_rc_resources( }#endif +void pci_restore_rebar_state (struct pci_dev *pdev);int pci_rebar_get_current_size (struct pci_dev *pdev,int bar);int pci_rebar_set_size (struct pci_dev *pdev,int bar,int size);static inline u64 pci_rebar_size_to_bytes (int size)
drivers/pci/rebar.c new file +191 -0
191 lines not on this page · raw message
drivers/pci/setup-res.c +0 -44
50 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 1157/1276 PCI: Skip Resizable BAR restore on read error
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marco Nenciarini <[email protected]>
[ Upstream commit ee7471fe968d210939be9046089a924cd23c8c3b ]
pci_restore_rebar_state() uses the Resizable BAR Control register to decide how many BARs to restore (nbars) and which BAR each iteration addresses (bar_idx).
When a device does not respond, config reads typically return PCI_ERROR_RESPONSE (~0). Both fields are 3 bits wide, so nbars and bar_idx both evaluate to 7, past the spec's valid ranges for both fields. pci_resource_n() then returns an unrelated resource slot, whose size is used to derive a nonsensical value written back to the Resizable BAR Control register.
Bail out if any Resizable BAR Control read returns PCI_ERROR_RESPONSE. No further BARs are touched, which is safe because a config read that returns PCI_ERROR_RESPONSE indicates the device is unreachable and restoration is pointless.
--- drivers/pci/rebar.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/pci/rebar.c +6 -0
@@ -130,6 +130,9 @@ void pci_restore_rebar_state(struct pci_return ;pci_read_config_dword (pdev, pos +PCI_REBAR_CTRL , &ctrl); +if (PCI_POSSIBLE_ERROR (ctrl)) +return ; + nbars =FIELD_GET (PCI_REBAR_CTRL_NBAR_MASK , ctrl);for (i =0 ; i < nbars; i++, pos +=8 ) {
@@ -137,6 +140,9 @@ void pci_restore_rebar_state(struct pci_int bar_idx, size;pci_read_config_dword (pdev, pos +PCI_REBAR_CTRL , &ctrl); +if (PCI_POSSIBLE_ERROR (ctrl)) +return ; + bar_idx = ctrl &PCI_REBAR_CTRL_BAR_IDX ; res =pci_resource_n (pdev, bar_idx); size =pci_rebar_bytes_to_size (resource_size (res));
Greg Kroah-Hartman
maintainerPATCH 1158/1276 staging: rtl8723bs: core: move constants to right side in comparison
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: William Hansen-Baird <[email protected]>
[ Upstream commit cf0f2680c30d4b438a5e84b73dc70be405936b54 ]
Move constants to right side in if-statement conditions.
Stable-dep-of: 1463ca3ec660 ("staging: rtl8723bs: fix OOB reads in rtw_get_sec_ie(), rtw_get_wapi_ie(), and rtw_get_wps_attr()")
--- drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 4 ++-- drivers/staging/rtl8723bs/core/rtw_security.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ieee80211.c +2 -2
@@ -1013,7 +1013,7 @@ static int rtw_get_cipher_info(struct wl pbuf =rtw_get_wpa_ie (&pnetwork->network.ies[12 ], &wpa_ielen, pnetwork->network.ie_length-12 );if (pbuf && (wpa_ielen >0 )) { -if (_SUCCESS ==rtw_parse_wpa_ie (pbuf, wpa_ielen+2 , &group_cipher, &pairwise_cipher, &is8021x)) { +if (rtw_parse_wpa_ie (pbuf, wpa_ielen+2 , &group_cipher, &pairwise_cipher, &is8021x) == _SUCCESS) { pnetwork->bcn_info.pairwise_cipher = pairwise_cipher; pnetwork->bcn_info.group_cipher = group_cipher; pnetwork->bcn_info.is_8021x = is8021x;
@@ -1023,7 +1023,7 @@ static int rtw_get_cipher_info(struct wl pbuf =rtw_get_wpa2_ie (&pnetwork->network.ies[12 ], &wpa_ielen, pnetwork->network.ie_length-12 );if (pbuf && (wpa_ielen >0 )) { -if (_SUCCESS ==rtw_parse_wpa2_ie (pbuf, wpa_ielen+2 , &group_cipher, &pairwise_cipher, &is8021x)) { +if (rtw_parse_wpa2_ie (pbuf, wpa_ielen+2 , &group_cipher, &pairwise_cipher, &is8021x) == _SUCCESS) { pnetwork->bcn_info.pairwise_cipher = pairwise_cipher; pnetwork->bcn_info.group_cipher = group_cipher; pnetwork->bcn_info.is_8021x = is8021x;
drivers/staging/rtl8723bs/core/rtw_security.c +1 -1
@@ -1537,7 +1537,7 @@ void rtw_sec_restore_wep_key(struct adapstruct security_priv *securitypriv = &(adapter->securitypriv);signed int keyid; -if ((_WEP40_ == securitypriv->dot11PrivacyAlgrthm) || (_WEP104_ == securitypriv->dot11PrivacyAlgrthm)) { +if ((securitypriv->dot11PrivacyAlgrthm == _WEP40_) || (securitypriv->dot11PrivacyAlgrthm == _WEP104_)) {for (keyid =0 ; keyid <4 ; keyid++) {if (securitypriv->key_mask &BIT (keyid)) {if (keyid == securitypriv->dot11PrivacyKeyIndex)
Greg Kroah-Hartman
maintainerPATCH 1159/1276 staging: rtl8723bs: fix spaces around binary operators
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nikolay Kulikov <[email protected]>
[ Upstream commit 0c9d1b56f9af0762a5be5118e1bb962f23784dc4 ]
Add missing spaces and fix line length to comply with kernel coding style.
Stable-dep-of: 1463ca3ec660 ("staging: rtl8723bs: fix OOB reads in rtw_get_sec_ie(), rtw_get_wapi_ie(), and rtw_get_wps_attr()")
--- drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 78 +++++++++++++------------ 1 file changed, 42 insertions(+), 36 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ieee80211.c +42 -36
@@ -456,10 +456,10 @@ int rtw_parse_wpa_ie(u8 *wpa_ie, int wpareturn _FAIL; } -if ((*wpa_ie !=WLAN_EID_VENDOR_SPECIFIC ) || (*(wpa_ie+1 ) != (u8)(wpa_ie_len -2 )) || - (memcmp (wpa_ie+2 ,RTW_WPA_OUI_TYPE ,WPA_SELECTOR_LEN ))) { +if ((*wpa_ie !=WLAN_EID_VENDOR_SPECIFIC ) || + (*(wpa_ie +1 ) != (u8)(wpa_ie_len -2 )) || + (memcmp (wpa_ie +2 ,RTW_WPA_OUI_TYPE ,WPA_SELECTOR_LEN )))return _FAIL; - } pos = wpa_ie;
@@ -519,7 +519,7 @@ int rtw_parse_wpa2_ie(u8 *rsn_ie, int rsreturn _FAIL; } -if ((*rsn_ie !=WLAN_EID_RSN ) || (*(rsn_ie+1 ) != (u8)(rsn_ie_len -2 ))) +if ((*rsn_ie !=WLAN_EID_RSN ) || (*(rsn_ie +1 ) != (u8)(rsn_ie_len -2 )))return _FAIL; pos = rsn_ie;
@@ -587,18 +587,18 @@ int rtw_get_wapi_ie(u8 *in_ie, uint in_lwhile (cnt < in_len) { authmode = in_ie[cnt]; -/* if (authmode == WLAN_EID_BSS_AC_ACCESS_DELAY) */ -if (authmode ==WLAN_EID_BSS_AC_ACCESS_DELAY && (!memcmp (&in_ie[cnt+6 ], wapi_oui1,4 ) || - !memcmp (&in_ie[cnt+6 ], wapi_oui2,4 ))) { +if (authmode ==WLAN_EID_BSS_AC_ACCESS_DELAY && + (!memcmp (&in_ie[cnt +6 ], wapi_oui1,4 ) || + !memcmp (&in_ie[cnt +6 ], wapi_oui2,4 ))) {if (wapi_ie) -memcpy (wapi_ie, &in_ie[cnt], in_ie[cnt+1 ]+2 ); +memcpy (wapi_ie, &in_ie[cnt], in_ie[cnt +1 ] +2 );if (wapi_len) - *wapi_len = in_ie[cnt+1 ]+2 ; + *wapi_len = in_ie[cnt +1 ] +2 ; - cnt += in_ie[cnt+1 ]+2 ;/* get next */ + cnt += in_ie[cnt +1 ] +2 ;/* get next */ }else { - cnt += in_ie[cnt+1 ]+2 ;/* get next */ + cnt += in_ie[cnt +1 ] +2 ;/* get next */ } }
@@ -622,9 +622,10 @@ void rtw_get_sec_ie(u8 *in_ie, uint in_lwhile (cnt < in_len) { authmode = in_ie[cnt]; -if ((authmode ==WLAN_EID_VENDOR_SPECIFIC ) && (!memcmp (&in_ie[cnt+2 ], &wpa_oui[0 ],4 ))) { +if ((authmode ==WLAN_EID_VENDOR_SPECIFIC ) && + (!memcmp (&in_ie[cnt +2 ], &wpa_oui[0 ],4 ))) {if (wpa_ie) -memcpy (wpa_ie, &in_ie[cnt], in_ie[cnt+1 ]+2 ); +memcpy (wpa_ie, &in_ie[cnt], in_ie[cnt +1 ] +2 ); *wpa_len = in_ie[cnt +1 ] +2 ; cnt += in_ie[cnt +1 ] +2 ;/* get next */
@@ -633,10 +634,10 @@ void rtw_get_sec_ie(u8 *in_ie, uint in_lif (rsn_ie)memcpy (rsn_ie, &in_ie[cnt], in_ie[cnt +1 ] +2 ); - *rsn_len = in_ie[cnt+1 ]+2 ; - cnt += in_ie[cnt+1 ]+2 ;/* get next */ + *rsn_len = in_ie[cnt +1 ] +2 ; + cnt += in_ie[cnt +1 ] +2 ;/* get next */ }else { - cnt += in_ie[cnt+1 ]+2 ;/* get next */ + cnt += in_ie[cnt +1 ] +2 ;/* get next */ } } }
@@ -668,20 +669,20 @@ u8 *rtw_get_wps_ie(u8 *in_ie, uint in_lewhile (cnt < in_len) { eid = in_ie[cnt]; -if ((eid ==WLAN_EID_VENDOR_SPECIFIC ) && (!memcmp (&in_ie[cnt+2 ], wps_oui,4 ))) { +if ((eid ==WLAN_EID_VENDOR_SPECIFIC ) && (!memcmp (&in_ie[cnt +2 ], wps_oui,4 ))) { wpsie_ptr = &in_ie[cnt];if (wps_ie) -memcpy (wps_ie, &in_ie[cnt], in_ie[cnt+1 ]+2 ); +memcpy (wps_ie, &in_ie[cnt], in_ie[cnt +1 ] +2 );if (wps_ielen) - *wps_ielen = in_ie[cnt+1 ]+2 ; + *wps_ielen = in_ie[cnt +1 ] +2 ; - cnt += in_ie[cnt+1 ]+2 ; + cnt += in_ie[cnt +1 ] +2 ;break ; } - cnt += in_ie[cnt+1 ]+2 ;/* goto next */ + cnt += in_ie[cnt +1 ] +2 ;/* goto next */ }return wpsie_ptr;
@@ -759,12 +760,12 @@ u8 *rtw_get_wps_attr_content(u8 *wps_ie,if (attr_ptr && attr_len) {if (buf_content) -memcpy (buf_content, attr_ptr+4 , attr_len-4 ); +memcpy (buf_content, attr_ptr +4 , attr_len -4 );if (len_content) - *len_content = attr_len-4 ; + *len_content = attr_len -4 ; -return attr_ptr+4 ; +return attr_ptr +4 ; }return NULL ;
@@ -1010,20 +1011,25 @@ static int rtw_get_cipher_info(struct wlint group_cipher =0 , pairwise_cipher =0 , is8021x =0 ;int ret = _FAIL; - pbuf =rtw_get_wpa_ie (&pnetwork->network.ies[12 ], &wpa_ielen, pnetwork->network.ie_length-12 ); + pbuf =rtw_get_wpa_ie (&pnetwork->network.ies[12 ], + &wpa_ielen, + pnetwork->network.ie_length -12 );if (pbuf && (wpa_ielen >0 )) { -if (rtw_parse_wpa_ie (pbuf, wpa_ielen+2 , &group_cipher, &pairwise_cipher, &is8021x) == _SUCCESS) { +if (rtw_parse_wpa_ie (pbuf, wpa_ielen +2 , &group_cipher, + &pairwise_cipher, &is8021x) == _SUCCESS) { pnetwork->bcn_info.pairwise_cipher = pairwise_cipher; pnetwork->bcn_info.group_cipher = group_cipher; pnetwork->bcn_info.is_8021x = is8021x; ret = _SUCCESS; } }else { - pbuf =rtw_get_wpa2_ie (&pnetwork->network.ies[12 ], &wpa_ielen, pnetwork->network.ie_length-12 ); + pbuf =rtw_get_wpa2_ie (&pnetwork->network.ies[12 ], &wpa_ielen, + pnetwork->network.ie_length -12 );if (pbuf && (wpa_ielen >0 )) { -if (rtw_parse_wpa2_ie (pbuf, wpa_ielen+2 , &group_cipher, &pairwise_cipher, &is8021x) == _SUCCESS) { +if (rtw_parse_wpa2_ie (pbuf, wpa_ielen +2 , &group_cipher, + &pairwise_cipher, &is8021x) == _SUCCESS) { pnetwork->bcn_info.pairwise_cipher = pairwise_cipher; pnetwork->bcn_info.group_cipher = group_cipher; pnetwork->bcn_info.is_8021x = is8021x;
@@ -1092,21 +1098,21 @@ u16 rtw_mcs_rate(u8 bw_40MHz, u8 short_Gu16 max_rate =0 ;if (MCS_rate[0 ] &BIT (7 )) - max_rate = (bw_40MHz) ? ((short_GI)?1500 :1350 ):((short_GI)?722 :650 ); + max_rate = (bw_40MHz) ? ((short_GI) ?1500 :1350 ) : ((short_GI) ?722 :650 );else if (MCS_rate[0 ] &BIT (6 )) - max_rate = (bw_40MHz) ? ((short_GI)?1350 :1215 ):((short_GI)?650 :585 ); + max_rate = (bw_40MHz) ? ((short_GI) ?1350 :1215 ) : ((short_GI) ?650 :585 );else if (MCS_rate[0 ] &BIT (5 )) - max_rate = (bw_40MHz) ? ((short_GI)?1200 :1080 ):((short_GI)?578 :520 ); + max_rate = (bw_40MHz) ? ((short_GI) ?1200 :1080 ) : ((short_GI) ?578 :520 );else if (MCS_rate[0 ] &BIT (4 )) - max_rate = (bw_40MHz) ? ((short_GI)?900 :810 ):((short_GI)?433 :390 ); + max_rate = (bw_40MHz) ? ((short_GI) ?900 :810 ) : ((short_GI) ?433 :390 );else if (MCS_rate[0 ] &BIT (3 )) - max_rate = (bw_40MHz) ? ((short_GI)?600 :540 ):((short_GI)?289 :260 ); + max_rate = (bw_40MHz) ? ((short_GI) ?600 :540 ) : ((short_GI) ?289 :260 );else if (MCS_rate[0 ] &BIT (2 )) - max_rate = (bw_40MHz) ? ((short_GI)?450 :405 ):((short_GI)?217 :195 ); + max_rate = (bw_40MHz) ? ((short_GI) ?450 :405 ) : ((short_GI) ?217 :195 );else if (MCS_rate[0 ] &BIT (1 )) - max_rate = (bw_40MHz) ? ((short_GI)?300 :270 ):((short_GI)?144 :130 ); + max_rate = (bw_40MHz) ? ((short_GI) ?300 :270 ) : ((short_GI) ?144 :130 );else if (MCS_rate[0 ] &BIT (0 )) - max_rate = (bw_40MHz) ? ((short_GI)?150 :135 ):((short_GI)?72 :65 ); + max_rate = (bw_40MHz) ? ((short_GI) ?150 :135 ) : ((short_GI) ?72 :65 );return max_rate; }
Greg Kroah-Hartman
maintainerPATCH 1160/1276 staging: rtl8723bs: fix OOB reads in rtw_get_sec_ie(), rtw_get_wapi_ie(), and rtw_get_wps_attr()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexandru Hossu <[email protected]>
[ Upstream commit 1463ca3ec6601cbb097d8d87dbf5dcf1cb86a344 ]
Three IE/attribute parsing functions have missing bounds checks.
rtw_get_sec_ie() and rtw_get_wapi_ie() iterate over a raw IE buffer without verifying that the header bytes (tag + length) are within the remaining buffer before reading them. Additionally, rtw_get_sec_ie() compares the 4-byte WPA OUI at cnt+2 without checking that at least 6 bytes remain, and rtw_get_wapi_ie() compares a 4-byte WAPI OUI at cnt+6 without checking that at least 10 bytes remain.
rtw_get_wps_attr() reads wps_ie[0] and wps_ie+2 unconditionally at entry, before verifying that wps_ielen is large enough to contain the 6-byte WPS IE header (element_id + length + 4-byte OUI). Inside the attribute loop, get_unaligned_be16() is called on attr_ptr and attr_ptr+2 without checking that 4 bytes remain in the buffer.
Add a cnt+2 bounds check before each loop body in rtw_get_sec_ie() and rtw_get_wapi_ie(), guard each multi-byte comparison with a minimum IE length requirement, add a wps_ielen < 6 early return in rtw_get_wps_attr(), and add a 4-byte bounds check in its inner loop.
--- drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/staging/rtl8723bs/core/rtw_ieee80211.c +15 -0
@@ -585,9 +585,14 @@ int rtw_get_wapi_ie(u8 *in_ie, uint in_l cnt = (_TIMESTAMP_ + _BEACON_ITERVAL_ + _CAPABILITY_);while (cnt < in_len) { +if (cnt +2 > in_len) +break ; +if (cnt +2 + in_ie[cnt +1 ] > in_len) +break ; authmode = in_ie[cnt];if (authmode ==WLAN_EID_BSS_AC_ACCESS_DELAY && + in_ie[cnt +1 ] >=8 && (!memcmp (&in_ie[cnt +6 ], wapi_oui1,4 ) || !memcmp (&in_ie[cnt +6 ], wapi_oui2,4 ))) {if (wapi_ie)
@@ -620,9 +625,14 @@ void rtw_get_sec_ie(u8 *in_ie, uint in_l cnt = (_TIMESTAMP_ + _BEACON_ITERVAL_ + _CAPABILITY_);while (cnt < in_len) { +if (cnt +2 > in_len) +break ; +if (cnt +2 + in_ie[cnt +1 ] > in_len) +break ; authmode = in_ie[cnt];if ((authmode ==WLAN_EID_VENDOR_SPECIFIC ) && + in_ie[cnt +1 ] >=4 && (!memcmp (&in_ie[cnt +2 ], &wpa_oui[0 ],4 ))) {if (wpa_ie)memcpy (wpa_ie, &in_ie[cnt], in_ie[cnt +1 ] +2 );
@@ -707,6 +717,9 @@ u8 *rtw_get_wps_attr(u8 *wps_ie, uint wpif (len_attr) *len_attr =0 ; +if (wps_ielen <6 ) +return attr_ptr; +if ((wps_ie[0 ] !=WLAN_EID_VENDOR_SPECIFIC ) || (memcmp (wps_ie +2 , wps_oui,4 ))) {return attr_ptr;
@@ -717,6 +730,8 @@ u8 *rtw_get_wps_attr(u8 *wps_ie, uint wpwhile (attr_ptr - wps_ie < wps_ielen) {/* 4 = 2(Attribute ID) + 2(Length) */ +if (attr_ptr +4 > wps_ie + wps_ielen) +break ;u16 attr_id =get_unaligned_be16 (attr_ptr);u16 attr_data_len =get_unaligned_be16 (attr_ptr +2 );u16 attr_len = attr_data_len +4 ;
Greg Kroah-Hartman
maintainerPATCH 1161/1276 crypto: qat - fix VF2PF work teardown race in adf_disable_sriov()
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 277281c10c63791067d24d421f7c43a15faa9096 ]
The VF2PF interrupt handler queues PF-side response work that stores a raw pointer to per-VF state (struct adf_accel_vf_info). Currently, adf_disable_sriov() destroys per-VF mutexes and frees vf_info without stopping new VF2PF work or waiting for in-flight workers to complete. A concurrently scheduled or already queued worker can then dereference freed memory.
This manifests as a use-after-free when KASAN is enabled:
BUG: KASAN: null-ptr-deref in mutex_lock+0x76/0xe0
Write of size 8 at addr 0000000000000260 by task kworker/24:2/...
Workqueue: qat_pf2vf_resp_wq adf_iov_send_resp [intel_qat]
Call Trace:
kasan_report+0x119/0x140
mutex_lock+0x76/0xe0
adf_gen4_pfvf_send+0xd4/0x1f0 [intel_qat]
adf_recv_and_handle_vf2pf_msg+0x290/0x360 [intel_qat]
adf_iov_send_resp+0x8c/0xe0 [intel_qat]
process_one_work+0x6ac/0xfd0
worker_thread+0x4dd/0xd30
kthread+0x326/0x410
ret_from_fork+0x33b/0x670Add a PF-local flag, vf2pf_disabled, that gates work queueing, worker processing, and interrupt re-enabling during teardown. Set this flag atomically with the hardware interrupt mask inside adf_disable_all_vf2pf_interrupts(). After masking, synchronize the AE cluster MSI-X interrupt and flush the PF response workqueue before tearing down per-VF locks and state so all in-flight work completes before vf_info is destroyed.
Introduce adf_enable_all_vf2pf_interrupts() to clear the flag and unmask all VF2PF interrupts under the same lock when SR-IOV is re-enabled. This ensures the software flag and hardware state transition atomically on both the enable and disable paths.
--- drivers/crypto/intel/qat/qat_common/adf_accel_devices.h | 2 drivers/crypto/intel/qat/qat_common/adf_common_drv.h | 2 drivers/crypto/intel/qat/qat_common/adf_isr.c | 39 ++++++++++++++++ drivers/crypto/intel/qat/qat_common/adf_sriov.c | 20 +++++++- 4 files changed, 61 insertions(+), 2 deletions(-)
drivers/crypto/intel/qat/qat_common/adf_accel_devices.h +2 -0
@@ -485,6 +485,8 @@ struct adf_accel_dev {struct {/* protects VF2PF interrupts access */ spinlock_t vf2pf_ints_lock; +/* prevents VF2PF handling from racing with VF state teardown */ +bool vf2pf_disabled;/* vf_info is non-zero when SR-IOV is init'ed */ struct adf_accel_vf_info *vf_info; } pf;
drivers/crypto/intel/qat/qat_common/adf_common_drv.h +2 -0
@@ -119,6 +119,7 @@ void qat_comp_alg_callback(void *resp);int adf_isr_resource_alloc (struct adf_accel_dev *accel_dev);void adf_isr_resource_free (struct adf_accel_dev *accel_dev); +void adf_isr_sync_ae_cluster (struct adf_accel_dev *accel_dev);int adf_vf_isr_resource_alloc (struct adf_accel_dev *accel_dev);void adf_vf_isr_resource_free (struct adf_accel_dev *accel_dev);
@@ -192,6 +193,7 @@ int adf_sriov_configure(struct pci_dev *void adf_disable_sriov (struct adf_accel_dev *accel_dev);void adf_reenable_sriov (struct adf_accel_dev *accel_dev);void adf_enable_vf2pf_interrupts (struct adf_accel_dev *accel_dev,u32 vf_mask); +void adf_enable_all_vf2pf_interrupts (struct adf_accel_dev *accel_dev,u32 num_vfs);void adf_disable_all_vf2pf_interrupts (struct adf_accel_dev *accel_dev);bool adf_recv_and_handle_pf2vf_msg (struct adf_accel_dev *accel_dev);bool adf_recv_and_handle_vf2pf_msg (struct adf_accel_dev *accel_dev,u32 vf_nr);
drivers/crypto/intel/qat/qat_common/adf_isr.c +39 -0
@@ -62,6 +62,23 @@ void adf_enable_vf2pf_interrupts(structunsigned long flags;spin_lock_irqsave (&accel_dev->pf.vf2pf_ints_lock, flags); +if (!READ_ONCE (accel_dev->pf.vf2pf_disabled)) +GET_PFVF_OPS (accel_dev)->enable_vf2pf_interrupts (pmisc_addr, vf_mask); +spin_unlock_irqrestore (&accel_dev->pf.vf2pf_ints_lock, flags); +} + +void adf_enable_all_vf2pf_interrupts (struct adf_accel_dev *accel_dev,u32 num_vfs) +{ +void __iomem *pmisc_addr =adf_get_pmisc_base (accel_dev); +unsigned long flags; +u32 vf_mask; + + vf_mask =BIT_ULL (num_vfs) -1 ; +if (!vf_mask) +return ; + +spin_lock_irqsave (&accel_dev->pf.vf2pf_ints_lock, flags); +WRITE_ONCE (accel_dev->pf.vf2pf_disabled, false);GET_PFVF_OPS (accel_dev)->enable_vf2pf_interrupts (pmisc_addr, vf_mask);spin_unlock_irqrestore (&accel_dev->pf.vf2pf_ints_lock, flags); }
@@ -72,6 +89,7 @@ void adf_disable_all_vf2pf_interrupts(stunsigned long flags;spin_lock_irqsave (&accel_dev->pf.vf2pf_ints_lock, flags); +WRITE_ONCE (accel_dev->pf.vf2pf_disabled, true);GET_PFVF_OPS (accel_dev)->disable_all_vf2pf_interrupts (pmisc_addr);spin_unlock_irqrestore (&accel_dev->pf.vf2pf_ints_lock, flags); }
@@ -174,6 +192,27 @@ static irqreturn_t adf_msix_isr_ae(int ireturn IRQ_NONE ; } +void adf_isr_sync_ae_cluster (struct adf_accel_dev *accel_dev) +{ +struct adf_accel_pci *pci_dev_info = &accel_dev->accel_pci_dev; +struct adf_hw_device_data *hw_data =GET_HW_DATA (accel_dev); +u32 num_entries = pci_dev_info->msix_entries.num_entries; +struct adf_irq *irqs = pci_dev_info->msix_entries.irqs; +u32 irq_idx; +int irq; + +if (!test_bit (ADF_STATUS_IRQ_ALLOCATED , &accel_dev->status) || !irqs) +return ; + + irq_idx = num_entries >1 ? hw_data->num_banks :0 ; +if (irq_idx >= num_entries || !irqs[irq_idx].enabled) +return ; + + irq =pci_irq_vector (pci_dev_info->pci_dev, hw_data->num_banks); +if (irq >0 ) +synchronize_irq (irq); +} +static void adf_free_irqs (struct adf_accel_dev *accel_dev) {struct adf_accel_pci *pci_dev_info = &accel_dev->accel_pci_dev;
drivers/crypto/intel/qat/qat_common/adf_sriov.c +18 -2
@@ -26,6 +26,9 @@ static void adf_iov_send_resp(struct woru32 vf_nr = vf_info->vf_nr;bool ret; +if (READ_ONCE (accel_dev->pf.vf2pf_disabled)) + goto out; +mutex_lock (&vf_info->pfvf_mig_lock); ret =adf_recv_and_handle_vf2pf_msg (accel_dev, vf_nr);if (ret)
@@ -33,13 +36,18 @@ static void adf_iov_send_resp(struct woradf_enable_vf2pf_interrupts (accel_dev,1 << vf_nr);mutex_unlock (&vf_info->pfvf_mig_lock); +out:kfree (pf2vf_resp); }void adf_schedule_vf2pf_handler (struct adf_accel_vf_info *vf_info) { +struct adf_accel_dev *accel_dev = vf_info->accel_dev;struct adf_pf2vf_resp *pf2vf_resp; +if (READ_ONCE (accel_dev->pf.vf2pf_disabled)) +return ; + pf2vf_resp =kzalloc (sizeof (*pf2vf_resp),GFP_ATOMIC );if (!pf2vf_resp)return ;
@@ -49,6 +57,12 @@ void adf_schedule_vf2pf_handler(struct aqueue_work (pf2vf_resp_wq, &pf2vf_resp->pf2vf_resp_work); } +static void adf_flush_pf2vf_resp_wq (void ) +{ +if (pf2vf_resp_wq) +flush_workqueue (pf2vf_resp_wq); +} +static int adf_enable_sriov (struct adf_accel_dev *accel_dev) {struct pci_dev *pdev =accel_to_pci_dev (accel_dev);
@@ -75,7 +89,7 @@ static int adf_enable_sriov(struct adf_a hw_data->configure_iov_threads (accel_dev, true);/* Enable VF to PF interrupts for all VFs */ -adf_enable_vf2pf_interrupts (accel_dev,BIT_ULL (totalvfs) -1 ); +adf_enable_all_vf2pf_interrupts (accel_dev, totalvfs);/* Do not enable SR-IOV if already enabled */ if (pci_num_vf (pdev))
@@ -259,8 +273,10 @@ void adf_disable_sriov(struct adf_accel_if (!test_bit (ADF_STATUS_RESTARTING , &accel_dev->status))pci_disable_sriov (accel_to_pci_dev (accel_dev)); -/* Disable VF to PF interrupts */ +/* Block VF2PF work and disable VF to PF interrupts */ adf_disable_all_vf2pf_interrupts (accel_dev); +adf_isr_sync_ae_cluster (accel_dev); +adf_flush_pf2vf_resp_wq ();/* Clear Valid bits in AE Thread to PCIe Function Mapping */ if (hw_data->configure_iov_threads)
Greg Kroah-Hartman
maintainerPATCH 1162/1276 Bluetooth: L2CAP: Fix UAF in channel timeout by holding conn ref
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marco Elver <[email protected]>
[ Upstream commit b66774b48dd98f07254951f74ea6f513efe7ff8b ]
l2cap_chan_timeout() runs asynchronously and accesses chan->conn. If the connection is torn down while the timer is running or pending, chan->conn can be freed, leading to a use-after-free when the timer worker attempts to lock conn->lock:
| BUG: KASAN: slab-use-after-free in instrument_atomic_read_write include/linux/instrumented.h:112 [inline] | BUG: KASAN: slab-use-after-free in atomic_long_try_cmpxchg_acquire include/linux/atomic/atomic-instrumented.h:4456 [inline] | BUG: KASAN: slab-use-after-free in __mutex_trylock_fast kernel/locking/mutex.c:161 [inline] | BUG: KASAN: slab-use-after-free in mutex_lock+0x4f/0xa0 kernel/locking/mutex.c:318 | Write of size 8 at addr ffff8881298d9550 by task kworker/2:1/83 | | CPU: 2 UID: 0 PID: 83 Comm: kworker/2:1 Not tainted 7.1.0-rc6-next-20260601-dirty #6 PREEMPT(full) | Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.17.0-debian-1.17.0-1 04/01/2014 | Workqueue: events l2cap_chan_timeout | Call Trace: | <TASK> | instrument_atomic_read_write include/linux/instrumented.h:112 [inline] | atomic_long_try_cmpxchg_acquire include/linux/atomic/atomic-instrumented.h:4456 [inline] | __mutex_trylock_fast kernel/locking/mutex.c:161 [inline] | mutex_lock+0x4f/0xa0 kernel/locking/mutex.c:318 | l2cap_chan_timeout+0x5d/0x1b0 net/bluetooth/l2cap_core.c:422 | process_one_work kernel/workqueue.c:3326 [inline] | process_scheduled_works+0x7c8/0xfb0 kernel/workqueue.c:3409 | worker_thread+0x8a9/0xcf0 kernel/workqueue.c:3490 | kthread+0x346/0x430 kernel/kthread.c:436 | ret_from_fork+0x1a3/0x470 arch/x86/kernel/process.c:158 | ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:245 | </TASK> | | Allocated by task 320: | l2cap_conn_add+0xa7/0x820 net/bluetooth/l2cap_core.c:7075 | l2cap_connect_cfm+0xdb/0xd70 net/bluetooth/l2cap_core.c:7452 | hci_connect_cfm include/net/bluetooth/hci_core.h:2139 [inline] | hci_remote_features_evt+0x52f/0x9f0 net/bluetooth/hci_event.c:3760 | hci_event_func net/bluetooth/hci_event.c:7796 [inline] | hci_event_packet+0x561/0xa70 net/bluetooth/hci_event.c:7847 | hci_rx_work+0x370/0x890 net/bluetooth/hci_core.c:4040 | process_one_work kernel/workqueue.c:3326 [inline] | process_scheduled_works+0x7c8/0xfb0 kernel/workqueue.c:3409 | worker_thread+0x8a9/0xcf0 kernel/workqueue.c:3490 | kthread+0x346/0x430 kernel/kthread.c:436 | ret_from_fork+0x1a3/0x470 arch/x86/kernel/process.c:158 | ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:245 | | Freed by task 322: | hci_disconn_cfm include/net/bluetooth/hci_core.h:2154 [inline] | hci_conn_hash_flush+0x101/0x1f0 net/bluetooth/hci_conn.c:2736 | hci_dev_close_sync+0x889/0xde0 net/bluetooth/hci_sync.c:5405 | hci_dev_do_close net/bluetooth/hci_core.c:502 [inline] | hci_unregister_dev+0x1f7/0x370 net/bluetooth/hci_core.c:2679 | vhci_release+0x12a/0x180 drivers/bluetooth/hci_vhci.c:690 | __fput+0x369/0x890 fs/file_table.c:510 | task_work_run+0x160/0x1d0 kernel/task_work.c:233 | get_signal+0xf5b/0x1120 kernel/signal.c:2810 | arch_do_signal_or_restart+0x4d/0x600 arch/x86/kernel/signal.c:337 | __exit_to_user_mode_loop kernel/entry/common.c:64 [inline] | exit_to_user_mode_loop+0x85/0x510 kernel/entry/common.c:98 | do_syscall_64+0x263/0x3d0 arch/x86/entry/syscall_64.c:100 | entry_SYSCALL_64_after_hwframe+0x77/0x7f | | The buggy address belongs to the object at ffff8881298d9400 | which belongs to the cache kmalloc-512 of size 512 | The buggy address is located 336 bytes inside of | freed 512-byte region [ffff8881298d9400, ffff8881298d9600)
Fix it by having chan->conn hold a reference to l2cap_conn (via l2cap_conn_get) when the channel is added to the connection, and releasing it in the channel destructor. This ensures the l2cap_conn remains alive as long as the channel exists.
A new FLAG_DEL channel flag is introduced to indicate that the channel has been deleted from its connection. l2cap_chan_del() atomically sets this flag using test_and_set_bit() instead of setting chan->conn to NULL. All asynchronous workers (l2cap_chan_timeout, l2cap_ack_timeout, l2cap_monitor_timeout, l2cap_retrans_timeout) and l2cap_chan_send() check FLAG_DEL to determine whether the channel has been torn down, rather than testing chan->conn for NULL.
--- include/net/bluetooth/l2cap.h | 1 + net/bluetooth/l2cap_core.c | 34 ++++++++++++++++++++-------------- 2 files changed, 21 insertions(+), 14 deletions(-)
include/net/bluetooth/l2cap.h +1 -0
@@ -748,6 +748,7 @@ enum {FLAG_ECRED_CONN_REQ_SENT ,FLAG_PENDING_SECURITY ,FLAG_HOLD_HCI_CONN , + FLAG_DEL, };/* Lock nesting levels for L2CAP channels. We need these because lockdep
net/bluetooth/l2cap_core.c +20 -14
@@ -411,7 +411,7 @@ static void l2cap_chan_timeout(struct woBT_DBG ("chan %p state %s" , chan,state_to_string (chan->state)); -if (!conn) { +if (test_bit (FLAG_DEL , &chan->flags)) {l2cap_chan_put (chan);return ; }
@@ -422,6 +422,9 @@ static void l2cap_chan_timeout(struct wo*/ l2cap_chan_lock (chan); +if (test_bit (FLAG_DEL , &chan->flags)) + goto unlock; +if (chan->state ==BT_CONNECTED || chan->state ==BT_CONFIG ) reason =ECONNREFUSED ; else if (chan->state == BT_CONNECT &&
@@ -434,10 +437,10 @@ static void l2cap_chan_timeout(struct wo chan->ops->close (chan); +unlock:l2cap_chan_unlock (chan); -l2cap_chan_put (chan); -mutex_unlock (&conn->lock); +l2cap_chan_put (chan); }struct l2cap_chan *l2cap_chan_create (void )
@@ -490,6 +493,9 @@ static void l2cap_chan_destroy(struct krlist_del (&chan->global_l);write_unlock (&chan_list_lock); +if (chan->conn) +l2cap_conn_put (chan->conn); +kfree (chan); }
@@ -593,7 +599,7 @@ void __l2cap_chan_add(struct l2cap_conn conn->disc_reason =HCI_ERROR_REMOTE_USER_TERM ; - chan->conn = conn; + chan->conn =l2cap_conn_get (conn);switch (chan->chan_type) {case L2CAP_CHAN_CONN_ORIENTED :
@@ -648,30 +654,26 @@ void l2cap_chan_add(struct l2cap_conn *cvoid l2cap_chan_del (struct l2cap_chan *chan,int err) { -struct l2cap_conn *conn = chan->conn; -__clear_chan_timer (chan); -BT_DBG ("chan %p, conn %p, err %d, state %s" , chan, conn, err, +BT_DBG ("chan %p, err %d, state %s" , chan, err,state_to_string (chan->state)); chan->ops->teardown (chan, err); -if (conn) { +if (!test_and_set_bit (FLAG_DEL , &chan->flags)) {/* Delete from channel list */ list_del (&chan->list);l2cap_chan_put (chan); - chan->conn =NULL ; -/* Reference was only held for non-fixed channels or * fixed channels that explicitly requested it using the * FLAG_HOLD_HCI_CONN flag. */ if (chan->chan_type !=L2CAP_CHAN_FIXED ||test_bit (FLAG_HOLD_HCI_CONN , &chan->flags)) -hci_conn_drop (conn->hcon); +hci_conn_drop (chan->conn->hcon); }if (test_bit (CONF_NOT_COMPLETE , &chan->conf_state))
@@ -1886,7 +1888,7 @@ static void l2cap_monitor_timeout(structl2cap_chan_lock (chan); -if (!chan->conn) { +if (test_bit (FLAG_DEL , &chan->flags)) {l2cap_chan_unlock (chan);l2cap_chan_put (chan);return ;
@@ -1907,7 +1909,7 @@ static void l2cap_retrans_timeout(structl2cap_chan_lock (chan); -if (!chan->conn) { +if (test_bit (FLAG_DEL , &chan->flags)) {l2cap_chan_unlock (chan);l2cap_chan_put (chan);return ;
@@ -2522,7 +2524,7 @@ int l2cap_chan_send(struct l2cap_chan *cint err;struct sk_buff_head seg_queue; -if (!chan->conn) +if (test_bit (FLAG_DEL , &chan->flags))return -ENOTCONN ;/* Connectionless channel */
@@ -3119,12 +3121,16 @@ static void l2cap_ack_timeout(struct worl2cap_chan_lock (chan); +if (test_bit (FLAG_DEL , &chan->flags)) + goto unlock; + frames_to_ack =__seq_offset (chan, chan->buffer_seq, chan->last_acked_seq);if (frames_to_ack)l2cap_send_rr_or_rnr (chan,0 ); +unlock:l2cap_chan_unlock (chan);l2cap_chan_put (chan); }
Greg Kroah-Hartman
maintainerPATCH 1163/1276 gpio: sch: use raw_spinlock_t in the irq startup path
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 286533cb14a3c8a8bd39ff64ea2fc8e1aa0f638b ]
sch_irq_unmask() enables the GPIO IRQ and then updates the controller state through sch_irq_mask_unmask(), which takes sch->lock with spin_lock_irqsave(). The callback can be reached from irq_startup() while setting up a requested IRQ. That path is not sleepable, but on PREEMPT_RT a regular spinlock_t becomes a sleeping lock.
This issue was found by our static analysis tool and then manually reviewed against the current tree.
The grounded PoC kept the request_threaded_irq() -> __setup_irq() -> irq_startup() -> sch_irq_unmask() -> sch_irq_mask_unmask() carrier and used the original spin_lock_irqsave(&sch->lock) edge. Lockdep reported:
BUG: sleeping function called from invalid context hardirqs last disabled at ... __setup_irq.constprop.0 ... [vuln_msv] sch_rt_spin_lock_irqsave+0x1c/0x30 [vuln_msv] sch_irq_mask_unmask.constprop.0+0x31/0x70 [vuln_msv] __setup_irq.constprop.0+0xd/0x30 [vuln_msv]
Convert the SCH controller lock to raw_spinlock_t. The same lock is also used by the GPIO direction and value callbacks, but those critical sections only update MMIO-backed GPIO registers and do not contain sleepable operations. Keeping this register lock non-sleeping is therefore appropriate for the irqchip callbacks and does not change the GPIO-side locking contract.
--- drivers/gpio/gpio-sch.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)
drivers/gpio/gpio-sch.c +16 -16
@@ -39,7 +39,7 @@struct sch_gpio {struct gpio_chip chip;void __iomem *regs; -spinlock_t lock; +raw_spinlock_t lock;unsigned short resume_base;/* GPE handling */
@@ -104,9 +104,9 @@ static int sch_gpio_direction_in(structstruct sch_gpio *sch =gpiochip_get_data (gc);unsigned long flags; -spin_lock_irqsave (&sch->lock, flags); +raw_spin_lock_irqsave (&sch->lock, flags);sch_gpio_reg_set (sch, gpio_num,GIO ,1 ); -spin_unlock_irqrestore (&sch->lock, flags); +raw_spin_unlock_irqrestore (&sch->lock, flags);return 0 ; }
@@ -122,9 +122,9 @@ static void sch_gpio_set(struct gpio_chistruct sch_gpio *sch =gpiochip_get_data (gc);unsigned long flags; -spin_lock_irqsave (&sch->lock, flags); +raw_spin_lock_irqsave (&sch->lock, flags);sch_gpio_reg_set (sch, gpio_num,GLV , val); -spin_unlock_irqrestore (&sch->lock, flags); +raw_spin_unlock_irqrestore (&sch->lock, flags); } static int sch_gpio_direction_out(struct gpio_chip *gc, unsigned int gpio_num,
@@ -133,9 +133,9 @@ static int sch_gpio_direction_out(structstruct sch_gpio *sch =gpiochip_get_data (gc);unsigned long flags; -spin_lock_irqsave (&sch->lock, flags); +raw_spin_lock_irqsave (&sch->lock, flags);sch_gpio_reg_set (sch, gpio_num,GIO ,0 ); -spin_unlock_irqrestore (&sch->lock, flags); +raw_spin_unlock_irqrestore (&sch->lock, flags);/* * according to the datasheet, writing to the level register has no
@@ -195,14 +195,14 @@ static int sch_irq_type(struct irq_datareturn -EINVAL ; } -spin_lock_irqsave (&sch->lock, flags); +raw_spin_lock_irqsave (&sch->lock, flags);sch_gpio_reg_set (sch, gpio_num,GTPE , rising);sch_gpio_reg_set (sch, gpio_num,GTNE , falling);irq_set_handler_locked (d, handle_edge_irq); -spin_unlock_irqrestore (&sch->lock, flags); +raw_spin_unlock_irqrestore (&sch->lock, flags);return 0 ; }
@@ -214,9 +214,9 @@ static void sch_irq_ack(struct irq_datairq_hw_number_t gpio_num =irqd_to_hwirq (d);unsigned long flags; -spin_lock_irqsave (&sch->lock, flags); +raw_spin_lock_irqsave (&sch->lock, flags);sch_gpio_reg_set (sch, gpio_num,GTS ,1 ); -spin_unlock_irqrestore (&sch->lock, flags); +raw_spin_unlock_irqrestore (&sch->lock, flags); }static void sch_irq_mask_unmask (struct gpio_chip *gc,irq_hw_number_t gpio_num,int val)
@@ -224,9 +224,9 @@ static void sch_irq_mask_unmask(struct gstruct sch_gpio *sch =gpiochip_get_data (gc);unsigned long flags; -spin_lock_irqsave (&sch->lock, flags); +raw_spin_lock_irqsave (&sch->lock, flags);sch_gpio_reg_set (sch, gpio_num,GGPE , val); -spin_unlock_irqrestore (&sch->lock, flags); +raw_spin_unlock_irqrestore (&sch->lock, flags); }static void sch_irq_mask (struct irq_data *d)
@@ -267,12 +267,12 @@ static u32 sch_gpio_gpe_handler(acpi_hanint offset;u32 ret; -spin_lock_irqsave (&sch->lock, flags); +raw_spin_lock_irqsave (&sch->lock, flags); core_status =ioread32 (sch->regs +CORE_BANK_OFFSET +GTS ); resume_status =ioread32 (sch->regs +RESUME_BANK_OFFSET +GTS ); -spin_unlock_irqrestore (&sch->lock, flags); +raw_spin_unlock_irqrestore (&sch->lock, flags); pending = (resume_status << sch->resume_base) | core_status;for_each_set_bit (offset, &pending, sch->chip.ngpio)
@@ -342,7 +342,7 @@ static int sch_gpio_probe(struct platfor sch->regs = regs; -spin_lock_init (&sch->lock); +raw_spin_lock_init (&sch->lock); sch->chip = sch_gpio_chip; sch->chip.label =dev_name (dev); sch->chip.parent = dev;
Greg Kroah-Hartman
maintainerPATCH 1164/1276 io_uring/rw: ensure reissue path is correctly handled for IOPOLL
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
[ Upstream commit bcb0fda3c2da9fe4721d3e73d80e778c038e7d27 ]
The IOPOLL path posts CQEs when the io_kiocb is marked as completed, so it cannot rely on the usual retry that non-IOPOLL requests do for read/write requests.
If -EAGAIN is received and the request should be retried, go through the normal completion path and let the normal flush logic catch it and reissue it, like what is done for !IOPOLL reads or writes.
Stable-dep-of: c554246ff4c6 ("io_uring/rw: preserve partial result for iopoll")
--- io_uring/rw.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
io_uring/rw.c +3 -4
@@ -550,11 +550,10 @@ static void io_complete_rw_iopoll(structif (kiocb->ki_flags &IOCB_WRITE )io_req_end_write (req);if (unlikely (res != req->cqe.res)) { -if (res == -EAGAIN &&io_rw_should_reissue (req)) { +if (res == -EAGAIN &&io_rw_should_reissue (req)) req->flags |=REQ_F_REISSUE |REQ_F_BL_NO_RECYCLE ; -return ; - } - req->cqe.res = res; +else + req->cqe.res = res; }/* order with io_iopoll_complete() checking ->iopoll_completed */
Greg Kroah-Hartman
maintainerPATCH 1165/1276 io_uring/rw: preserve partial result for iopoll
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Wigham <[email protected]>
[ Upstream commit c554246ff4c68abf71b61a89c6e39d3cf94f523e ]
A partial read will store the completed byte count in io->bytes_done. The regular completion path applies io_fixup_rw_res() so that, when the following operation reaches EOF, the number of bytes already read is returned.
The iopoll completion path does not apply this fixup to the return value and can return zero instead.
Use the fixup result when updating the CQE, and the raw result for the reissue check.
--- io_uring/rw.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
io_uring/rw.c +6 -6
@@ -546,15 +546,15 @@ static void io_complete_rw_iopoll(struct { struct io_rw *rw = container_of(kiocb, struct io_rw, kiocb);struct io_kiocb *req =cmd_to_io_kiocb (rw); +int final_res =io_fixup_rw_res (req, res);if (kiocb->ki_flags &IOCB_WRITE )io_req_end_write (req); -if (unlikely (res != req->cqe.res)) { -if (res == -EAGAIN &&io_rw_should_reissue (req)) - req->flags |=REQ_F_REISSUE |REQ_F_BL_NO_RECYCLE ; -else - req->cqe.res = res; - } + +if (res == -EAGAIN &&io_rw_should_reissue (req)) + req->flags |=REQ_F_REISSUE |REQ_F_BL_NO_RECYCLE ; +else if (unlikely (final_res != req->cqe.res)) + req->cqe.res = final_res;/* order with io_iopoll_complete() checking ->iopoll_completed */ smp_store_release (&req->iopoll_completed,1 );
Greg Kroah-Hartman
maintainerPATCH 1166/1276 media: nxp: imx8-isi: use devm_pm_runtime_enable() to simplify code
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Frank Li <[email protected]>
[ Upstream commit 078161dd44d6f848a62a473206d69025607736ec ]
Use devm_pm_runtime_enable() to simplify code. Change to use dev_err_probe() because previous goto change to return.
No functional change.
Stable-dep-of: b670bf89824e ("media: nxp: imx8-isi: Fix use-after-free on remove")
--- drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c +7 -9
@@ -472,13 +472,14 @@ static int mxc_isi_probe(struct platformreturn ret; } -pm_runtime_enable (dev); + ret =devm_pm_runtime_enable (dev); +if (ret) +return ret; ret =mxc_isi_crossbar_init (isi); -if (ret) { -dev_err (dev,"Failed to initialize crossbar: %d\n" , ret); - goto err_pm; - } +if (ret) +return dev_err_probe (dev, ret, +"Failed to initialize crossbar\n" );for (i =0 ; i < isi->pdata->num_channels; ++i) { ret =mxc_isi_pipe_init (isi, i);
@@ -501,8 +502,7 @@ static int mxc_isi_probe(struct platform err_xbar:mxc_isi_crossbar_cleanup (&isi->crossbar); -err_pm: -pm_runtime_disable (isi->dev); +return ret; }
@@ -521,8 +521,6 @@ static void mxc_isi_remove(struct platfomxc_isi_crossbar_cleanup (&isi->crossbar);mxc_isi_v4l2_cleanup (isi); - -pm_runtime_disable (isi->dev); }static const struct of_device_id mxc_isi_of_match[] = {
Greg Kroah-Hartman
maintainerPATCH 1167/1276 media: nxp: imx8-isi: Fix use-after-free on remove
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xiaolei Wang <[email protected]>
[ Upstream commit b670bf89824ede5d07d20bb9bfbafb754846081d ]
KASAN reports a slab-use-after-free in __media_entity_remove_link() during rmmod of imx8_isi:
BUG: KASAN: slab-use-after-free in __media_entity_remove_link+0x608/0x650 Read of size 2 at addr ffff0000d47cb02a by task rmmod/724 Call trace: __media_entity_remove_link+0x608/0x650 __media_entity_remove_links+0x78/0x144 __media_device_unregister_entity+0x150/0x280 media_device_unregister_entity+0x48/0x68 v4l2_device_unregister_subdev+0x158/0x300 v4l2_async_unbind_subdev_one+0x22c/0x358 v4l2_async_nf_unbind_all_subdevs+0xfc/0x1c0 v4l2_async_nf_unregister+0x5c/0x14c mxc_isi_remove+0x124/0x2a0 [imx8_isi] Allocated by task 249: __kmalloc_noprof+0x27c/0x690 mxc_isi_crossbar_init+0x22c/0x560 [imx8_isi] Freed by task 724: kfree+0x1e4/0x5b0 mxc_isi_crossbar_cleanup+0x34/0x80 [imx8_isi] mxc_isi_remove+0x11c/0x2a0 [imx8_isi]
The problem is that mxc_isi_remove() calls mxc_isi_crossbar_cleanup() before mxc_isi_v4l2_cleanup(). The crossbar cleanup frees the media entity pads, but the subsequent v4l2 cleanup still tries to remove media links that reference those pads.
Fix this by calling mxc_isi_v4l2_cleanup() before mxc_isi_crossbar_cleanup() to ensure all media entities are properly unregistered while the pads are still valid.
--- drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c +1 -1
@@ -519,8 +519,8 @@ static void mxc_isi_remove(struct platfomxc_isi_pipe_cleanup (pipe); } -mxc_isi_crossbar_cleanup (&isi->crossbar);mxc_isi_v4l2_cleanup (isi); +mxc_isi_crossbar_cleanup (&isi->crossbar); }static const struct of_device_id mxc_isi_of_match[] = {
Greg Kroah-Hartman
maintainerPATCH 1168/1276 netfilter: ebtables: Use vmalloc_array() to improve code
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qianfeng Rong <[email protected]>
[ Upstream commit 46015e6b3ea75297b28d4806564f3f692cf11861 ]
Remove array_size() calls and replace vmalloc() with vmalloc_array() to simplify the code. vmalloc_array() is also optimized better, uses fewer instructions, and handles overflow more concisely[1].
[1]: https://lore.kernel.org/lkml/[email protected]/
Stable-dep-of: cbfe53599eeb ("netfilter: ebtables: zero chainstack array")
--- net/bridge/netfilter/ebtables.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
net/bridge/netfilter/ebtables.c +7 -7
@@ -923,8 +923,8 @@ static int translate_table(struct net *n* if an error occurs */ newinfo->chainstack = -vmalloc (array_size (nr_cpu_ids, -sizeof (*(newinfo->chainstack)))); +vmalloc_array (nr_cpu_ids, +sizeof (*(newinfo->chainstack)));if (!newinfo->chainstack)return -ENOMEM ;for_each_possible_cpu (i) {
@@ -941,7 +941,7 @@ static int translate_table(struct net *n } } - cl_s =vmalloc (array_size (udc_cnt,sizeof (*cl_s))); + cl_s =vmalloc_array (udc_cnt,sizeof (*cl_s));if (!cl_s)return -ENOMEM ; i =0 ;/* the i'th udc */
@@ -1021,8 +1021,8 @@ static int do_replace_finish(struct net* the check on the size is done later, when we have the lock */ if (repl->num_counters) { -unsigned long size = repl->num_counters *sizeof (*counterstmp); - counterstmp =vmalloc (size); + counterstmp =vmalloc_array (repl->num_counters, +sizeof (*counterstmp));if (!counterstmp)return -ENOMEM ; }
@@ -1389,7 +1389,7 @@ static int do_update_counters(struct netif (num_counters ==0 )return -EINVAL ; - tmp =vmalloc (array_size (num_counters,sizeof (*tmp))); + tmp =vmalloc_array (num_counters,sizeof (*tmp));if (!tmp)return -ENOMEM ;
@@ -1531,7 +1531,7 @@ static int copy_counters_to_user(structif (num_counters != nentries)return -EINVAL ; - counterstmp =vmalloc (array_size (nentries,sizeof (*counterstmp))); + counterstmp =vmalloc_array (nentries,sizeof (*counterstmp));if (!counterstmp)return -ENOMEM ;
Greg Kroah-Hartman
maintainerPATCH 1169/1276 netfilter: ebtables: zero chainstack array
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 cbfe53599eebffd188938ab6774cc41794f6f9d5 ]
sashiko reports:
looking at ebtables table
translation, could a sparse cpu_possible_mask lead to an uninitialized pointer free?
If cpu_possible_mask is sparse (for example, CPU 0 and CPU 2 are possible, but CPU 1 is not), the allocation loop skips CPU 1. If vmalloc_node() fails at CPU 2, the cleanup loop will blindly decrement and call vfree() on newinfo->chainstack[1].
Not a real-world bug, such allocation isn't expected to fail in the first place.
--- net/bridge/netfilter/ebtables.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/bridge/netfilter/ebtables.c +1 -2
@@ -923,8 +923,7 @@ static int translate_table(struct net *n* if an error occurs */ newinfo->chainstack = -vmalloc_array (nr_cpu_ids, -sizeof (*(newinfo->chainstack))); +vcalloc (nr_cpu_ids,sizeof (*(newinfo->chainstack)));if (!newinfo->chainstack)return -ENOMEM ;for_each_possible_cpu (i) {
Greg Kroah-Hartman
maintainerPATCH 1170/1276 Bluetooth: L2CAP: Fix not tracking outstanding TX ident
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit 6c3ea155e5ee3e56606233acde8309afda66d483 ]
This attempts to proper track outstanding request by using struct ida and allocating from it in l2cap_get_ident using ida_alloc_range which would reuse ids as they are free, then upon completion release the id using ida_free.
This fixes the qualification test case L2CAP/COS/CED/BI-29-C which attempts to check if the host stack is able to work after 256 attempts to connect which requires Ident field to use the full range of possible values in order to pass the test.
Stable-dep-of: 2641a9e0a1dd ("Bluetooth: L2CAP: cancel pending_rx_work before taking conn->lock")
--- include/net/bluetooth/l2cap.h | 3 -- net/bluetooth/l2cap_core.c | 53 ++++++++++++++++++++++++++++++------------ 2 files changed, 40 insertions(+), 16 deletions(-)
include/net/bluetooth/l2cap.h +1 -2
@@ -658,8 +658,7 @@ struct l2cap_conn {struct sk_buff *rx_skb;__u32 rx_len; -__u8 tx_ident; -struct mutex ident_lock; +struct ida tx_ida;struct sk_buff_head pending_rx;struct work_struct pending_rx_work;
net/bluetooth/l2cap_core.c +39 -14
102 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 1171/1276 Bluetooth: L2CAP: cancel pending_rx_work before taking conn->lock
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 2641a9e0a1dd4af2e21995470a21d55dd35e5203 ]
l2cap_conn_del() takes conn->lock and then calls cancel_work_sync() for pending_rx_work. process_pending_rx() takes the same mutex, so teardown can deadlock against the worker it is flushing.
This issue was found by our static analysis tool and then manually reviewed against the current tree.
The grounded PoC kept the l2cap_conn_ready() -> queue_work(..., &conn->pending_rx_work) submit path, the l2cap_conn_del() -> cancel_work_sync(&conn->pending_rx_work) teardown path, and the process_pending_rx() -> mutex_lock(&conn->lock) worker edge. Lockdep reported:
WARNING: possible circular locking dependency detected
process_pending_rx+0x21/0x2a [vuln_msv] l2cap_conn_del.constprop.0+0x3f/0x4e [vuln_msv] *** DEADLOCK ***
Cancel pending_rx_work before taking conn->lock, matching the existing lock-before-drain ordering used for the two delayed works in the same teardown path. The pending_rx queue is still purged after the work has been cancelled and conn->lock has been acquired.
--- net/bluetooth/l2cap_core.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
net/bluetooth/l2cap_core.c +2 -8
@@ -1755,19 +1755,13 @@ static void l2cap_conn_del(struct hci_codisable_delayed_work_sync (&conn->info_timer);disable_delayed_work_sync (&conn->id_addr_timer); +cancel_work_sync (&conn->pending_rx_work); +mutex_lock (&conn->lock);kfree_skb (conn->rx_skb);skb_queue_purge (&conn->pending_rx); - -/* We can not call flush_work(&conn->pending_rx_work) here since we -* might block if we are running on a worker from the same workqueue -* pending_rx_work is waiting on. -*/ -if (work_pending (&conn->pending_rx_work)) -cancel_work_sync (&conn->pending_rx_work); -ida_destroy (&conn->tx_ida);l2cap_unregister_all_users (conn);
Greg Kroah-Hartman
maintainerPATCH 1172/1276 Bluetooth: hci_core: Enable buffer flow control for SCO/eSCO
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit 13218453521d75916dfed55efb8e809bfc03cb4b ]
This enables buffer flow control for SCO/eSCO
(see: Bluetooth Core 6.0 spec: 6.22. Synchronous Flow Control Enable), recently this has caused the following problem and is actually a nice addition for the likes of Socket TX complete:
< HCI Command: Read Buffer Size (0x04|0x0005) plen 0
Quoted 1 line
HCI Event: Command Complete (
0x0e) plen 11
Read Buffer Size (0x04|0x0005) ncmd 1
Status: Success (0x00)
ACL MTU: 1021 ACL max packet: 5
SCO MTU: 240 SCO max packet: 8
...
< SCO Data TX: Handle 257 flags 0x00 dlen 120
< SCO Data TX: Handle 257 flags 0x00 dlen 120
< SCO Data TX: Handle 257 flags 0x00 dlen 120
< SCO Data TX: Handle 257 flags 0x00 dlen 120
< SCO Data TX: Handle 257 flags 0x00 dlen 120
< SCO Data TX: Handle 257 flags 0x00 dlen 120
< SCO Data TX: Handle 257 flags 0x00 dlen 120
< SCO Data TX: Handle 257 flags 0x00 dlen 120
< SCO Data TX: Handle 257 flags 0x00 dlen 120
Quoted 1 line
HCI Event: Hardware Error (
0x10) plen 1
Code: 0x0a
To fix the code will now attempt to enable buffer flow control when HCI_QUIRK_SYNC_FLOWCTL_SUPPORTED is set by the driver:
< HCI Command: Write Sync Fl.. (0x03|0x002f) plen 1
Flow control: Enabled (0x01)
Quoted 1 line
HCI Event: Command Complete (
0x0e) plen 4
Write Sync Flow Control Enable (0x03|0x002f) ncmd 1
Status: Success (0x00)On success then HCI_SCO_FLOWCTL would be set which indicates sco_cnt shall be used for flow contro.
Stable-dep-of: 12917f591cea ("Bluetooth: hci_conn: Fix null ptr deref in hci_abort_conn()")
--- include/net/bluetooth/hci.h | 13 ++++++++ include/net/bluetooth/hci_core.h | 1 net/bluetooth/hci_core.c | 62 +++++++++++++++++---------------------- net/bluetooth/hci_event.c | 2 + net/bluetooth/hci_sync.c | 24 +++++++++++++++ 5 files changed, 68 insertions(+), 34 deletions(-)
include/net/bluetooth/hci.h +13 -0
@@ -207,6 +207,13 @@ enum {*/ HCI_QUIRK_WIDEBAND_SPEECH_SUPPORTED , +/* When this quirk is set consider Sync Flow Control as supported by +* the driver. +* +* This quirk must be set before hci_register_dev is called. +*/ + HCI_QUIRK_SYNC_FLOWCTL_SUPPORTED, +/* When this quirk is set, the LE states reported through the * HCI_LE_READ_SUPPORTED_STATES are invalid/broken. *
@@ -448,6 +455,7 @@ enum {HCI_WIDEBAND_SPEECH_ENABLED ,HCI_EVENT_FILTER_CONFIGURED ,HCI_PA_SYNC , +HCI_SCO_FLOWCTL ,HCI_DUT_MODE , HCI_VENDOR_DIAG,
@@ -1545,6 +1553,11 @@ struct hci_rp_read_tx_power {__s8 tx_power; } __packed; +#define HCI_OP_WRITE_SYNC_FLOWCTL 0x0c2f +struct hci_cp_write_sync_flowctl { +__u8 enable; +} __packed; +#define HCI_OP_READ_PAGE_SCAN_TYPE 0x0c46struct hci_rp_read_page_scan_type {__u8 status;
include/net/bluetooth/hci_core.h +1 -0
@@ -1891,6 +1891,7 @@ void hci_conn_del_sysfs(struct hci_conn#define lmp_hold_capable (dev) ((dev)->features[0][0] & LMP_HOLD)#define lmp_sniff_capable (dev) ((dev)->features[0][0] & LMP_SNIFF)#define lmp_park_capable (dev) ((dev)->features[0][1] & LMP_PARK) +#define lmp_sco_capable (dev) ((dev)->features[0][1] & LMP_SCO)#define lmp_inq_rssi_capable (dev) ((dev)->features[0][3] & LMP_RSSI_INQ)#define lmp_esco_capable (dev) ((dev)->features[0][3] & LMP_ESCO)#define lmp_bredr_capable (dev) (!((dev)->features[0][4] & LMP_NO_BREDR))
net/bluetooth/hci_core.c +28 -34
102 lines not on this page · raw message
net/bluetooth/hci_event.c +2 -0
@@ -4446,9 +4446,11 @@ static void hci_num_comp_pkts_evt(structbreak ;case SCO_LINK : +case ESCO_LINK : hdev->sco_cnt += count;if (hdev->sco_cnt > hdev->sco_pkts) hdev->sco_cnt = hdev->sco_pkts; +break ;case ISO_LINK :
net/bluetooth/hci_sync.c +24 -0
@@ -3888,6 +3888,28 @@ static int hci_write_ca_timeout_sync(str sizeof(param), ¶m, HCI_CMD_TIMEOUT); } +/* Enable SCO flow control if supported */ +static int hci_write_sync_flowctl_sync (struct hci_dev *hdev) +{ +struct hci_cp_write_sync_flowctl cp; +int err; + +/* Check if the controller supports SCO and HCI_OP_WRITE_SYNC_FLOWCTL */ +if (!lmp_sco_capable (hdev) || !(hdev->commands[10 ] &BIT (4 )) || + !test_bit (HCI_QUIRK_SYNC_FLOWCTL_SUPPORTED , &hdev->quirks)) +return 0 ; + +memset (&cp,0 ,sizeof (cp)); + cp.enable =0x01 ; + + err =__hci_cmd_sync_status (hdev,HCI_OP_WRITE_SYNC_FLOWCTL , +sizeof (cp), &cp,HCI_CMD_TIMEOUT ); +if (!err) +hci_dev_set_flag (hdev,HCI_SCO_FLOWCTL ); + +return err; +} +/* BR Controller init stage 2 command sequence */ static const struct hci_init_stage br_init2[] = {/* HCI_OP_READ_BUFFER_SIZE */
@@ -3906,6 +3928,8 @@ static const struct hci_init_stage br_inHCI_INIT (hci_clear_event_filter_sync),/* HCI_OP_WRITE_CA_TIMEOUT */ HCI_INIT (hci_write_ca_timeout_sync), +/* HCI_OP_WRITE_SYNC_FLOWCTL */ + HCI_INIT(hci_write_sync_flowctl_sync), {} };
Greg Kroah-Hartman
maintainerPATCH 1173/1276 Bluetooth: separate CIS_LINK and BIS_LINK link types
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pauli Virtanen <[email protected]>
[ Upstream commit 23205562ffc8de20f57afdd984858cab29e77968 ]
Use separate link type id for unicast and broadcast ISO connections. These connection types are handled with separate HCI commands, socket API is different, and hci_conn has union fields that are different in the two cases, so they shall not be mixed up.
Currently in most places it is attempted to distinguish ucast by bacmp(&c->dst, BDADDR_ANY) but it is wrong as dst is set for bcast sink hci_conn in iso_conn_ready(). Additionally checking sync_handle might be OK, but depends on details of bcast conn configuration flow.
To avoid complicating it, use separate link types.
Stable-dep-of: 12917f591cea ("Bluetooth: hci_conn: Fix null ptr deref in hci_abort_conn()")
--- include/net/bluetooth/hci.h | 3 +- include/net/bluetooth/hci_core.h | 48 +++++++++++++++++---------------------- net/bluetooth/hci_conn.c | 41 +++++++++++++++++++-------------- net/bluetooth/hci_core.c | 21 ++++++++++------- net/bluetooth/hci_event.c | 24 ++++++++++--------- net/bluetooth/hci_sync.c | 16 ++++++++----- net/bluetooth/iso.c | 4 +-- net/bluetooth/mgmt.c | 3 +- 8 files changed, 87 insertions(+), 73 deletions(-)
include/net/bluetooth/hci.h +2 -1
@@ -558,7 +558,8 @@ enum {#define ESCO_LINK 0x02/* Low Energy links do not have defined link type. Use invented one */ #define LE_LINK 0x80 -#define ISO_LINK 0x82 +#define CIS_LINK 0x82 +#define BIS_LINK 0x83#define INVALID_LINK 0xff/* LMP features */
include/net/bluetooth/hci_core.h +21 -27
132 lines not on this page · raw message
net/bluetooth/hci_conn.c +24 -17
129 lines not on this page · raw message
net/bluetooth/hci_core.c +13 -8
@@ -2959,12 +2959,13 @@ int hci_recv_frame(struct hci_dev *hdev,break ;case HCI_ACLDATA_PKT :/* Detect if ISO packet has been sent as ACL */ -if (hci_conn_num (hdev,ISO_LINK )) { +if (hci_conn_num (hdev,CIS_LINK ) || +hci_conn_num (hdev,BIS_LINK )) {__u16 handle =__le16_to_cpu (hci_acl_hdr (skb)->handle);__u8 type; type =hci_conn_lookup_type (hdev,hci_handle (handle)); -if (type ==ISO_LINK ) +if (type ==CIS_LINK || type ==BIS_LINK )hci_skb_pkt_type (skb) =HCI_ISODATA_PKT ; }break ;
@@ -3399,7 +3400,8 @@ static inline void hci_quote_sent(structcase LE_LINK : cnt = hdev->le_mtu ? hdev->le_cnt : hdev->acl_cnt;break ; -case ISO_LINK : +case CIS_LINK : +case BIS_LINK : cnt = hdev->iso_mtu ? hdev->iso_cnt : hdev->le_mtu ? hdev->le_cnt : hdev->acl_cnt;break ;
@@ -3413,7 +3415,7 @@ static inline void hci_quote_sent(struct }static struct hci_conn *hci_low_sent (struct hci_dev *hdev,__u8 type, -int *quote) +__u8 type2,int *quote) {struct hci_conn_hash *h = &hdev->conn_hash;struct hci_conn *conn =NULL , *c;
@@ -3425,7 +3427,8 @@ static struct hci_conn *hci_low_sent(strrcu_read_lock ();list_for_each_entry_rcu (c, &h->list, list) { -if (c->type != type ||skb_queue_empty (&c->data_q)) +if ((c->type != type && c->type != type2) || +skb_queue_empty (&c->data_q))continue ;if (c->state !=BT_CONNECTED && c->state !=BT_CONFIG )
@@ -3628,7 +3631,7 @@ static void hci_sched_sco(struct hci_develse cnt = &hdev->sco_cnt; -while (*cnt && (conn =hci_low_sent (hdev, type, "e))) { +while (*cnt && (conn =hci_low_sent (hdev, type, type, "e))) {while (quote-- && (skb =skb_dequeue (&conn->data_q))) {BT_DBG ("skb %p len %d" , skb, skb->len);hci_send_frame (hdev, skb);
@@ -3756,12 +3759,14 @@ static void hci_sched_iso(struct hci_devBT_DBG ("%s" , hdev->name); -if (!hci_conn_num (hdev,ISO_LINK )) +if (!hci_conn_num (hdev,CIS_LINK ) && + !hci_conn_num (hdev,BIS_LINK ))return ; cnt = hdev->iso_pkts ? &hdev->iso_cnt : hdev->le_pkts ? &hdev->le_cnt : &hdev->acl_cnt; -while (*cnt && (conn =hci_low_sent (hdev,ISO_LINK , "e))) { +while (*cnt && (conn =hci_low_sent (hdev,CIS_LINK ,BIS_LINK , + "e))) {while (quote-- && (skb =skb_dequeue (&conn->data_q))) {BT_DBG ("skb %p len %d" , skb, skb->len);hci_send_frame (hdev, skb);
net/bluetooth/hci_event.c +13 -11
@@ -3776,7 +3776,7 @@ static void hci_unbound_cis_failed(struclockdep_assert_held (&hdev->lock);list_for_each_entry_safe (conn, tmp, &hdev->conn_hash.list, list) { -if (conn->type !=ISO_LINK || !bacmp (&conn->dst,BDADDR_ANY ) || +if (conn->type !=CIS_LINK || conn->state ==BT_OPEN || conn->iso_qos.ucast.cig != cig)continue ;
@@ -4453,7 +4453,8 @@ static void hci_num_comp_pkts_evt(structbreak ; -case ISO_LINK : +case CIS_LINK : +case BIS_LINK :if (hdev->iso_pkts) { hdev->iso_cnt += count;if (hdev->iso_cnt > hdev->iso_pkts)
@@ -6420,7 +6421,8 @@ static void hci_le_pa_sync_estabilished_ conn->sync_handle =le16_to_cpu (ev->handle); conn->sid =HCI_SID_INVALID ; - mask |=hci_proto_connect_ind (hdev, &ev->bdaddr,ISO_LINK , &flags); + mask |=hci_proto_connect_ind (hdev, &ev->bdaddr,BIS_LINK , + &flags);if (!(mask &HCI_LM_ACCEPT )) {hci_le_pa_term_sync (hdev, ev->handle); goto unlock;
@@ -6430,7 +6432,7 @@ static void hci_le_pa_sync_estabilished_ goto unlock;/* Add connection to indicate PA sync event */ - pa_sync =hci_conn_add_unset (hdev,ISO_LINK ,BDADDR_ANY , + pa_sync =hci_conn_add_unset (hdev,BIS_LINK ,BDADDR_ANY ,HCI_ROLE_SLAVE );if (IS_ERR (pa_sync))
@@ -6461,7 +6463,7 @@ static void hci_le_per_adv_report_evt(sthci_dev_lock (hdev); - mask |=hci_proto_connect_ind (hdev,BDADDR_ANY ,ISO_LINK , &flags); + mask |=hci_proto_connect_ind (hdev,BDADDR_ANY ,BIS_LINK , &flags);if (!(mask &HCI_LM_ACCEPT )) goto unlock;
@@ -6752,7 +6754,7 @@ static void hci_le_cis_estabilished_evt( goto unlock; } -if (conn->type !=ISO_LINK ) { +if (conn->type !=CIS_LINK ) {bt_dev_err (hdev,"Invalid connection link type handle 0x%4.4x" , handle);
@@ -6870,7 +6872,7 @@ static void hci_le_cis_req_evt(struct hcif (!acl) goto unlock; - mask =hci_proto_connect_ind (hdev, &acl->dst,ISO_LINK , &flags); + mask =hci_proto_connect_ind (hdev, &acl->dst,CIS_LINK , &flags);if (!(mask &HCI_LM_ACCEPT )) {hci_le_reject_cis (hdev, ev->cis_handle); goto unlock;
@@ -6878,8 +6880,8 @@ static void hci_le_cis_req_evt(struct hc cis =hci_conn_hash_lookup_handle (hdev, cis_handle);if (!cis) { - cis =hci_conn_add (hdev,ISO_LINK , &acl->dst,HCI_ROLE_SLAVE , - cis_handle); + cis =hci_conn_add (hdev,CIS_LINK , &acl->dst, +HCI_ROLE_SLAVE , cis_handle);if (IS_ERR (cis)) {hci_le_reject_cis (hdev, ev->cis_handle); goto unlock;
@@ -7017,7 +7019,7 @@ static void hci_le_big_sync_established_bt_dev_dbg (hdev,"ignore too large handle %u" , handle);continue ; } - bis =hci_conn_add (hdev,ISO_LINK ,BDADDR_ANY , + bis =hci_conn_add (hdev,BIS_LINK ,BDADDR_ANY ,HCI_ROLE_SLAVE , handle);if (IS_ERR (bis))continue ;
@@ -7076,7 +7078,7 @@ static void hci_le_big_info_adv_report_ehci_dev_lock (hdev); - mask |=hci_proto_connect_ind (hdev,BDADDR_ANY ,ISO_LINK , &flags); + mask |=hci_proto_connect_ind (hdev,BDADDR_ANY ,BIS_LINK , &flags);if (!(mask &HCI_LM_ACCEPT )) goto unlock;
net/bluetooth/hci_sync.c +10 -6
@@ -2979,7 +2979,7 @@ static int hci_le_set_ext_scan_param_synif (sent) {struct hci_conn *conn; - conn =hci_conn_hash_lookup_ba (hdev,ISO_LINK , + conn =hci_conn_hash_lookup_ba (hdev,BIS_LINK , &sent->bdaddr);if (conn) {struct bt_iso_qos *qos = &conn->iso_qos;
@@ -5596,7 +5596,7 @@ static int hci_connect_cancel_sync(strucif (conn->type ==LE_LINK )return hci_le_connect_cancel_sync (hdev, conn, reason); -if (conn->type ==ISO_LINK ) { +if (conn->type ==CIS_LINK ) {/* BLUETOOTH CORE SPECIFICATION Version 5.3 | Vol 4, Part E * page 1857: *
@@ -5609,9 +5609,10 @@ static int hci_connect_cancel_sync(strucreturn hci_disconnect_sync (hdev, conn, reason);/* CIS with no Create CIS sent have nothing to cancel */ -if (bacmp (&conn->dst,BDADDR_ANY )) -return HCI_ERROR_LOCAL_HOST_TERM ; +return HCI_ERROR_LOCAL_HOST_TERM ; + } +if (conn->type ==BIS_LINK ) {/* There is no way to cancel a BIS without terminating the BIG * which is done later on connection cleanup. */
@@ -5673,9 +5674,12 @@ static int hci_reject_conn_sync(struct h {struct hci_cp_reject_conn_req cp; -if (conn->type ==ISO_LINK ) +if (conn->type ==CIS_LINK )return hci_le_reject_cis_sync (hdev, conn, reason); +if (conn->type ==BIS_LINK ) +return -EINVAL ; +if (conn->type ==SCO_LINK || conn->type ==ESCO_LINK )return hci_reject_sco_sync (hdev, conn, reason);
@@ -7039,7 +7043,7 @@ static void create_pa_complete(struct hc goto unlock;/* Add connection to indicate PA sync error */ - pa_sync =hci_conn_add_unset (hdev,ISO_LINK ,BDADDR_ANY , + pa_sync =hci_conn_add_unset (hdev,BIS_LINK ,BDADDR_ANY ,HCI_ROLE_SLAVE );if (IS_ERR (pa_sync))
net/bluetooth/iso.c +2 -2
@@ -2211,7 +2211,7 @@ done:static void iso_connect_cfm (struct hci_conn *hcon,__u8 status) { -if (hcon->type !=ISO_LINK ) { +if (hcon->type !=CIS_LINK && hcon->type !=BIS_LINK ) {if (hcon->type !=LE_LINK )return ;
@@ -2252,7 +2252,7 @@ static void iso_connect_cfm(struct hci_cstatic void iso_disconn_cfm (struct hci_conn *hcon,__u8 reason) { -if (hcon->type !=ISO_LINK ) +if (hcon->type !=CIS_LINK && hcon->type !=BIS_LINK )return ;BT_DBG ("hcon %p reason %d" , hcon, reason);
net/bluetooth/mgmt.c +2 -1
@@ -3240,7 +3240,8 @@ failed:static u8 link_to_bdaddr (u8 link_type,u8 addr_type) {switch (link_type) { -case ISO_LINK : +case CIS_LINK : +case BIS_LINK :case LE_LINK :switch (addr_type) {case ADDR_LE_DEV_PUBLIC :
Greg Kroah-Hartman
maintainerPATCH 1174/1276 Bluetooth: hci_conn: Fix null ptr deref in hci_abort_conn()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Siwei Zhang <[email protected]>
[ Upstream commit 12917f591cea1af36087dba5b9ec888652f0b42a ]
hci_abort_conn() read hci_skb_event(hdev->sent_cmd) when a connection was pending, but hdev->sent_cmd can be NULL while req_status is still HCI_REQ_PEND, leading to a NULL pointer dereference and a general protection fault from the hci_rx_work() receive path.
Instead of inspecting hdev->sent_cmd, track the in-flight create connection command with a new per-connection HCI_CONN_CREATE flag and route all cancellation through hci_cancel_connect_sync(), which dispatches to a dedicated per-type cancel function. The create command is in exactly one of two states: still queued, or in flight. The cancel function holds cmd_sync_work_lock across the whole decision: the worker takes this lock to dequeue every entry, so while it is held a queued command cannot start running and an in-flight command cannot complete and let the next command become pending. This keeps the flag test and hci_cmd_sync_cancel() atomic with respect to the worker, so a queued command is simply dequeued, and an in-flight command owned by this connection is cancelled without the risk of cancelling an unrelated command that became pending in the meantime. CIS uses the same flag mechanism via HCI_CONN_CREATE_CIS but cannot be dequeued per-connection.
hci_acl_create_conn_sync() and hci_le_create_conn_sync() clear HCI_CONN_CREATE after the create command completes, but the command status handler can free conn via hci_conn_del() (for example when the controller rejects the connection) while the worker is still blocked on the connection complete event. Hold a reference on conn across the create command so the flag can be cleared without a use-after-free.
--- include/net/bluetooth/hci_core.h | 1 net/bluetooth/hci_conn.c | 21 ------ net/bluetooth/hci_sync.c | 133 ++++++++++++++++++++++++++++++++++----- 3 files changed, 123 insertions(+), 32 deletions(-)
include/net/bluetooth/hci_core.h +1 -0
@@ -958,6 +958,7 @@ enum {HCI_CONN_AUTH_FAILURE ,HCI_CONN_PER_ADV ,HCI_CONN_BIG_CREATED , +HCI_CONN_CREATE ,HCI_CONN_CREATE_CIS ,HCI_CONN_CREATE_BIG_SYNC , HCI_CONN_BIG_SYNC,
net/bluetooth/hci_conn.c +3 -18
@@ -2921,26 +2921,11 @@ int hci_abort_conn(struct hci_conn *conn conn->abort_reason = reason; -/* If the connection is pending check the command opcode since that -* might be blocking on hci_cmd_sync_work while waiting its respective -* event so we need to hci_cmd_sync_cancel to cancel it. -* -* hci_connect_le serializes the connection attempts so only one -* connection can be in BT_CONNECT at time. +/* Cancel the connect attempt. A return of 0 means the create command +* was still queued and got dequeued, so there is nothing to disconnect. */ -if (conn->state ==BT_CONNECT &&READ_ONCE (hdev->req_status) ==HCI_REQ_PEND ) { -switch (hci_skb_event (hdev->sent_cmd)) { -case HCI_EV_CONN_COMPLETE : -case HCI_EV_LE_CONN_COMPLETE : -case HCI_EV_LE_ENHANCED_CONN_COMPLETE : -case HCI_EVT_LE_CIS_ESTABLISHED : -hci_cmd_sync_cancel (hdev,ECANCELED ); -break ; - } -/* Cancel connect attempt if still queued/pending */ - }else if (!hci_cancel_connect_sync (hdev, conn)) { +if (!hci_cancel_connect_sync (hdev, conn))return 0 ; - }/* Run immediately if on cmd_sync_work since this may be called * as a result to MGMT_OP_DISCONNECT/MGMT_OP_UNPAIR which does
net/bluetooth/hci_sync.c +119 -14
180 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 1175/1276 Bluetooth: 6lowpan: fix cyclic locking warning on netdev unregister
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pauli Virtanen <[email protected]>
[ Upstream commit 9707a015fe8f3ba8ec7c270f3b2b8efb38823d6b ]
6lowpan.c has theoretically conflicting lock orderings, which lockdep complains about:
a) rtnl_lock > hdev->workqueue
from 6lowpan.c:delete_netdev -> rtnl_lock -> device_del
-> put_device(parent) -> hci_release_dev -> destroy_workqueue
b) hdev->workqueue > l2cap_conn->lock > chan->lock > rtnl_lock
from hci_rx_work -> 6lowpan.c:chan_ready_cb
-> lowpan_register_netdev, ifup -> rtnl_lockActual deadlock appears not possible, as hci_rx_work is disabled and l2cap_conn flushed already on hdev unregister. Hence, do minimal thing to make lockdep happy by breaking chain a) by holding hdev refcount until after netdev put in 6lowpan.c.
Fixes the lockdep complaint:
WARNING: possible circular locking dependency detected.
kworker/0:1/11 is trying to acquire lock:ffff8880023b3940 ((wq_completion)hci0#2){+.+.}-{0:0}, at: touch_wq_lockdep_map+0x8b/0x130 but task is already holding lock:ffffffff95e4f9c0 (rtnl_mutex){+.+.}-{4:4}, at: lowpan_unregister_netdev+0xd/0x30
Workqueue: events delete_netdev
Stable-dep-of: 6fef032af009 ("Bluetooth: L2CAP: Fix use-after-free in l2cap_sock_new_connection_cb()")
--- net/bluetooth/6lowpan.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-)
net/bluetooth/6lowpan.c +23 -2
@@ -759,13 +759,33 @@ static inline struct l2cap_chan *chan_nereturn chan; } +static void unregister_dev (struct lowpan_btle_dev *dev) +{ +struct hci_dev *hdev =READ_ONCE (dev->hdev); + +/* If netdev holds last reference to hci_dev (its parent device), this +* leads to theoretical cyclic locking on lowpan_unregister_netdev: +* +* rtnl_lock -> put_device(parent) -> hci_release_dev -> +* destroy_workqueue -> hci_rx_work -> l2cap_recv_acldata -> +* chan_ready_cb -> ifup -> rtnl_lock +* +* However, hci_rx_work is disabled in hci_unregister_dev, so this +* should not occur. Make lockdep happy by postponing hdev release after +* netdev put. +*/ +hci_dev_hold (hdev); +lowpan_unregister_netdev (dev->netdev); +hci_dev_put (hdev); +} +static void delete_netdev (struct work_struct *work) {struct lowpan_btle_dev *entry =container_of (work, struct lowpan_btle_dev, delete_netdev); -lowpan_unregister_netdev (entry->netdev); +unregister_dev (entry);/* The entry pointer is deleted by the netdev destructor. */ }
@@ -1254,6 +1274,7 @@ static void disconnect_devices(void)break ; new_dev->netdev = entry->netdev; + new_dev->hdev = entry->hdev;INIT_LIST_HEAD (&new_dev->list);list_add_rcu (&new_dev->list, &devices);
@@ -1265,7 +1286,7 @@ static void disconnect_devices(void)ifdown (entry->netdev);BT_DBG ("Unregistering netdev %s %p" , entry->netdev->name, entry->netdev); -lowpan_unregister_netdev (entry->netdev); +unregister_dev (entry);kfree (entry); } }
Greg Kroah-Hartman
maintainerPATCH 1176/1276 Bluetooth: L2CAP: Fix use-after-free in l2cap_sock_new_connection_cb()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Siwei Zhang <[email protected]>
[ Upstream commit 6fef032af0092ed5ccb767239a9ac1bc38c08a40 ]
l2cap_sock_new_connection_cb() returned l2cap_pi(sk)->chan after release_sock(parent). Once the parent lock is dropped the newly enqueued child socket sk is reachable via the accept queue, so another task can accept and free it before the callback dereferences sk, resulting in a use-after-free.
Rework the ->new_connection() op so the core, rather than the callback, owns the child channel's lifetime. The op now receives a pre-allocated new_chan and returns an errno instead of allocating and returning a channel. l2cap_new_connection() allocates the child channel and links it into the conn list via __l2cap_chan_add() before invoking the callback, so the conn-list reference keeps the channel alive once release_sock(parent) exposes the socket to other tasks.
Channel configuration that was duplicated in l2cap_sock_init() and the various new_connection callbacks is consolidated into l2cap_chan_set_defaults(), which now inherits from the parent channel when one is supplied.
--- include/net/bluetooth/l2cap.h | 10 ++-- net/bluetooth/6lowpan.c | 18 ------- net/bluetooth/l2cap_core.c | 78 ++++++++++++++++++++++++++----- net/bluetooth/l2cap_sock.c | 103 +++++++++++++++++++----------------------- net/bluetooth/smp.c | 27 ++--------- 5 files changed, 127 insertions(+), 109 deletions(-)
include/net/bluetooth/l2cap.h +6 -4
@@ -620,7 +620,8 @@ struct l2cap_chan {struct l2cap_ops {char *name; -struct l2cap_chan *(*new_connection) (struct l2cap_chan *chan); +int (*new_connection)(struct l2cap_chan *chan, +struct l2cap_chan *new_chan);int (*recv) (struct l2cap_chan * chan,struct sk_buff *skb);void (*teardown) (struct l2cap_chan *chan,int err);
@@ -884,9 +885,10 @@ static inline __u16 __next_seq(struct l2return (seq +1 ) % (chan->tx_win_max +1 ); } -static inline struct l2cap_chan *l2cap_chan_no_new_connection (struct l2cap_chan *chan) +static inline int l2cap_chan_no_new_connection (struct l2cap_chan *chan, +struct l2cap_chan *new_chan) { -return NULL ; +return -EOPNOTSUPP ; }static inline int l2cap_chan_no_recv (struct l2cap_chan *chan,struct sk_buff *skb)
@@ -962,7 +964,7 @@ int l2cap_chan_send(struct l2cap_chan *cvoid l2cap_chan_busy (struct l2cap_chan *chan,int busy);void l2cap_chan_rx_avail (struct l2cap_chan *chan,ssize_t rx_avail);int l2cap_chan_check_security (struct l2cap_chan *chan,bool initiator); -void l2cap_chan_set_defaults (struct l2cap_chan *chan); +void l2cap_chan_set_defaults (struct l2cap_chan *chan,struct l2cap_chan *pchan);int l2cap_ertm_init (struct l2cap_chan *chan);void l2cap_chan_add (struct l2cap_conn *conn,struct l2cap_chan *chan);void __l2cap_chan_add (struct l2cap_conn *conn,struct l2cap_chan *chan);
net/bluetooth/6lowpan.c +1 -17
@@ -631,7 +631,7 @@ static struct l2cap_chan *chan_create(voif (!chan)return NULL ; -l2cap_chan_set_defaults (chan); +l2cap_chan_set_defaults (chan,NULL ); chan->chan_type =L2CAP_CHAN_CONN_ORIENTED ; chan->mode =L2CAP_MODE_LE_FLOWCTL ;
@@ -744,21 +744,6 @@ static inline void chan_ready_cb(structifup (dev->netdev); } -static inline struct l2cap_chan *chan_new_conn_cb (struct l2cap_chan *pchan) -{ -struct l2cap_chan *chan; - - chan =chan_create (); -if (!chan) -return NULL ; - - chan->ops = pchan->ops; - -BT_DBG ("chan %p pchan %p" , chan, pchan); - -return chan; -} -static void unregister_dev (struct lowpan_btle_dev *dev) {struct hci_dev *hdev =READ_ONCE (dev->hdev);
@@ -900,7 +885,6 @@ static long chan_get_sndtimeo_cb(structstatic const struct l2cap_ops bt_6lowpan_chan_ops = { .name ="L2CAP 6LoWPAN channel" , - .new_connection = chan_new_conn_cb, .recv = chan_recv_cb, .close = chan_close_cb, .state_change = chan_state_change_cb,
net/bluetooth/l2cap_core.c +65 -13
143 lines not on this page · raw message
net/bluetooth/l2cap_sock.c +49 -54
201 lines not on this page · raw message
net/bluetooth/smp.c +6 -21
@@ -3234,34 +3234,19 @@ static const struct l2cap_ops smp_chan_o .get_sndtimeo = l2cap_chan_no_get_sndtimeo, }; -static inline struct l2cap_chan *smp_new_conn_cb (struct l2cap_chan *pchan) +static inline int smp_new_conn_cb (struct l2cap_chan *chan, +struct l2cap_chan *new_chan) { -struct l2cap_chan *chan; - -BT_DBG ("pchan %p" , pchan); - - chan =l2cap_chan_create (); -if (!chan) -return NULL ; - - chan->chan_type = pchan->chan_type; - chan->ops = &smp_chan_ops; - chan->scid = pchan->scid; - chan->dcid = chan->scid; - chan->imtu = pchan->imtu; - chan->omtu = pchan->omtu; - chan->mode = pchan->mode; + new_chan->ops = &smp_chan_ops;/* Other L2CAP channels may request SMP routines in order to * change the security level. This means that the SMP channel * lock must be considered in its own category to avoid lockdep * warnings. */ -atomic_set (&chan->nesting,L2CAP_NESTING_SMP ); - -BT_DBG ("created chan %p" , chan); +atomic_set (&new_chan->nesting,L2CAP_NESTING_SMP ); -return chan; +return 0 ; }static const struct l2cap_ops smp_root_chan_ops = {
@@ -3332,7 +3317,7 @@ create_chan:l2cap_add_scid (chan, cid); -l2cap_chan_set_defaults (chan); +l2cap_chan_set_defaults (chan,NULL );if (cid ==L2CAP_CID_SMP ) {u8 bdaddr_type;
Greg Kroah-Hartman
maintainerPATCH 1177/1276 mm: swap_cgroup: fix NULL deref in lookup_swap_cgroup_id on swapless host
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Jose Fernandez (Anthropic)" <[email protected]>
[ Upstream commit 63b02a9409cb5180398491b093e48bcb5315f5fb ]
lookup_swap_cgroup_id() passes swap_cgroup_ctrl[type].map to __swap_cgroup_id_lookup() without checking that the type was ever registered via swap_cgroup_swapon(). On a swapless host every ctrl->map is NULL, so __swap_cgroup_id_lookup() dereferences NULL + a scaled swp_offset().
Since commit bea67dcc5eea ("mm: attempt to batch free swap entries for zap_pte_range()"), zap_pte_range() -> swap_pte_batch() calls lookup_swap_cgroup_id() on any non-present, non-none PTE that decodes as a real swap entry, without first validating it against swap_info[]. A single PTE corrupted into a type-0 swap entry takes the host down at process exit.
We hit this in production on a swapless 6.12.58 host: ~1s of "get_swap_device: Bad swap file entry 3f800204222bb" (do_swap_page() being correctly defensive about the same entry) followed by
BUG: unable to handle page fault for address: 000003f800204220 RIP: 0010:lookup_swap_cgroup_id+0x2b/0x60 Call Trace: swap_pte_batch+0xbf/0x230 zap_pte_range+0x4c8/0x780 unmap_page_range+0x190/0x3e0 exit_mmap+0xd9/0x3c0 do_exit+0x20c/0x4b0
syzbot has reported the identical stack.
The source of the PTE corruption is a separate bug; this change makes the teardown path as robust as the fault path already is. Every other caller of lookup_swap_cgroup_id() is downstream of a get_swap_device() that has already validated the entry, so the new branch is cold.
--- mm/swap_cgroup.c | 6 ++++++ 1 file changed, 6 insertions(+)
mm/swap_cgroup.c +6 -0
@@ -161,8 +161,14 @@ unsigned short swap_cgroup_record(swp_en*/ unsigned short lookup_swap_cgroup_id (swp_entry_t ent) { +struct swap_cgroup_ctrl *ctrl; +if (mem_cgroup_disabled ())return 0 ; + + ctrl = &swap_cgroup_ctrl[swp_type (ent)]; +if (unlikely (!ctrl->map)) +return 0 ;return lookup_swap_cgroup (ent,NULL )->id; }
Greg Kroah-Hartman
maintainerPATCH 1178/1276 smb: client: Improve unlocking of a mutex in cifs_get_swn_reg()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Markus Elfring <[email protected]>
[ Upstream commit e2080b70c5851a132547bec3bd7dde847e649678 ]
Use two additional labels so that another bit of common code can be better reused at the end of this function implementation.
Stable-dep-of: ec457f9afe5a ("smb: client: resolve SWN tcon from live registrations")
--- fs/smb/client/cifs_swn.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
fs/smb/client/cifs_swn.c +6 -7
@@ -313,17 +313,15 @@ static struct cifs_swn_reg *cifs_get_swn reg =cifs_find_swn_reg (tcon);if (!IS_ERR (reg)) {kref_get (®->ref_count); -mutex_unlock (&cifs_swnreg_idr_mutex); -return reg; + goto unlock; }else if (PTR_ERR (reg) != -EEXIST ) { -mutex_unlock (&cifs_swnreg_idr_mutex); -return reg; + goto unlock; } reg =kmalloc (sizeof (struct cifs_swn_reg ),GFP_ATOMIC );if (reg ==NULL ) { -mutex_unlock (&cifs_swnreg_idr_mutex); -return ERR_PTR (-ENOMEM ); + ret = -ENOMEM ; + goto fail_unlock; }kref_init (®->ref_count);
@@ -354,7 +352,7 @@ static struct cifs_swn_reg *cifs_get_swn reg->ip_notify = (tcon->capabilities &SMB2_SHARE_CAP_SCALEOUT ); reg->tcon = tcon; - +unlock:mutex_unlock (&cifs_swnreg_idr_mutex);return reg;
@@ -365,6 +363,7 @@ fail_idr:idr_remove (&cifs_swnreg_idr, reg->id); fail:kfree (reg); +fail_unlock:mutex_unlock (&cifs_swnreg_idr_mutex);return ERR_PTR (ret); }
Greg Kroah-Hartman
maintainerPATCH 1179/1276 smb: client: resolve SWN tcon from live registrations
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 ec457f9afe5ae9538bdcd58fd4cb442b9787e183 ]
cifs_swn_notify() looks up a witness registration by id under cifs_swnreg_idr_mutex, drops the mutex, and then uses the registration's cached tcon pointer. That pointer is not a lifetime reference, and it is not a stable representative once cifs_get_swn_reg() lets multiple tcons for the same net/share name share one registration id.
A same-share second mount can keep the cifs_swn_reg alive after the first tcon unregisters and is freed. The registration then still points at the freed first tcon, so taking tc_lock or incrementing tc_count through swnreg->tcon only moves the use-after-free earlier. Taking tc_lock while holding cifs_swnreg_idr_mutex also violates the documented CIFS lock order.
Fix this by making the registration store only the stable witness
identity: id, net name, share name, and notify flags. When a notify arrives, copy that identity under cifs_swnreg_idr_mutex, drop the mutex, then find and pin a live witness tcon that currently matches the net/share pair under the normal cifs_tcp_ses_lock -> tc_lock order. The notification path uses that pinned tcon directly and drops the reference when done.
Registration and unregister messages now use the live tcon passed by the caller instead of a cached tcon in the registration. The final unregister send is folded into cifs_swn_unregister() while the registration is still protected by cifs_swnreg_idr_mutex. This removes the previous find/drop/reacquire raw-pointer window. The release path only removes the idr entry and frees the stable identity strings.
This preserves the intended one-registration/many-tcon behavior: a registration id represents a net/share pair, and notify handling acts on a live representative selected at use time. It also preserves CLIENT_MOVE ordering for the representative tcon because the old-IP unregister is sent before cifs_swn_register() sends the new-IP register.
--- fs/smb/client/cifs_swn.c | 314 ++++++++++++++++++++++++++++++++++++++--------- fs/smb/client/trace.h | 2 2 files changed, 262 insertions(+), 54 deletions(-)
fs/smb/client/cifs_swn.c +260 -54
@@ -28,10 +28,54 @@ struct cifs_swn_reg {bool net_name_notify;bool share_name_notify;bool ip_notify; +}; -struct cifs_tcon *tcon; +struct cifs_swn_reg_info { +int id; +unsigned int ref_count; +const char *net_name; +const char *share_name; +bool net_name_notify; +bool share_name_notify; +bool ip_notify; }; +static void cifs_swn_snapshot_reg (struct cifs_swn_reg *swnreg, +struct cifs_swn_reg_info *info) +{ + info->id = swnreg->id; + info->ref_count =kref_read (&swnreg->ref_count); + info->net_name = swnreg->net_name; + info->share_name = swnreg->share_name; + info->net_name_notify = swnreg->net_name_notify; + info->share_name_notify = swnreg->share_name_notify; + info->ip_notify = swnreg->ip_notify; +} + +static int cifs_swn_dup_reg (struct cifs_swn_reg *swnreg, +struct cifs_swn_reg_info *info) +{ +cifs_swn_snapshot_reg (swnreg, info); + + info->net_name =kstrdup (swnreg->net_name,GFP_KERNEL ); +if (!info->net_name) +return -ENOMEM ; + + info->share_name =kstrdup (swnreg->share_name,GFP_KERNEL ); +if (!info->share_name) { +kfree (info->net_name); +return -ENOMEM ; + } + +return 0 ; +} + +static void cifs_swn_free_reg_info (struct cifs_swn_reg_info *info) +{ +kfree (info->net_name); +kfree (info->share_name); +} +static int cifs_swn_auth_info_krb (struct cifs_tcon *tcon,struct sk_buff *skb) {int ret;
@@ -73,7 +117,8 @@ static int cifs_swn_auth_info_ntlm(struc* The authentication information to connect to the witness service is bundled * into the message. */ -static int cifs_swn_send_register_message (struct cifs_swn_reg *swnreg) +static int cifs_swn_send_register_message (struct cifs_swn_reg_info *swnreg, +struct cifs_tcon *tcon) {struct sk_buff *skb;struct genlmsghdr *hdr;
@@ -111,10 +156,10 @@ static int cifs_swn_send_register_messag* told to switch to it (client move message). In these cases we unregister from the * server address and register to the new address when we receive the notification. */ -if (swnreg->tcon->ses->server->use_swn_dstaddr) - addr = &swnreg->tcon->ses->server->swn_dstaddr; +if (tcon->ses->server->use_swn_dstaddr) + addr = &tcon->ses->server->swn_dstaddr;else - addr = &swnreg->tcon->ses->server->dstaddr; + addr = &tcon->ses->server->dstaddr; ret =nla_put (skb,CIFS_GENL_ATTR_SWN_IP ,sizeof (struct sockaddr_storage ), addr);if (ret <0 )
@@ -138,10 +183,10 @@ static int cifs_swn_send_register_messag goto nlmsg_fail; } - authtype =cifs_select_sectype (swnreg->tcon->ses->server, swnreg->tcon->ses->sectype); + authtype =cifs_select_sectype (tcon->ses->server, tcon->ses->sectype);switch (authtype) {case Kerberos: - ret =cifs_swn_auth_info_krb (swnreg->tcon, skb); + ret =cifs_swn_auth_info_krb (tcon, skb);if (ret <0 ) {cifs_dbg (VFS ,"%s: Failed to get kerberos auth info: %d\n" , __func__, ret); goto nlmsg_fail;
@@ -149,7 +194,7 @@ static int cifs_swn_send_register_messagbreak ;case NTLMv2:case RawNTLMSSP: - ret =cifs_swn_auth_info_ntlm (swnreg->tcon, skb); + ret =cifs_swn_auth_info_ntlm (tcon, skb);if (ret <0 ) {cifs_dbg (VFS ,"%s: Failed to get NTLM auth info: %d\n" , __func__, ret); goto nlmsg_fail;
@@ -179,7 +224,8 @@ fail:/* * Sends an uregister message to the userspace daemon based on the registration */ -static int cifs_swn_send_unregister_message (struct cifs_swn_reg *swnreg) +static int cifs_swn_send_unregister_message (struct cifs_swn_reg_info *swnreg, +struct cifs_tcon *tcon) {struct sk_buff *skb;struct genlmsghdr *hdr;
@@ -208,7 +254,7 @@ static int cifs_swn_send_unregister_mess goto nlmsg_fail; ret =nla_put (skb,CIFS_GENL_ATTR_SWN_IP ,sizeof (struct sockaddr_storage ), - &swnreg->tcon->ses->server->dstaddr); + &tcon->ses->server->dstaddr);if (ret <0 ) goto nlmsg_fail;
@@ -245,6 +291,88 @@ nlmsg_fail: }/* +* Allocation-free mirror of extract_hostname() + extract_sharename() from +* fs/smb/client/unc.c. Those helpers kmalloc(GFP_KERNEL); this runs under +* cifs_tcp_ses_lock and tcon->tc_lock, both spinlocks, so we mirror their +* parsing in place against the caller's stable net_name/share_name strings. +* Keep in sync with unc.c. +*/ +static bool cifs_swn_tcon_matches (struct cifs_tcon *tcon, +const char *net_name, +const char *share_name) +{ +const char *unc = tcon->tree_name; +const char *host, *share, *delim; +size_t host_len, share_len; + +if (!tcon->use_witness) +return false; + +/* extract_hostname: require strlen(unc) >= 3 */ +if (strnlen (unc,3 ) <3 ) +return false; +/* extract_hostname: skip all leading '\' characters */ +for (host = unc; *host =='\\' ; host++) + ; +if (!*host) +return false; + delim =strchr (host,'\\' ); +if (!delim) +return false; + host_len = delim - host; +if (strlen (net_name) != host_len || +strncasecmp (host, net_name, host_len)) +return false; + +/* extract_sharename: start at unc + 2, then first '\' onward */ + share = unc +2 ; + delim =strchr (share,'\\' ); +if (!delim) +return false; + share = delim +1 ; + share_len =strlen (share); + +return strlen (share_name) == share_len && + !strncasecmp (share, share_name, share_len); +} + +/* +* One SWN registration id represents one net/share name pair. Multiple +* mounted tcons can therefore share the id. Pick a live representative at +* use time instead of caching the first tcon pointer in the registration. +*/ +static struct cifs_tcon *cifs_swn_get_tcon (struct cifs_swn_reg_info *swnreg) +{ +struct TCP_Server_Info *server; +struct cifs_ses *ses; +struct cifs_tcon *tcon; + +spin_lock (&cifs_tcp_ses_lock); +list_for_each_entry (server, &cifs_tcp_ses_list, tcp_ses_list) { +list_for_each_entry (ses, &server->smb_ses_list, smb_ses_list) { +list_for_each_entry (tcon, &ses->tcon_list, tcon_list) { +spin_lock (&tcon->tc_lock); +if (tcon->status ==TID_EXITING || + !cifs_swn_tcon_matches (tcon, swnreg->net_name, + swnreg->share_name)) { +spin_unlock (&tcon->tc_lock); +continue ; + } + ++tcon->tc_count; +trace_smb3_tcon_ref (tcon->debug_id, + tcon->tc_count, + netfs_trace_tcon_ref_get_swn_notify); +spin_unlock (&tcon->tc_lock); +spin_unlock (&cifs_tcp_ses_lock); +return tcon; + } + } + } +spin_unlock (&cifs_tcp_ses_lock); +return NULL ; +} + +/* * Try to find a matching registration for the tcon's server name and share name. * Calls to this function must be protected by cifs_swnreg_idr_mutex. * TODO Try to avoid memory allocations
@@ -350,8 +478,6 @@ static struct cifs_swn_reg *cifs_get_swn reg->net_name_notify = true; reg->share_name_notify = true; reg->ip_notify = (tcon->capabilities &SMB2_SHARE_CAP_SCALEOUT ); - - reg->tcon = tcon; unlock:mutex_unlock (&cifs_swnreg_idr_mutex);
@@ -371,11 +497,6 @@ fail_unlock:static void cifs_swn_reg_release (struct kref *ref) { struct cifs_swn_reg *swnreg = container_of(ref, struct cifs_swn_reg, ref_count); -int ret; - - ret =cifs_swn_send_unregister_message (swnreg); -if (ret <0 ) -cifs_dbg (VFS ,"%s: Failed to send unregister message: %d\n" , __func__, ret);idr_remove (&cifs_swnreg_idr, swnreg->id);kfree (swnreg->net_name);
@@ -383,23 +504,33 @@ static void cifs_swn_reg_release(structkfree (swnreg); } -static void cifs_put_swn_reg (struct cifs_swn_reg *swnreg) +static void cifs_put_swn_reg_locked (struct cifs_swn_reg *swnreg, +struct cifs_tcon *tcon) { -mutex_lock (&cifs_swnreg_idr_mutex); +if (kref_read (&swnreg->ref_count) ==1 ) { +struct cifs_swn_reg_info swnreg_info; +int ret; + +cifs_swn_snapshot_reg (swnreg, &swnreg_info); + ret =cifs_swn_send_unregister_message (&swnreg_info, tcon); +if (ret <0 ) +cifs_dbg (VFS ,"%s: Failed to send unregister message: %d\n" , + __func__, ret); + } +kref_put (&swnreg->ref_count, cifs_swn_reg_release); -mutex_unlock (&cifs_swnreg_idr_mutex); } -static int cifs_swn_resource_state_changed (struct cifs_swn_reg *swnreg,const char *name,int state) +static int cifs_swn_resource_state_changed (struct cifs_tcon *tcon,const char *name,int state) {switch (state) {case CIFS_SWN_RESOURCE_STATE_UNAVAILABLE :cifs_dbg (FYI ,"%s: resource name '%s' become unavailable\n" , __func__, name); -cifs_signal_cifsd_for_reconnect (swnreg->tcon->ses->server, true); +cifs_signal_cifsd_for_reconnect (tcon->ses->server, true);break ;case CIFS_SWN_RESOURCE_STATE_AVAILABLE :cifs_dbg (FYI ,"%s: resource name '%s' become available\n" , __func__, name); -cifs_signal_cifsd_for_reconnect (swnreg->tcon->ses->server, true); +cifs_signal_cifsd_for_reconnect (tcon->ses->server, true);break ;case CIFS_SWN_RESOURCE_STATE_UNKNOWN :cifs_dbg (FYI ,"%s: resource name '%s' changed to unknown state\n" , __func__, name);
@@ -505,7 +636,7 @@ unlock:return ret; } -static int cifs_swn_client_move (struct cifs_swn_reg *swnreg,struct sockaddr_storage *addr) +static int cifs_swn_client_move (struct cifs_tcon *tcon,struct sockaddr_storage *addr) {struct sockaddr_in *ipv4 = (struct sockaddr_in *)addr;struct sockaddr_in6 *ipv6 = (struct sockaddr_in6 *)addr;
@@ -515,14 +646,17 @@ static int cifs_swn_client_move(struct celse if (addr->ss_family ==AF_INET6 )cifs_dbg (FYI ,"%s: move to %pI6\n" , __func__, &ipv6->sin6_addr); -return cifs_swn_reconnect (swnreg->tcon, addr); +return cifs_swn_reconnect (tcon, addr); }int cifs_swn_notify (struct sk_buff *skb,struct genl_info *info) {struct cifs_swn_reg *swnreg; +struct cifs_swn_reg_info swnreg_info; +struct cifs_tcon *tcon;char name[256 ];int type; +int ret =0 ;if (info->attrs[CIFS_GENL_ATTR_SWN_REGISTRATION_ID ]) {int swnreg_id;
@@ -530,21 +664,34 @@ int cifs_swn_notify(struct sk_buff *skb, swnreg_id =nla_get_u32 (info->attrs[CIFS_GENL_ATTR_SWN_REGISTRATION_ID ]);mutex_lock (&cifs_swnreg_idr_mutex); swnreg =idr_find (&cifs_swnreg_idr, swnreg_id); -mutex_unlock (&cifs_swnreg_idr_mutex);if (swnreg ==NULL ) { +mutex_unlock (&cifs_swnreg_idr_mutex);cifs_dbg (FYI ,"%s: registration id %d not found\n" , __func__, swnreg_id);return -EINVAL ; } + ret =cifs_swn_dup_reg (swnreg, &swnreg_info); +mutex_unlock (&cifs_swnreg_idr_mutex); +if (ret) +return ret; }else {cifs_dbg (FYI ,"%s: missing registration id attribute\n" , __func__);return -EINVAL ; } + tcon =cifs_swn_get_tcon (&swnreg_info); +if (!tcon) { +cifs_dbg (FYI ,"%s: registration id %d has no live tcon\n" , + __func__, swnreg_info.id); + ret = -ENODEV ; + goto free_info; + } +if (info->attrs[CIFS_GENL_ATTR_SWN_NOTIFICATION_TYPE ]) { type =nla_get_u32 (info->attrs[CIFS_GENL_ATTR_SWN_NOTIFICATION_TYPE ]); }else {cifs_dbg (FYI ,"%s: missing notification type attribute\n" , __func__); -return -EINVAL ; + ret = -EINVAL ; + goto out; }switch (type) {
@@ -556,15 +703,18 @@ int cifs_swn_notify(struct sk_buff *skb, sizeof(name)); }else {cifs_dbg (FYI ,"%s: missing resource name attribute\n" , __func__); -return -EINVAL ; + ret = -EINVAL ; + goto out; }if (info->attrs[CIFS_GENL_ATTR_SWN_RESOURCE_STATE ]) { state =nla_get_u32 (info->attrs[CIFS_GENL_ATTR_SWN_RESOURCE_STATE ]); }else {cifs_dbg (FYI ,"%s: missing resource state attribute\n" , __func__); -return -EINVAL ; + ret = -EINVAL ; + goto out; } -return cifs_swn_resource_state_changed (swnreg, name, state); + ret =cifs_swn_resource_state_changed (tcon, name, state); +break ; }case CIFS_SWN_NOTIFICATION_CLIENT_MOVE : {struct sockaddr_storage addr;
@@ -573,28 +723,36 @@ int cifs_swn_notify(struct sk_buff *skb,nla_memcpy (&addr, info->attrs[CIFS_GENL_ATTR_SWN_IP ],sizeof (addr)); }else {cifs_dbg (FYI ,"%s: missing IP address attribute\n" , __func__); -return -EINVAL ; + ret = -EINVAL ; + goto out; } -return cifs_swn_client_move (swnreg, &addr); + ret =cifs_swn_client_move (tcon, &addr); +break ; }default :cifs_dbg (FYI ,"%s: unknown notification type %d\n" , __func__, type);break ; } -return 0 ; +out: +cifs_put_tcon (tcon, netfs_trace_tcon_ref_put_swn_notify); +free_info: +cifs_swn_free_reg_info (&swnreg_info); +return ret; }int cifs_swn_register (struct cifs_tcon *tcon) {struct cifs_swn_reg *swnreg; +struct cifs_swn_reg_info swnreg_info;int ret; swnreg =cifs_get_swn_reg (tcon);if (IS_ERR (swnreg))return PTR_ERR (swnreg); - ret =cifs_swn_send_register_message (swnreg); +cifs_swn_snapshot_reg (swnreg, &swnreg_info); + ret =cifs_swn_send_register_message (&swnreg_info, tcon);if (ret <0 ) {cifs_dbg (VFS ,"%s: Failed to send swn register message: %d\n" , __func__, ret);/* Do not put the swnreg or return error, the echo task will retry */
@@ -615,35 +773,68 @@ int cifs_swn_unregister(struct cifs_tconreturn PTR_ERR (swnreg); } +cifs_put_swn_reg_locked (swnreg, tcon);mutex_unlock (&cifs_swnreg_idr_mutex); -cifs_put_swn_reg (swnreg); -return 0 ; } -void cifs_swn_dump (struct seq_file *m) +/* +* Snapshot one registration under cifs_swnreg_idr_mutex and return. Callers +* intentionally do the per-registration network/genlmsg work without the +* mutex held, both to keep the critical section short and to avoid nesting +* cifs_swnreg_idr_mutex inside the higher tc_lock when a live tcon is then +* pinned for the send. +*/ +static int cifs_swn_get_next_reg_info (int *id,struct cifs_swn_reg_info *info) {struct cifs_swn_reg *swnreg; +int ret =0 ; + +mutex_lock (&cifs_swnreg_idr_mutex); + swnreg =idr_get_next (&cifs_swnreg_idr, id); +if (swnreg) { + ret =cifs_swn_dup_reg (swnreg, info); +if (!ret) { + *id = swnreg->id +1 ; + ret =1 ; + } + } +mutex_unlock (&cifs_swnreg_idr_mutex); + +return ret; +} + +void cifs_swn_dump (struct seq_file *m) +{ +struct cifs_swn_reg_info swnreg_info; +struct cifs_tcon *tcon;struct sockaddr_in *sa;struct sockaddr_in6 *sa6; -int id; +int id =0 ; +int ret;seq_puts (m,"Witness registrations:" ); -mutex_lock (&cifs_swnreg_idr_mutex); -idr_for_each_entry (&cifs_swnreg_idr, swnreg, id) { +while ((ret =cifs_swn_get_next_reg_info (&id, &swnreg_info)) >0 ) {seq_printf (m,"\nId: %u Refs: %u Network name: '%s'%s Share name: '%s'%s Ip address: " , - id,kref_read (&swnreg->ref_count), - swnreg->net_name, swnreg->net_name_notify ?"(y)" :"(n)" , - swnreg->share_name, swnreg->share_name_notify ?"(y)" :"(n)" ); -switch (swnreg->tcon->ses->server->dstaddr.ss_family) { + swnreg_info.id, swnreg_info.ref_count, + swnreg_info.net_name, swnreg_info.net_name_notify ?"(y)" :"(n)" , + swnreg_info.share_name, swnreg_info.share_name_notify ?"(y)" :"(n)" ); + + tcon =cifs_swn_get_tcon (&swnreg_info); +if (!tcon) { +seq_puts (m,"(no live tcon)" ); + goto next; + } + +switch (tcon->ses->server->dstaddr.ss_family) {case AF_INET : - sa = (struct sockaddr_in *) &swnreg->tcon->ses->server->dstaddr; + sa = (struct sockaddr_in *)&tcon->ses->server->dstaddr;seq_printf (m,"%pI4" , &sa->sin_addr.s_addr);break ;case AF_INET6 : - sa6 = (struct sockaddr_in6 *) &swnreg->tcon->ses->server->dstaddr; + sa6 = (struct sockaddr_in6 *)&tcon->ses->server->dstaddr;seq_printf (m,"%pI6" , &sa6->sin6_addr.s6_addr);if (sa6->sin6_scope_id)seq_printf (m,"%%%u" , sa6->sin6_scope_id);
@@ -651,23 +842,38 @@ void cifs_swn_dump(struct seq_file *m)default :seq_puts (m,"(unknown)" ); } -seq_printf (m,"%s" , swnreg->ip_notify ?"(y)" :"(n)" ); +cifs_put_tcon (tcon, netfs_trace_tcon_ref_put_swn_notify); +next: +seq_printf (m,"%s" , swnreg_info.ip_notify ?"(y)" :"(n)" ); +cifs_swn_free_reg_info (&swnreg_info); } -mutex_unlock (&cifs_swnreg_idr_mutex); +if (ret <0 ) +seq_printf (m,"\nFailed to snapshot witness registration: %d" , ret);seq_puts (m,"\n" ); }void cifs_swn_check (void ) { -struct cifs_swn_reg *swnreg; -int id; +struct cifs_swn_reg_info swnreg_info; +struct cifs_tcon *tcon; +int id =0 ;int ret; -mutex_lock (&cifs_swnreg_idr_mutex); -idr_for_each_entry (&cifs_swnreg_idr, swnreg, id) { - ret =cifs_swn_send_register_message (swnreg); +while ((ret =cifs_swn_get_next_reg_info (&id, &swnreg_info)) >0 ) { + tcon =cifs_swn_get_tcon (&swnreg_info); +if (!tcon) { +cifs_dbg (FYI ,"%s: registration id %d has no live tcon\n" , + __func__, swnreg_info.id); + goto free_info; + } + + ret =cifs_swn_send_register_message (&swnreg_info, tcon);if (ret <0 )cifs_dbg (FYI ,"%s: Failed to send register message: %d\n" , __func__, ret); +cifs_put_tcon (tcon, netfs_trace_tcon_ref_put_swn_notify); +free_info: +cifs_swn_free_reg_info (&swnreg_info); } -mutex_unlock (&cifs_swnreg_idr_mutex); +if (ret <0 ) +cifs_dbg (FYI ,"%s: Failed to snapshot registration: %d\n" , __func__, ret); }
fs/smb/client/trace.h +2 -0
@@ -52,6 +52,7 @@ EM(netfs_trace_tcon_ref_get_find, "GET Find ") \ EM(netfs_trace_tcon_ref_get_find_sess_tcon, "GET FndSes") \ EM(netfs_trace_tcon_ref_get_reconnect_server, "GET Reconn") \ + EM(netfs_trace_tcon_ref_get_swn_notify, "GET SwnNot") \ EM(netfs_trace_tcon_ref_new, "NEW ") \ EM(netfs_trace_tcon_ref_new_ipc, "NEW Ipc ") \EM (netfs_trace_tcon_ref_new_reconnect_server,"NEW Reconn" ) \
@@ -63,6 +64,7 @@ EM(netfs_trace_tcon_ref_put_mnt_ctx, "PUT MntCtx") \ EM(netfs_trace_tcon_ref_put_dfs_refer, "PUT DfsRfr") \ EM(netfs_trace_tcon_ref_put_reconnect_server, "PUT Reconn") \ + EM(netfs_trace_tcon_ref_put_swn_notify, "PUT SwnNot") \ EM(netfs_trace_tcon_ref_put_tlink, "PUT Tlink ") \ EM(netfs_trace_tcon_ref_see_cancelled_close, "SEE Cn-Cls") \EM (netfs_trace_tcon_ref_see_fscache_collision,"SEE FV-CO!" ) \
Greg Kroah-Hartman
maintainerPATCH 1180/1276 ksmbd_vfs_rename(): vfs_path_parent_lookup() accepts ERR_PTR() as name
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 ba33ac100d3feb1efb43b32e63cc0c6430936aa3 ]
no need to check in the caller
Stable-dep-of: 1c8951963d8e ("ksmbd: fix path resolution in ksmbd_vfs_kern_path_create")
--- fs/smb/server/vfs.c | 5 ----- 1 file changed, 5 deletions(-)
fs/smb/server/vfs.c +0 -5
@@ -715,10 +715,6 @@ int ksmbd_vfs_rename(struct ksmbd_work *return -ENOMEM ; to =getname_kernel (newname); -if (IS_ERR (to)) { - err =PTR_ERR (to); - goto revert_fsids; - } retry: err = vfs_path_parent_lookup(to, lookup_flags | LOOKUP_BENEATH,
@@ -819,7 +815,6 @@ out2: } out1:putname (to); -revert_fsids:ksmbd_revert_fsids (work);return err; }
Greg Kroah-Hartman
maintainerPATCH 1181/1276 vfs: make LAST_XXX private to fs/namei.c
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jori Koolstra <[email protected]>
[ Upstream commit f2f1dddccae50f7a1d088285c53c376e26cedf67 ]
The only user of LAST_XXX outside of fs/namei.c is fs/smb/server/vfs.c; ksmbd_vfs_path_lookup() calls vfs_path_parent_lookup() and expects a LAST_NORM last type (or it will be ENOENT). ksmbd_vfs_rename() also calls vfs_path_parent_lookup() but forgets the LAST_NORM check.
It does not really make sense to have vfs_path_parent_lookup() expose the last_type because it is only needed to ensure it is LAST_NORM. So let's do this check in vfs_path_parent_lookup() instead and keep the LAST_XXX internal to fs/namei.c. This changes the ENOENT errno in ksmbd_vfs_path_lookup() to EINVAL, which matches better with how this is handled by callers of filename_parentat().
Stable-dep-of: 1c8951963d8e ("ksmbd: fix path resolution in ksmbd_vfs_kern_path_create")
--- fs/namei.c | 20 ++++++++++++++++---- fs/smb/server/vfs.c | 15 +++------------ include/linux/namei.h | 7 +------ 3 files changed, 20 insertions(+), 22 deletions(-)
fs/namei.c +16 -4
@@ -125,6 +125,11 @@#define EMBEDDED_NAME_MAX (PATH_MAX - offsetof(struct filename, iname)) +/* +* Type of the last component on LOOKUP_PARENT +*/ +enum {LAST_NORM ,LAST_ROOT ,LAST_DOT ,LAST_DOTDOT }; +struct filename *getname_flags (const char __user *filename,int flags) {
@@ -2736,15 +2741,22 @@ EXPORT_SYMBOL(kern_path);* @flags: lookup flags * @parent: pointer to struct path to fill * @last: last component -* @type: type of the last component * @root: pointer to struct path of the base directory */ int vfs_path_parent_lookup (struct filename *filename,unsigned int flags, -struct path *parent,struct qstr *last,int *type, +struct path *parent,struct qstr *last,const struct path *root) { -return __filename_parentat (AT_FDCWD , filename, flags, parent, last, - type, root); +int type; +int err =__filename_parentat (AT_FDCWD , filename, flags, parent, last, + &type, root); +if (err) +return err; +if (unlikely (type !=LAST_NORM )) { +path_put (parent); +return -EINVAL ; + } +return 0 ; }EXPORT_SYMBOL (vfs_path_parent_lookup);
fs/smb/server/vfs.c +3 -12
@@ -18,7 +18,6 @@#include <linux/vmalloc.h> #include <linux/sched/xacct.h> #include <linux/crc32c.h> -#include <linux/namei.h> #include "glob.h" #include "oplock.h"
@@ -73,7 +72,7 @@ static int ksmbd_vfs_path_lookup_locked(struct qstr last;struct filename *filename;struct path *root_share_path = &share_conf->vfs_path; -int err, type; +int err;struct dentry *d;if (pathname[0 ] =='\0' ) {
@@ -88,19 +87,13 @@ static int ksmbd_vfs_path_lookup_locked(return PTR_ERR (filename); err =vfs_path_parent_lookup (filename, flags, - parent_path, &last, &type, + parent_path, &last, root_share_path);if (err) {putname (filename);return err; } -if (unlikely (type !=LAST_NORM )) { -path_put (parent_path); -putname (filename); -return -ENOENT ; - } - err =mnt_want_write (parent_path->mnt);if (err) {path_put (parent_path);
@@ -708,7 +701,6 @@ int ksmbd_vfs_rename(struct ksmbd_work *struct filename *to;struct ksmbd_share_config *share_conf = work->tcon->share_conf;struct ksmbd_file *parent_fp; -int new_type;int err, lookup_flags =LOOKUP_NO_SYMLINKS ;if (ksmbd_override_fsids (work))
@@ -718,8 +710,7 @@ int ksmbd_vfs_rename(struct ksmbd_work * retry: err =vfs_path_parent_lookup (to, lookup_flags |LOOKUP_BENEATH , - &new_path, &new_last, &new_type, - &share_conf->vfs_path); + &new_path, &new_last, &share_conf->vfs_path);if (err) goto out1;
include/linux/namei.h +1 -6
@@ -12,11 +12,6 @@ enum { MAX_NESTED_LINKS = 8 };#define MAXSYMLINKS 40 -/* -* Type of the last component on LOOKUP_PARENT -*/ -enum {LAST_NORM ,LAST_ROOT ,LAST_DOT ,LAST_DOTDOT }; -/* pathwalk mode */ #define LOOKUP_FOLLOW 0x0001/* follow links at the end */ #define LOOKUP_DIRECTORY 0x0002/* require a directory */
@@ -63,7 +58,7 @@ extern void done_path_create(struct pathextern struct dentry *kern_path_locked (const char *,struct path *);extern struct dentry *user_path_locked_at (int ,const char __user *,struct path *);int vfs_path_parent_lookup (struct filename *filename,unsigned int flags, -struct path *parent,struct qstr *last,int *type, +struct path *parent,struct qstr *last,const struct path *root);int vfs_path_lookup (struct dentry *,struct vfsmount *,const char *,unsigned int ,struct path *);
Greg Kroah-Hartman
maintainerPATCH 1182/1276 ksmbd: fix path resolution in ksmbd_vfs_kern_path_create
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Davide Ornaghi <[email protected]>
[ Upstream commit 1c8951963d8ed357f70f59e0ad4ddce2199d2016 ]
The SMB2 open lookup is rooted at the share with LOOKUP_BENEATH, but the create/mkdir/hardlink sink is not: ksmbd_vfs_kern_path_create() builds an absolute path with convert_to_unix_name() and resolves it from AT_FDCWD via start_creating_path(), so a ".." component is walked from the real filesystem root and escapes the export.
An authenticated client races a missing path component so the rooted open lookup returns -ENOENT (taking the create branch) while the same component is present (a directory) when the create walk runs; the create then resolves ".." out of the share.
Root the create walk at the share like the lookup and rename paths already
are: resolve the parent with vfs_path_parent_lookup(..., LOOKUP_BENEATH, &share_conf->vfs_path) and create the final component with start_creating_noperm(). convert_to_unix_name() then has no callers and is removed.
--- fs/smb/server/misc.c | 33 --------------------------------- fs/smb/server/misc.h | 1 - fs/smb/server/vfs.c | 36 ++++++++++++++++++++++++++++++------ 3 files changed, 30 insertions(+), 40 deletions(-)
fs/smb/server/misc.c +0 -33
@@ -278,39 +278,6 @@ char *ksmbd_extract_sharename(struct unireturn ksmbd_casefold_sharename (um, name); } -/** -* convert_to_unix_name() - convert windows name to unix format -* @share: ksmbd_share_config pointer -* @name: file name that is relative to share -* -* Return: converted name on success, otherwise NULL -*/ -char *convert_to_unix_name (struct ksmbd_share_config *share,const char *name) -{ -int no_slash =0 , name_len, path_len; -char *new_name; - -if (name[0 ] =='/' ) - name++; - - path_len = share->path_sz; - name_len =strlen (name); - new_name =kmalloc (path_len + name_len +2 ,KSMBD_DEFAULT_GFP ); -if (!new_name) -return new_name; - -memcpy (new_name, share->path, path_len); -if (new_name[path_len -1 ] !='/' ) { - new_name[path_len] ='/' ; - no_slash =1 ; - } - -memcpy (new_name + path_len + no_slash, name, name_len); - path_len += name_len + no_slash; - new_name[path_len] =0x00 ; -return new_name; -} -char *ksmbd_convert_dir_info_name (struct ksmbd_dir_info *d_info,const struct nls_table *local_nls,int *conv_len)
fs/smb/server/misc.h +0 -1
@@ -22,7 +22,6 @@ void ksmbd_strip_last_slash(char *path);void ksmbd_conv_path_to_windows (char *path);char *ksmbd_casefold_sharename (struct unicode_map *um,const char *name);char *ksmbd_extract_sharename (struct unicode_map *um,const char *treename); -char *convert_to_unix_name (struct ksmbd_share_config *share,const char *name);#define KSMBD_DIR_INFO_ALIGNMENT 8struct ksmbd_dir_info ;
fs/smb/server/vfs.c +30 -6
@@ -1319,15 +1319,39 @@ struct dentry *ksmbd_vfs_kern_path_creatunsigned int flags, struct path *path) { - char *abs_name; + struct ksmbd_share_config *share_conf = work->tcon->share_conf; +struct qstr last; +struct filename *filename;struct dentry *dent; +int err; - abs_name =convert_to_unix_name (work->tcon->share_conf, name); -if (!abs_name) -return ERR_PTR (-ENOMEM ); +/* resolve the name beneath the share root so ".." cannot escape */ + filename =getname_kernel (name); +if (IS_ERR (filename)) +return ERR_CAST (filename); - dent =kern_path_create (AT_FDCWD , abs_name, path, flags); -kfree (abs_name); + err =vfs_path_parent_lookup (filename, flags |LOOKUP_BENEATH , + path, &last, &share_conf->vfs_path); +if (err) { +putname (filename); +return ERR_PTR (err); + } + + err =mnt_want_write (path->mnt); +if (err) { +path_put (path); +putname (filename); +return ERR_PTR (err); + } + +inode_lock_nested (path->dentry->d_inode,I_MUTEX_PARENT ); + dent =lookup_one_qstr_excl (&last, path->dentry,LOOKUP_CREATE ); +if (IS_ERR (dent)) { +inode_unlock (path->dentry->d_inode); +mnt_drop_write (path->mnt); +path_put (path); + } +putname (filename);return dent; }
Greg Kroah-Hartman
maintainerPATCH 1183/1276 ksmbd: use opener credentials for FSCTL mutations
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <[email protected]>
[ Upstream commit c6394bcaf254c5baf9aff43376020be5db6d3316 ]
SET_SPARSE, SET_ZERO_DATA and SET_COMPRESSION operate on an open SMB handle but call VFS xattr, fallocate or fileattr helpers with the current ksmbd worker credentials. Those helpers can revalidate inode permissions, ownership and LSM policy independently of the SMB handle access mask.
Run each operation with the credentials captured in the target file when the handle was opened. Keep credential handling local to these single-file FSCTLs rather than applying session credentials to the complete IOCTL handler, which also contains handle-less and multi-handle operations.
--- fs/smb/server/smb2pdu.c | 3 +++ fs/smb/server/vfs.c | 20 +++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-)
fs/smb/server/smb2pdu.c +3 -0
@@ -8204,6 +8204,7 @@ static inline int fsctl_set_sparse(strucif (fp->f_ci->m_fattr != old_fattr &&test_share_config_flag (work->tcon->share_conf,KSMBD_SHARE_FLAG_STORE_DOS_ATTRS )) { +const struct cred *saved_cred;struct xattr_dos_attrib da; ret = ksmbd_vfs_get_dos_attrib_xattr(idmap,
@@ -8212,9 +8213,11 @@ static inline int fsctl_set_sparse(struc goto out; da.attr =le32_to_cpu (fp->f_ci->m_fattr); + saved_cred =override_creds (fp->filp->f_cred); ret =ksmbd_vfs_set_dos_attrib_xattr (idmap, &fp->filp->f_path, &da, true); +revert_creds (saved_cred);if (ret) fp->f_ci->m_fattr = old_fattr; }
fs/smb/server/vfs.c +13 -7
@@ -992,15 +992,21 @@ void ksmbd_vfs_set_fadvise(struct file *int ksmbd_vfs_zero_data (struct ksmbd_work *work,struct ksmbd_file *fp,loff_t off,loff_t len) { +const struct cred *saved_cred; +int err; +smb_break_all_levII_oplock (work, fp,1 ); + saved_cred =override_creds (fp->filp->f_cred);if (fp->f_ci->m_fattr &FILE_ATTRIBUTE_SPARSE_FILE_LE ) -return vfs_fallocate (fp->filp, -FALLOC_FL_PUNCH_HOLE |FALLOC_FL_KEEP_SIZE , - off, len); - -return vfs_fallocate (fp->filp, -FALLOC_FL_ZERO_RANGE |FALLOC_FL_KEEP_SIZE , - off, len); + err =vfs_fallocate (fp->filp, +FALLOC_FL_PUNCH_HOLE |FALLOC_FL_KEEP_SIZE , + off, len); +else + err =vfs_fallocate (fp->filp, +FALLOC_FL_ZERO_RANGE |FALLOC_FL_KEEP_SIZE , + off, len); +revert_creds (saved_cred); +return err; } int ksmbd_vfs_fqar_lseek(struct ksmbd_file *fp, loff_t start, loff_t length,
Greg Kroah-Hartman
maintainerPATCH 1184/1276 ksmbd: centralize ksmbd_conn final release to plug transport leak
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: DaeMyung Kang <[email protected]>
[ Upstream commit b1f1e80620deb49daf63c2e677046599b693dc1f ]
ksmbd_conn_free() is one of four sites that can observe the last refcount drop of a struct ksmbd_conn. The other three
fs/smb/server/connection.c ksmbd_conn_r_count_dec()
fs/smb/server/oplock.c __free_opinfo()
fs/smb/server/vfs_cache.c session_fd_check()end the conn with a bare kfree(), skipping ida_destroy(&conn->async_ida) and conn->transport->ops->free_transport(conn->transport). Whenever one of them is the last putter, the embedded async_ida and the entire transport struct leak -- for TCP, that is also the struct socket and the kvec iov.
__free_opinfo() being a final putter is not theoretical. opinfo_put() queues the callback via call_rcu(&opinfo->rcu, free_opinfo_rcu), so ksmbd_server_terminate_conn() can deposit N opinfo releases in RCU and have ksmbd_conn_free() run in the handler thread before any of them fire. ksmbd_conn_free() then observes refcnt > 0 and short-circuits; the last RCU-delivered __free_opinfo() falls onto its bare kfree(conn) branch and the transport is lost.
A/B validation in a QEMU/virtme guest, mounting //127.0.0.1/testshare:
each iteration holds 8 files open via sleep processes, force-closes TCP with "ss -K sport = :445", kills the holders, lazy-umounts; repeated 10 times, then ksmbd shutdown and kmemleak scan.
state conn_alloc conn_free tcp_free opi_rcu kmemleak
---------- ---------- --------- -------- ------- --------
pre-patch 20 20 10 160 7
with patch 20 20 20 160 0Pre-patch conn_free=20 with tcp_free=10 directly demonstrates the bare-kfree paths skipping transport cleanup; kmemleak backtraces point into struct tcp_transport / iov. With this patch tcp_free matches conn_free at 20/20 and kmemleak is clean.
Move the per-struct final release into __ksmbd_conn_release_work() and route the three bare-kfree final-put sites through a new ksmbd_conn_put(). Those sites now pair ida_destroy() and free_transport() with kfree(conn) regardless of which holder happens to release the last reference. stop_sessions() only triggers the transport shutdown and does not itself drop the last conn reference, so it is unaffected.
The centralized release reaches sock_release() -> tcp_close() -> lock_sock_nested() (might_sleep) from every final putter, including __free_opinfo() invoked from an RCU softirq callback, which trips CONFIG_DEBUG_ATOMIC_SLEEP. Defer the release to a dedicated ksmbd_conn_wq workqueue so ksmbd_conn_put() is safe from any non-sleeping context.
Make ksmbd_file own a strong connection reference while fp->conn is non-NULL so durable-preserve and final-close paths cannot dereference a stale connection. ksmbd_open_fd() and ksmbd_reopen_durable_fd() take the reference via ksmbd_conn_get() (the latter also reorders the fp->conn / fp->tcon assignments before __open_id() so the published fp is never observed with fp->conn == NULL); session_fd_check() and __ksmbd_close_fd() drop it via ksmbd_conn_put(). With that invariant, session_fd_check() can take a local conn pointer once and use it across the m_op_list and lock_list iterations even though op->conn puts may otherwise drop the last reference.
At module exit the workqueue is flushed and destroyed after rcu_barrier(), so any release queued by a trailing RCU callback is drained before the inode hash and module text go away.
Stable-dep-of: c1016dd1d8b2 ("ksmbd: track the connection owning a byte-range lock")
--- fs/smb/server/connection.c | 101 ++++++++++++++++++++++++++++++++++++++------- fs/smb/server/connection.h | 6 ++ fs/smb/server/oplock.c | 7 --- fs/smb/server/server.c | 12 +++++ fs/smb/server/vfs_cache.c | 60 ++++++++++++++++++++++---- 5 files changed, 156 insertions(+), 30 deletions(-)
fs/smb/server/connection.c +86 -15
@@ -22,6 +22,81 @@ static struct ksmbd_conn_ops default_conDEFINE_HASHTABLE (conn_list,CONN_HASH_BITS );DECLARE_RWSEM (conn_list_lock); +static struct workqueue_struct *ksmbd_conn_wq; + +int ksmbd_conn_wq_init (void ) +{ + ksmbd_conn_wq =alloc_workqueue ("ksmbd-conn-release" , +WQ_UNBOUND |WQ_MEM_RECLAIM ,0 ); +if (!ksmbd_conn_wq) +return -ENOMEM ; +return 0 ; +} + +void ksmbd_conn_wq_destroy (void ) +{ +if (ksmbd_conn_wq) { +destroy_workqueue (ksmbd_conn_wq); + ksmbd_conn_wq =NULL ; + } +} + +/* +* __ksmbd_conn_release_work() - perform the final, once-per-struct cleanup +* of a ksmbd_conn whose refcount has just dropped to zero. +* +* This is the common release path used by ksmbd_conn_put() for the embedded +* state that outlives the connection thread: async_ida and the attached +* transport (which owns the socket and iov for TCP). Called from a workqueue +* so that sleep-allowed teardown (sock_release -> tcp_close -> +* lock_sock_nested) never runs from an RCU softirq callback (free_opinfo_rcu) +* or any other non-sleeping putter context. +*/ +static void __ksmbd_conn_release_work (struct work_struct *work) +{ +struct ksmbd_conn *conn = + container_of(work, struct ksmbd_conn, release_work); + +ida_destroy (&conn->async_ida); + conn->transport->ops->free_transport (conn->transport); +kfree (conn); +} + +/** +* ksmbd_conn_get() - take a reference on @conn and return it. +* +* Returns @conn unchanged so callers can write +* "fp->conn = ksmbd_conn_get(work->conn);" in one expression. Returns NULL +* if @conn is NULL. +*/ +struct ksmbd_conn *ksmbd_conn_get (struct ksmbd_conn *conn) +{ +if (!conn) +return NULL ; + +atomic_inc (&conn->refcnt); +return conn; +} + +/** +* ksmbd_conn_put() - drop a reference and, if it was the last, queue the +* release onto ksmbd_conn_wq so it runs from process context. +* +* Callable from any context including RCU softirq callbacks and non-sleeping +* locks; the actual release is deferred to the workqueue. ksmbd_conn_wq is +* created in ksmbd_server_init() before any conn can be allocated and is +* destroyed in ksmbd_server_exit() after rcu_barrier(), so it is always +* non-NULL while a conn reference is held. +*/ +void ksmbd_conn_put (struct ksmbd_conn *conn) +{ +if (!conn) +return ; + +if (atomic_dec_and_test (&conn->refcnt)) +queue_work (ksmbd_conn_wq, &conn->release_work); +} +/** * ksmbd_conn_free() - free resources of the connection instance *
@@ -36,23 +111,19 @@ void ksmbd_conn_free(struct ksmbd_conn *hash_del (&conn->hlist);up_write (&conn_list_lock); +/* +* request_buf / preauth_info / mechToken are only ever accessed by the +* connection handler thread that owns @conn. ksmbd_conn_free() is +* called from the transport free_transport() path when that thread is +* exiting, so it is safe to release them unconditionally even when +* ksmbd_conn_put() below is not the final putter (oplock / ksmbd_file +* holders only retain the conn pointer, not these per-thread buffers). +*/ xa_destroy (&conn->sessions);kvfree (conn->request_buf);kfree (conn->preauth_info);kfree (conn->mechToken); -if (atomic_dec_and_test (&conn->refcnt)) { -/* -* async_ida is embedded in struct ksmbd_conn, so pair -* ida_destroy() with the final kfree() rather than with -* the unconditional field teardown above. This keeps -* the IDA valid for the entire lifetime of the struct, -* even while other refcount holders (oplock / vfs -* durable handles) still reference the connection. -*/ -ida_destroy (&conn->async_ida); - conn->transport->ops->free_transport (conn->transport); -kfree (conn); - } +ksmbd_conn_put (conn); }/**
@@ -79,6 +150,7 @@ struct ksmbd_conn *ksmbd_conn_alloc(void conn->um =ERR_PTR (-EOPNOTSUPP );if (IS_ERR (conn->um)) conn->um =NULL ; +INIT_WORK (&conn->release_work, __ksmbd_conn_release_work);atomic_set (&conn->req_running,0 );atomic_set (&conn->r_count,0 );atomic_set (&conn->refcnt,1 );
@@ -457,8 +529,7 @@ void ksmbd_conn_r_count_dec(struct ksmbdif (!atomic_dec_return (&conn->r_count) &&waitqueue_active (&conn->r_count_q))wake_up (&conn->r_count_q); -if (atomic_dec_and_test (&conn->refcnt)) -kfree (conn); +ksmbd_conn_put (conn); }int ksmbd_conn_transport_init (void )
fs/smb/server/connection.h +6 -0
@@ -15,6 +15,7 @@#include <linux/kthread.h> #include <linux/nls.h> #include <linux/unicode.h> +#include <linux/workqueue.h> #include "smb_common.h" #include "ksmbd_work.h"
@@ -117,6 +118,7 @@ struct ksmbd_conn {bool binding;atomic_t refcnt;bool is_aapl; +struct work_struct release_work; };struct ksmbd_conn_ops {
@@ -162,6 +164,10 @@ void ksmbd_conn_wait_idle(struct ksmbd_cint ksmbd_conn_wait_idle_sess_id (struct ksmbd_conn *curr_conn,u64 sess_id);struct ksmbd_conn *ksmbd_conn_alloc (void );void ksmbd_conn_free (struct ksmbd_conn *conn); +struct ksmbd_conn *ksmbd_conn_get (struct ksmbd_conn *conn); +void ksmbd_conn_put (struct ksmbd_conn *conn); +int ksmbd_conn_wq_init (void ); +void ksmbd_conn_wq_destroy (void );bool ksmbd_conn_lookup_dialect (struct ksmbd_conn *c);int ksmbd_conn_write (struct ksmbd_work *work); int ksmbd_conn_rdma_read(struct ksmbd_conn *conn,
fs/smb/server/oplock.c +2 -5
@@ -30,7 +30,6 @@ static DEFINE_RWLOCK(lease_list_lock);static struct oplock_info *alloc_opinfo (struct ksmbd_work *work,u64 id,__u16 Tid) { -struct ksmbd_conn *conn = work->conn;struct ksmbd_session *sess = work->sess;struct oplock_info *opinfo;
@@ -39,7 +38,7 @@ static struct oplock_info *alloc_opinfo(return NULL ; opinfo->sess = sess; - opinfo->conn = conn; + opinfo->conn =ksmbd_conn_get (work->conn); opinfo->level =SMB2_OPLOCK_LEVEL_NONE ; opinfo->op_state =OPLOCK_STATE_NONE ; opinfo->pending_break =0 ;
@@ -50,7 +49,6 @@ static struct oplock_info *alloc_opinfo(init_waitqueue_head (&opinfo->oplock_brk);atomic_set (&opinfo->refcount,1 );atomic_set (&opinfo->breaking_cnt,0 ); -atomic_inc (&opinfo->conn->refcnt);return opinfo; }
@@ -132,8 +130,7 @@ static void __free_opinfo(struct oplock_ {if (opinfo->is_lease)free_lease (opinfo); -if (opinfo->conn &&atomic_dec_and_test (&opinfo->conn->refcnt)) -kfree (opinfo->conn); +ksmbd_conn_put (opinfo->conn);kfree (opinfo); }
fs/smb/server/server.c +12 -0
@@ -587,8 +587,14 @@ static int __init ksmbd_server_init(voidif (ret) goto err_crypto_destroy; + ret =ksmbd_conn_wq_init (); +if (ret) + goto err_workqueue_destroy; +return 0 ; +err_workqueue_destroy: +ksmbd_workqueue_destroy (); err_crypto_destroy:ksmbd_crypto_destroy (); err_release_inode_hash:
@@ -614,6 +620,12 @@ static void __exit ksmbd_server_exit(voi {ksmbd_server_shutdown ();rcu_barrier (); +/* +* ksmbd_conn_put() defers the final release onto ksmbd_conn_wq, +* so drain it after rcu_barrier() has fired any pending RCU +* callbacks that may have queued a release. +*/ +ksmbd_conn_wq_destroy ();ksmbd_release_inode_hash (); }
fs/smb/server/vfs_cache.c +50 -10
123 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 1185/1276 ksmbd: track the connection owning a byte-range lock
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <[email protected]>
[ Upstream commit c1016dd1d8b2bcd1158bbaabe94a31bb7e7431fb ]
SMB2_LOCK adds each granted byte-range lock to both the file lock list and the lock list of the connection which handled the request. The final close and durable handle paths, however, remove the connection list entry while holding fp->conn->llist_lock.
With SMB3 multichannel, the connection handling the LOCK request can be different from the connection which opened the file. The entry can therefore be removed under a different spinlock from the one protecting the list it belongs to. A concurrent traversal can then access freed struct ksmbd_lock and struct file_lock objects.
Record the connection owning each lock's clist entry and hold a reference to it while the entry is linked. Use that connection and its llist_lock for unlock, rollback, close, and durable preserve. Durable reconnect assigns the new connection as the owner when publishing the locks again.
--- fs/smb/server/smb2pdu.c | 10 ++++++++-- fs/smb/server/vfs_cache.c | 23 +++++++++++++++++------ fs/smb/server/vfs_cache.h | 1 + 3 files changed, 26 insertions(+), 8 deletions(-)
fs/smb/server/smb2pdu.c +8 -2
@@ -7602,9 +7602,11 @@ int smb2_lock(struct ksmbd_work *work) nolock =0 ;list_del (&cmp_lock->flist);list_del (&cmp_lock->clist); + cmp_lock->conn =NULL ;spin_unlock (&conn->llist_lock);up_read (&conn_list_lock); +ksmbd_conn_put (conn);locks_free_lock (cmp_lock->fl);kfree (cmp_lock); goto out_check_cl;
@@ -7739,6 +7741,7 @@ skip: goto out2; }else if (!rc) {list_add (&smb_lock->llist, &rollback_list); + smb_lock->conn =ksmbd_conn_get (work->conn);spin_lock (&work->conn->llist_lock);list_add_tail (&smb_lock->clist, &work->conn->lock_list);
@@ -7793,11 +7796,14 @@ out: }list_del (&smb_lock->llist); -spin_lock (&work->conn->llist_lock); + conn = smb_lock->conn; +spin_lock (&conn->llist_lock);if (!list_empty (&smb_lock->flist))list_del (&smb_lock->flist);list_del (&smb_lock->clist); -spin_unlock (&work->conn->llist_lock); + smb_lock->conn =NULL ; +spin_unlock (&conn->llist_lock); +ksmbd_conn_put (conn);locks_free_lock (smb_lock->fl);if (rlock)
fs/smb/server/vfs_cache.c +17 -6
@@ -391,10 +391,14 @@ static void __ksmbd_close_fd(struct ksmb* there are not accesses to fp->lock_list. */ list_for_each_entry_safe (smb_lock, tmp_lock, &fp->lock_list, flist) { -if (!list_empty (&smb_lock->clist) && fp->conn) { -spin_lock (&fp->conn->llist_lock); -list_del (&smb_lock->clist); -spin_unlock (&fp->conn->llist_lock); +struct ksmbd_conn *conn = smb_lock->conn; + +if (conn) { +spin_lock (&conn->llist_lock); +list_del_init (&smb_lock->clist); + smb_lock->conn =NULL ; +spin_unlock (&conn->llist_lock); +ksmbd_conn_put (conn); }list_del (&smb_lock->flist);
@@ -1086,9 +1090,15 @@ static bool session_fd_check(struct ksmbup_write (&ci->m_lock);list_for_each_entry_safe (smb_lock, tmp_lock, &fp->lock_list, flist) { -spin_lock (&conn->llist_lock); +struct ksmbd_conn *lock_conn = smb_lock->conn; + +if (!lock_conn) +continue ; +spin_lock (&lock_conn->llist_lock);list_del_init (&smb_lock->clist); -spin_unlock (&conn->llist_lock); + smb_lock->conn =NULL ; +spin_unlock (&lock_conn->llist_lock); +ksmbd_conn_put (lock_conn); } fp->conn =NULL ;
@@ -1209,6 +1219,7 @@ int ksmbd_reopen_durable_fd(struct ksmbd }list_for_each_entry (smb_lock, &fp->lock_list, flist) { + smb_lock->conn =ksmbd_conn_get (conn);spin_lock (&conn->llist_lock);list_add_tail (&smb_lock->clist, &conn->lock_list);spin_unlock (&conn->llist_lock);
fs/smb/server/vfs_cache.h +1 -0
@@ -32,6 +32,7 @@ struct ksmbd_session;struct ksmbd_lock {struct file_lock *fl; +struct ksmbd_conn *conn;struct list_head clist;struct list_head flist;struct list_head llist;
Greg Kroah-Hartman
maintainerPATCH 1186/1276 proc: rename proc_setattr to proc_nochmod_setattr
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Hellwig <[email protected]>
[ Upstream commit 690005b0b1e6b567c88b7790e6d90d4d6c9e09cc ]
What is currently proc_setattr is a special version added after the more general procfs ->seattr in commit 6d76fa58b050 ("Don't allow chmod() on the /proc/<pid>/ files"). Give it a name that reflects that to free the proc_setattr name and better describe what is doing.
Stable-dep-of: 6255da28d4bb ("proc: protect ptrace_may_access() with exec_update_lock (FD links)")
--- fs/proc/base.c | 22 +++++++++++----------- fs/proc/fd.c | 6 +++--- fs/proc/internal.h | 4 ++-- fs/proc/namespaces.c | 4 ++-- fs/proc/proc_net.c | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-)
fs/proc/base.c +11 -11
@@ -721,7 +721,7 @@ static bool proc_fd_access_allowed(strucreturn allowed; } -int proc_setattr (struct mnt_idmap *idmap,struct dentry *dentry, +int proc_nochmod_setattr (struct mnt_idmap *idmap,struct dentry *dentry,struct iattr *attr) {int error;
@@ -794,7 +794,7 @@ static int proc_pid_permission(struct mnstatic const struct inode_operations proc_def_inode_operations = { - .setattr = proc_setattr, + .setattr = proc_nochmod_setattr, };static int proc_single_show (struct seq_file *m,void *v)
@@ -1867,7 +1867,7 @@ out:const struct inode_operations proc_pid_link_inode_operations = { .readlink = proc_pid_readlink, .get_link = proc_pid_get_link, - .setattr = proc_setattr, + .setattr = proc_nochmod_setattr, };
@@ -2315,7 +2315,7 @@ proc_map_files_get_link(struct dentry *dstatic const struct inode_operations proc_map_files_link_inode_operations = { .readlink = proc_pid_readlink, .get_link = proc_map_files_get_link, - .setattr = proc_setattr, + .setattr = proc_nochmod_setattr, }; static struct dentry *
@@ -2394,7 +2394,7 @@ out:static const struct inode_operations proc_map_files_inode_operations = { .lookup = proc_map_files_lookup, .permission = proc_fd_permission, - .setattr = proc_setattr, + .setattr = proc_nochmod_setattr, }; static int
@@ -2890,7 +2890,7 @@ static struct dentry *proc_##LSM##_attr_ static const struct inode_operations proc_##LSM##_attr_dir_inode_ops = { \ .lookup = proc_##LSM##_attr_dir_lookup, \ .getattr = pid_getattr, \ - .setattr = proc_setattr, \ + .setattr = proc_nochmod_setattr, \ }#ifdef CONFIG_SECURITY_SMACK
@@ -2949,7 +2949,7 @@ static struct dentry *proc_attr_dir_lookstatic const struct inode_operations proc_attr_dir_inode_operations = { .lookup = proc_attr_dir_lookup, .getattr = pid_getattr, - .setattr = proc_setattr, + .setattr = proc_nochmod_setattr, };#endif
@@ -3454,7 +3454,7 @@ static struct dentry *proc_tgid_base_loostatic const struct inode_operations proc_tgid_base_inode_operations = { .lookup = proc_tgid_base_lookup, .getattr = pid_getattr, - .setattr = proc_setattr, + .setattr = proc_nochmod_setattr, .permission = proc_pid_permission, };
@@ -3654,7 +3654,7 @@ static int proc_tid_comm_permission(stru }static const struct inode_operations proc_tid_comm_inode_operations = { - .setattr = proc_setattr, + .setattr = proc_nochmod_setattr, .permission = proc_tid_comm_permission, };
@@ -3785,7 +3785,7 @@ static const struct file_operations procstatic const struct inode_operations proc_tid_base_inode_operations = { .lookup = proc_tid_base_lookup, .getattr = pid_getattr, - .setattr = proc_setattr, + .setattr = proc_nochmod_setattr, }; static struct dentry *proc_task_instantiate(struct dentry *dentry,
@@ -3999,7 +3999,7 @@ static loff_t proc_dir_llseek(struct filstatic const struct inode_operations proc_task_inode_operations = { .lookup = proc_task_lookup, .getattr = proc_task_getattr, - .setattr = proc_setattr, + .setattr = proc_nochmod_setattr, .permission = proc_pid_permission, };
fs/proc/fd.c +3 -3
@@ -102,7 +102,7 @@ static int proc_fdinfo_permission(structstatic const struct inode_operations proc_fdinfo_file_inode_operations = { .permission = proc_fdinfo_permission, - .setattr = proc_setattr, + .setattr = proc_nochmod_setattr, };static const struct file_operations proc_fdinfo_file_operations = {
@@ -375,7 +375,7 @@ const struct inode_operations proc_fd_in .lookup = proc_lookupfd, .permission = proc_fd_permission, .getattr = proc_fd_getattr, - .setattr = proc_setattr, + .setattr = proc_nochmod_setattr, }; static struct dentry *proc_fdinfo_instantiate(struct dentry *dentry,
@@ -416,7 +416,7 @@ static int proc_fdinfo_iterate(struct ficonst struct inode_operations proc_fdinfo_inode_operations = { .lookup = proc_lookupfdinfo, .permission = proc_fdinfo_permission, - .setattr = proc_setattr, + .setattr = proc_nochmod_setattr, };const struct file_operations proc_fdinfo_operations = {
fs/proc/internal.h +2 -2
@@ -215,8 +215,8 @@ extern int proc_pid_statm(struct seq_filextern const struct dentry_operations pid_dentry_operations;extern int pid_getattr (struct mnt_idmap *,const struct path *,struct kstat *,u32 ,unsigned int ); -extern int proc_setattr (struct mnt_idmap *,struct dentry *, -struct iattr *); +int proc_nochmod_setattr (struct mnt_idmap *idmap,struct dentry *dentry, +struct iattr *attr);extern void proc_pid_evict_inode (struct proc_inode *);extern struct inode *proc_pid_make_inode (struct super_block *,struct task_struct *,umode_t );extern void pid_update_inode (struct task_struct *,struct inode *);
fs/proc/namespaces.c +2 -2
@@ -92,7 +92,7 @@ static int proc_ns_readlink(struct dentrstatic const struct inode_operations proc_ns_link_inode_operations = { .readlink = proc_ns_readlink, .get_link = proc_ns_get_link, - .setattr = proc_setattr, + .setattr = proc_nochmod_setattr, }; static struct dentry *proc_ns_instantiate(struct dentry *dentry,
@@ -179,5 +179,5 @@ out_no_task:const struct inode_operations proc_ns_dir_inode_operations = { .lookup = proc_ns_dir_lookup, .getattr = pid_getattr, - .setattr = proc_setattr, + .setattr = proc_nochmod_setattr, };
fs/proc/proc_net.c +1 -1
@@ -322,7 +322,7 @@ static int proc_tgid_net_getattr(structconst struct inode_operations proc_net_inode_operations = { .lookup = proc_tgid_net_lookup, .getattr = proc_tgid_net_getattr, - .setattr = proc_setattr, + .setattr = proc_nochmod_setattr, };static int proc_tgid_net_readdir (struct file *file,struct dir_context *ctx)
Greg Kroah-Hartman
maintainerPATCH 1187/1276 proc: protect ptrace_may_access() with exec_update_lock (FD links)
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jann Horn <[email protected]>
[ Upstream commit 6255da28d4bb5349fe18e84cb043ccd394eba75d ]
proc_pid_get_link() and proc_pid_readlink() currently look up the task from the pid once, then do the ptrace access check on that task, then look up the task from the pid a second time to do the actual access. That's racy in several ways.
To fix it, pass the task to the ->proc_get_link() handler, and instead of proc_fd_access_allowed(), introduce a new helper call_proc_get_link() that looks up and locks the task, does the access check, and calls ->proc_get_link().
--- fs/proc/base.c | 119 ++++++++++++++++++++--------------------------------- fs/proc/fd.c | 25 ++++------- fs/proc/internal.h | 2 3 files changed, 58 insertions(+), 88 deletions(-)
fs/proc/base.c +47 -72
@@ -218,33 +218,24 @@ static int get_task_root(struct task_strreturn result; } -static int proc_cwd_link (struct dentry *dentry,struct path *path) +static int proc_cwd_link (struct dentry *dentry,struct path *path, +struct task_struct *task) { -struct task_struct *task =get_proc_task (d_inode (dentry));int result = -ENOENT ; -if (task) { -task_lock (task); -if (task->fs) { -get_fs_pwd (task->fs, path); - result =0 ; - } -task_unlock (task); -put_task_struct (task); +task_lock (task); +if (task->fs) { +get_fs_pwd (task->fs, path); + result =0 ; } +task_unlock (task);return result; } -static int proc_root_link (struct dentry *dentry,struct path *path) +static int proc_root_link (struct dentry *dentry,struct path *path, +struct task_struct *task) { -struct task_struct *task =get_proc_task (d_inode (dentry)); -int result = -ENOENT ; - -if (task) { - result =get_task_root (task, path); -put_task_struct (task); - } -return result; +return get_task_root (task, path); }/*
@@ -704,23 +695,6 @@ static int proc_pid_syscall(struct seq_f/* Here the fs part begins */ /************************************************************************/ -/* permission checks */ -static bool proc_fd_access_allowed (struct inode *inode) -{ -struct task_struct *task; -bool allowed = false; -/* Allow access to a task's file descriptors if it is us or we -* may use ptrace attach to the process and find out that -* information. -*/ - task =get_proc_task (inode); -if (task) { - allowed =ptrace_may_access (task,PTRACE_MODE_READ_FSCREDS ); -put_task_struct (task); - } -return allowed; -} -int proc_nochmod_setattr (struct mnt_idmap *idmap,struct dentry *dentry,struct iattr *attr) {
@@ -1778,16 +1752,12 @@ static const struct file_operations proc .release = single_release, }; -static int proc_exe_link (struct dentry *dentry,struct path *exe_path) +static int proc_exe_link (struct dentry *dentry,struct path *exe_path, +struct task_struct *task) { -struct task_struct *task;struct file *exe_file; - task =get_proc_task (d_inode (dentry)); -if (!task) -return -ENOENT ; exe_file =get_task_exe_file (task); -put_task_struct (task);if (exe_file) { *exe_path = exe_file->f_path;path_get (&exe_file->f_path);
@@ -1797,26 +1767,42 @@ static int proc_exe_link(struct dentry *return -ENOENT ; } +static int call_proc_get_link (struct dentry *dentry,struct inode *inode,struct path *path_out) +{ +struct task_struct *task; +int ret; + + task =get_proc_task (inode); +if (!task) +return -ENOENT ; + ret =down_read_killable (&task->signal->exec_update_lock); +if (ret) + goto out_put_task; +if (!ptrace_may_access (task,PTRACE_MODE_READ_FSCREDS )) { + ret = -EACCES ; + goto out; + } + ret =PROC_I (inode)->op.proc_get_link (dentry, path_out, task); + +out: +up_read (&task->signal->exec_update_lock); +out_put_task: +put_task_struct (task); +return ret; +} +static const char *proc_pid_get_link (struct dentry *dentry,struct inode *inode,struct delayed_call *done) {struct path path; -int error = -EACCES ; +int error;if (!dentry)return ERR_PTR (-ECHILD ); - -/* Are we allowed to snoop on the tasks file descriptors? */ -if (!proc_fd_access_allowed (inode)) - goto out; - - error =PROC_I (inode)->op.proc_get_link (dentry, &path); -if (error) - goto out; - - error =nd_jump_link (&path); -out: + error =call_proc_get_link (dentry, inode, &path); +if (!error) + error =nd_jump_link (&path);return ERR_PTR (error); }
@@ -1850,17 +1836,11 @@ static int proc_pid_readlink(struct dentstruct inode *inode =d_inode (dentry);struct path path; -/* Are we allowed to snoop on the tasks file descriptors? */ -if (!proc_fd_access_allowed (inode)) - goto out; - - error =PROC_I (inode)->op.proc_get_link (dentry, &path); -if (error) - goto out; - - error =do_proc_readlink (&path, buffer, buflen); -path_put (&path); -out: + error =call_proc_get_link (dentry, inode, &path); +if (!error) { + error =do_proc_readlink (&path, buffer, buflen); +path_put (&path); + }return error; }
@@ -2246,21 +2226,16 @@ static const struct dentry_operations ti .d_delete = pid_delete_dentry, }; -static int map_files_get_link (struct dentry *dentry,struct path *path) +static int map_files_get_link (struct dentry *dentry,struct path *path, +struct task_struct *task) {unsigned long vm_start, vm_end;struct vm_area_struct *vma; -struct task_struct *task;struct mm_struct *mm;int rc; rc = -ENOENT ; - task =get_proc_task (d_inode (dentry)); -if (!task) - goto out; - mm =get_task_mm (task); -put_task_struct (task);if (!mm) goto out;
fs/proc/fd.c +10 -15
@@ -172,24 +172,19 @@ static const struct dentry_operations ti .d_delete = pid_delete_dentry, }; -static int proc_fd_link (struct dentry *dentry,struct path *path) +static int proc_fd_link (struct dentry *dentry,struct path *path, +struct task_struct *task) { -struct task_struct *task;int ret = -ENOENT ; +unsigned int fd =proc_fd (d_inode (dentry)); +struct file *fd_file; - task =get_proc_task (d_inode (dentry)); -if (task) { -unsigned int fd =proc_fd (d_inode (dentry)); -struct file *fd_file; - - fd_file =fget_task (task, fd); -if (fd_file) { - *path = fd_file->f_path; -path_get (&fd_file->f_path); - ret =0 ; -fput (fd_file); - } -put_task_struct (task); + fd_file =fget_task (task, fd); +if (fd_file) { + *path = fd_file->f_path; +path_get (&fd_file->f_path); + ret =0 ; +fput (fd_file); }return ret;
fs/proc/internal.h +1 -1
@@ -108,7 +108,7 @@ extern struct kmem_cache *proc_dir_entryvoid pde_free (struct proc_dir_entry *pde);union proc_op { -int (*proc_get_link)(struct dentry *,struct path *); +int (*proc_get_link)(struct dentry *,struct path *,struct task_struct *);int (*proc_show)(struct seq_file *m,struct pid_namespace *ns,struct pid *pid,struct task_struct *task);
Greg Kroah-Hartman
maintainerPATCH 1188/1276 perf/x86/intel/uncore: Defer ADL global PMON enable to enable_box()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zide Chen <[email protected]>
[ Upstream commit 9a0bb848a37150aeccc10088e141339917d995dc ]
On some Raptor Cove CPUs, enabling uncore PMON globally at driver init may increase power consumption even when no perf events are in use.
Drop adl_uncore_msr_init_box() and defer programming the global control register to enable_box(), so it is only set when a box is actually used.
IMC and IMC freerunning counters use a separate control path and are unaffected.
--- arch/x86/events/intel/uncore_snb.c | 7 ------- 1 file changed, 7 deletions(-)
arch/x86/events/intel/uncore_snb.c +0 -7
@@ -538,12 +538,6 @@ void tgl_uncore_cpu_init(void) skl_uncore_msr_ops.init_box = rkl_uncore_msr_init_box; } -static void adl_uncore_msr_init_box (struct intel_uncore_box *box) -{ -if (box->pmu->pmu_idx ==0 ) -wrmsrl (ADL_UNC_PERF_GLOBAL_CTL ,SNB_UNC_GLOBAL_CTL_EN ); -} -static void adl_uncore_msr_enable_box (struct intel_uncore_box *box) {wrmsrl (ADL_UNC_PERF_GLOBAL_CTL ,SNB_UNC_GLOBAL_CTL_EN );
@@ -562,7 +556,6 @@ static void adl_uncore_msr_exit_box(stru }static struct intel_uncore_ops adl_uncore_msr_ops = { - .init_box = adl_uncore_msr_init_box, .enable_box = adl_uncore_msr_enable_box, .disable_box = adl_uncore_msr_disable_box, .exit_box = adl_uncore_msr_exit_box,
Greg Kroah-Hartman
maintainerPATCH 1189/1276 HID: add haptics page defines
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Angela Czubak <[email protected]>
[ Upstream commit 5e0ae59159e3a07391a35865bb79ff335473fa79 ]
Introduce haptic usages as defined in HID Usage Tables specification. Add HID units for newton and gram.
Stable-dep-of: 8813b0612275 ("HID: multitouch: fix out-of-bounds bit access on mt_io_flags")
--- include/linux/hid.h | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
include/linux/hid.h +29 -0
@@ -154,6 +154,7 @@ struct hid_item {#define HID_UP_TELEPHONY 0x000b0000#define HID_UP_CONSUMER 0x000c0000#define HID_UP_DIGITIZER 0x000d0000 +#define HID_UP_HAPTIC 0x000e0000#define HID_UP_PID 0x000f0000#define HID_UP_BATTERY 0x00850000#define HID_UP_CAMERA 0x00900000
@@ -314,6 +315,28 @@ struct hid_item {#define HID_DG_TOOLSERIALNUMBER 0x000d005b#define HID_DG_LATENCYMODE 0x000d0060 +#define HID_HP_SIMPLECONTROLLER 0x000e0001 +#define HID_HP_WAVEFORMLIST 0x000e0010 +#define HID_HP_DURATIONLIST 0x000e0011 +#define HID_HP_AUTOTRIGGER 0x000e0020 +#define HID_HP_MANUALTRIGGER 0x000e0021 +#define HID_HP_AUTOTRIGGERASSOCIATEDCONTROL 0x000e0022 +#define HID_HP_INTENSITY 0x000e0023 +#define HID_HP_REPEATCOUNT 0x000e0024 +#define HID_HP_RETRIGGERPERIOD 0x000e0025 +#define HID_HP_WAVEFORMVENDORPAGE 0x000e0026 +#define HID_HP_WAVEFORMVENDORID 0x000e0027 +#define HID_HP_WAVEFORMCUTOFFTIME 0x000e0028 +#define HID_HP_WAVEFORMNONE 0x000e1001 +#define HID_HP_WAVEFORMSTOP 0x000e1002 +#define HID_HP_WAVEFORMCLICK 0x000e1003 +#define HID_HP_WAVEFORMBUZZCONTINUOUS 0x000e1004 +#define HID_HP_WAVEFORMRUMBLECONTINUOUS 0x000e1005 +#define HID_HP_WAVEFORMPRESS 0x000e1006 +#define HID_HP_WAVEFORMRELEASE 0x000e1007 +#define HID_HP_VENDORWAVEFORMMIN 0x000e2001 +#define HID_HP_VENDORWAVEFORMMAX 0x000e2fff +#define HID_BAT_ABSOLUTESTATEOFCHARGE 0x00850065#define HID_BAT_CHARGING 0x00850044
@@ -420,6 +443,12 @@ struct hid_item {#define HID_BOOT_PROTOCOL 0/* +* HID units +*/ +#define HID_UNIT_GRAM 0x0101 +#define HID_UNIT_NEWTON 0xe111 + +/* * This is the global environment of the parser. This information is * persistent for main-items. The global environment can be saved and * restored with PUSH/POP statements.
Greg Kroah-Hartman
maintainerPATCH 1190/1276 HID: multitouch: fix out-of-bounds bit access on mt_io_flags
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Trung Nguyen <[email protected]>
[ Upstream commit 8813b0612275cc61fe9e6603d0ee019247ade6be ]
mt_io_flags is a single unsigned long, but mt_process_slot(), mt_release_pending_palms() and mt_release_contacts() use it as a per-slot bitmap indexed by the slot number. That slot number is only bounded by td->maxcontacts, which is taken from the device's ContactCountMaximum feature report and can be up to 255, not by BITS_PER_LONG.
As a result, a multitouch device that advertises a large contact count makes set_bit()/clear_bit() operate past the mt_io_flags word and corrupt the adjacent members of struct mt_device. The sticky-fingers release timer is the easiest way to reach this. mt_release_contacts() runs
for (i = 0; i < mt->num_slots; i++) clear_bit(i, &td->mt_io_flags);
with num_slots == maxcontacts. For maxcontacts around 250 the loop clears the bits that overlap td->applications.next, zeroing that list head, and the list_for_each_entry() that immediately follows then dereferences NULL. The kernel panics from timer (softirq) context. On a KASAN build this shows up as a general protection fault in mt_release_contacts() with a null-ptr-deref at offset 0x58, which is offsetof(struct mt_application, num_received).
The state is reachable from an untrusted USB or Bluetooth HID multitouch device; no local privileges are required.
Store the per-slot active state in a separately allocated bitmap sized for maxcontacts, the same pattern already used for pending_palm_slots, and keep only MT_IO_FLAGS_RUNNING in mt_io_flags. The two "mt_io_flags & MT_IO_SLOTS_MASK" arming checks become bitmap_empty(td->active_slots, td->maxcontacts).
Move MT_IO_FLAGS_RUNNING back to bit 0. It was bumped to bit 32 by the same commit to leave the low byte for the slot bits; with the slot bits gone it fits in bit 0 again, which also keeps it within the unsigned long on 32-bit.
--- drivers/hid/hid-multitouch.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-)
drivers/hid/hid-multitouch.c +20 -12
@@ -31,6 +31,7 @@* [1] https://gitlab.freedesktop.org/libevdev/hid-tools */ +#include <linux/bitmap.h> #include <linux/device.h> #include <linux/hid.h> #include <linux/module.h>
@@ -84,8 +85,7 @@ enum latency_mode { HID_LATENCY_HIGH = 1, }; -#define MT_IO_SLOTS_MASK GENMASK(7, 0)/* reserve first 8 bits for slot tracking */ -#define MT_IO_FLAGS_RUNNING 32 +#define MT_IO_FLAGS_RUNNING 0static const bool mtrue = true;/* default for true */ static const bool mfalse;/* default for false */
@@ -160,10 +160,9 @@ struct mt_device {struct mt_class mtclass;/* our mt device class */ struct timer_list release_timer;/* to release sticky fingers */ struct hid_device *hdev;/* hid_device we're attached to */ -unsigned long mt_io_flags;/* mt flags (MT_IO_FLAGS_RUNNING) -* first 8 bits are reserved for keeping the slot -* states, this is fine because we only support up -* to 250 slots (MT_MAX_MAXCONTACT) +unsigned long mt_io_flags;/* mt flags (MT_IO_FLAGS_RUNNING) */ +unsigned long *active_slots;/* bitmap of slots with an active +* contact, sized for maxcontacts */ __u8 inputmode_value;/* InputMode HID feature value */ __u8 maxcontacts;
@@ -968,7 +967,7 @@ static void mt_release_pending_palms(strfor_each_set_bit (slotnum, app->pending_palm_slots, td->maxcontacts) {clear_bit (slotnum, app->pending_palm_slots); -clear_bit (slotnum, &td->mt_io_flags); +clear_bit (slotnum, td->active_slots);input_mt_slot (input, slotnum);input_mt_report_slot_inactive (input);
@@ -1174,9 +1173,9 @@ static int mt_process_slot(struct mt_devinput_event (input,EV_ABS ,ABS_MT_TOUCH_MAJOR , major);input_event (input,EV_ABS ,ABS_MT_TOUCH_MINOR , minor); -set_bit (slotnum, &td->mt_io_flags); +set_bit (slotnum, td->active_slots); }else { -clear_bit (slotnum, &td->mt_io_flags); +clear_bit (slotnum, td->active_slots); }return 0 ;
@@ -1311,7 +1310,7 @@ static void mt_touch_report(struct hid_d* defect. */ if (app->quirks &MT_QUIRK_STICKY_FINGERS ) { -if (td->mt_io_flags &MT_IO_SLOTS_MASK ) +if (!bitmap_empty (td->active_slots, td->maxcontacts))mod_timer (&td->release_timer, jiffies +msecs_to_jiffies (100 ));else
@@ -1351,6 +1350,15 @@ static int mt_touch_input_configured(strif (td->is_buttonpad)__set_bit (INPUT_PROP_BUTTONPAD , input->propbit); +if (!td->active_slots) { + td->active_slots =devm_kcalloc (&td->hdev->dev, +BITS_TO_LONGS (td->maxcontacts), +sizeof (long ), +GFP_KERNEL ); +if (!td->active_slots) +return -ENOMEM ; + } + app->pending_palm_slots = devm_kcalloc(&hi->input->dev, BITS_TO_LONGS(td->maxcontacts), sizeof(long),
@@ -1815,7 +1823,7 @@ static void mt_release_contacts(struct hfor (i =0 ; i < mt->num_slots; i++) {input_mt_slot (input_dev, i);input_mt_report_slot_inactive (input_dev); -clear_bit (i, &td->mt_io_flags); +clear_bit (i, td->active_slots); }input_mt_sync_frame (input_dev);input_sync (input_dev);
@@ -1838,7 +1846,7 @@ static void mt_expired_timeout(struct ti*/ if (test_and_set_bit_lock (MT_IO_FLAGS_RUNNING , &td->mt_io_flags))return ; -if (td->mt_io_flags &MT_IO_SLOTS_MASK ) +if (!bitmap_empty (td->active_slots, td->maxcontacts))mt_release_contacts (hdev);clear_bit_unlock (MT_IO_FLAGS_RUNNING , &td->mt_io_flags); }
Greg Kroah-Hartman
maintainerPATCH 1191/1276 seqlock: Introduce scoped_seqlock_read()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Zijlstra <[email protected]>
[ Upstream commit cc39f3872c0865bef992b713338df369554fa9e0 ]
The read_seqbegin/need_seqretry/done_seqretry API is cumbersome and error prone. With the new helper the "typical" code like
int seq, nextseq;
unsigned long flags;
nextseq = 0;
do {
seq = nextseq;
flags = read_seqbegin_or_lock_irqsave(&seqlock, &seq);
// read-side critical section
nextseq = 1;
} while (need_seqretry(&seqlock, seq));
done_seqretry_irqrestore(&seqlock, seq, flags);can be rewritten as
scoped_seqlock_read (&seqlock, ss_lock_irqsave) {
// read-side critical section
}Original idea by Oleg Nesterov; with contributions from Linus.
Stable-dep-of: 6650527444da ("proc: protect ptrace_may_access() with exec_update_lock (part 1)")
--- include/linux/seqlock.h | 111 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+)
include/linux/seqlock.h +111 -0
@@ -1186,4 +1186,115 @@ done_seqretry_irqrestore(seqlock_t *lockif (seq &1 )read_sequnlock_excl_irqrestore (lock, flags); } + +enum ss_state { + ss_done =0 , + ss_lock, + ss_lock_irqsave, + ss_lockless, +}; + +struct ss_tmp { +enum ss_state state; +unsigned long data; +spinlock_t *lock; +spinlock_t *lock_irqsave; +}; + +static inline void __scoped_seqlock_cleanup (struct ss_tmp *sst) +{ +if (sst->lock) +spin_unlock (sst->lock); +if (sst->lock_irqsave) +spin_unlock_irqrestore (sst->lock_irqsave, sst->data); +} + +extern void __scoped_seqlock_invalid_target (void ); + +#if defined(CONFIG_CC_IS_GCC ) &&CONFIG_GCC_VERSION <90000 +/* +* For some reason some GCC-8 architectures (nios2, alpha) have trouble +* determining that the ss_done state is impossible in __scoped_seqlock_next() +* below. +*/ +static inline void __scoped_seqlock_bug (void ) { } +#else +/* +* Canary for compiler optimization -- if the compiler doesn't realize this is +* an impossible state, it very likely generates sub-optimal code here. +*/ +extern void __scoped_seqlock_bug (void ); +#endif + +static inline void +__scoped_seqlock_next (struct ss_tmp *sst,seqlock_t *lock,enum ss_state target) +{ +switch (sst->state) { +case ss_done: +__scoped_seqlock_bug (); +return ; + +case ss_lock: +case ss_lock_irqsave: + sst->state = ss_done; +return ; + +case ss_lockless: +if (!read_seqretry (lock, sst->data)) { + sst->state = ss_done; +return ; + } +break ; + } + +switch (target) { +case ss_done: +__scoped_seqlock_invalid_target (); +return ; + +case ss_lock: + sst->lock = &lock->lock; +spin_lock (sst->lock); + sst->state = ss_lock; +return ; + +case ss_lock_irqsave: + sst->lock_irqsave = &lock->lock; +spin_lock_irqsave (sst->lock_irqsave, sst->data); + sst->state = ss_lock_irqsave; +return ; + +case ss_lockless: + sst->data =read_seqbegin (lock); +return ; + } +} + +#define __scoped_seqlock_read (_seqlock, _target, _s) \ + for (struct ss_tmp _s __cleanup(__scoped_seqlock_cleanup) = \ + { .state = ss_lockless, .data = read_seqbegin(_seqlock) }; \ + _s.state != ss_done; \ + __scoped_seqlock_next(&_s, _seqlock, _target)) + +/** +* scoped_seqlock_read (lock, ss_state) - execute the read side critical +* section without manual sequence +* counter handling or calls to other +* helpers +* @lock: pointer to seqlock_t protecting the data +* @ss_state: one of {ss_lock, ss_lock_irqsave, ss_lockless} indicating +* the type of critical read section +* +* Example: +* +* scoped_seqlock_read (&lock, ss_lock) { +* // read-side critical section +* } +* +* Starts with a lockess pass first. If it fails, restarts the critical +* section with the lock held. +*/ +#define scoped_seqlock_read (_seqlock, _target) \ + __scoped_seqlock_read(_seqlock, _target, __UNIQUE_ID(seqlock)) +#endif /* __LINUX_SEQLOCK_H */
Greg Kroah-Hartman
maintainerPATCH 1192/1276 seqlock: Change do_task_stat() to use scoped_seqlock_read()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleg Nesterov <[email protected]>
[ Upstream commit b76f72bea2c601afec81829ea427fc0d20f83216 ]
To simplify the code and make it more readable.
Stable-dep-of: 6650527444da ("proc: protect ptrace_may_access() with exec_update_lock (part 1)")
--- fs/proc/array.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
fs/proc/array.c +2 -7
@@ -483,7 +483,6 @@ static int do_task_stat(struct seq_fileunsigned long flags;int exit_code = task->exit_code;struct signal_struct *sig = task->signal; -unsigned int seq =1 ; state = *get_task_state (task); vsize = eip = esp =0 ;
@@ -540,10 +539,7 @@ static int do_task_stat(struct seq_fileif (permitted && (!whole || num_threads <2 )) wchan = !task_is_running (task); - do { - seq++; /* 2 on the 1st/lockless path, otherwise odd */ - flags = read_seqbegin_or_lock_irqsave(&sig->stats_lock, &seq); - + scoped_seqlock_read (&sig->stats_lock, ss_lock_irqsave) { cmin_flt = sig->cmin_flt; cmaj_flt = sig->cmaj_flt; cutime = sig->cutime;
@@ -565,8 +561,7 @@ static int do_task_stat(struct seq_file }rcu_read_unlock (); } - }while (need_seqretry (&sig->stats_lock, seq)); -done_seqretry_irqrestore (&sig->stats_lock, seq, flags); + }if (whole) {thread_group_cputime_adjusted (task, &utime, &stime);
Greg Kroah-Hartman
maintainerPATCH 1193/1276 proc: protect ptrace_may_access() with exec_update_lock (part 1)
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jann Horn <[email protected]>
[ Upstream commit 6650527444dadc63d84aa939d14ecba4fadb2f69 ]
Fix the easy cases where procfs currently calls ptrace_may_access() without exec_update_lock protection, where the fix is to simply add the extra lock or use mm_access():
- do_task_stat(): grab exec_update_lock
- proc_pid_wchan(): grab exec_update_lock
- proc_map_files_lookup(): use mm_access() instead of get_task_mm()
- proc_map_files_readdir(): use mm_access() instead of get_task_mm()
- proc_ns_get_link(): grab exec_update_lock
- proc_ns_readlink(): grab exec_update_lock
--- fs/proc/array.c | 6 ++++++ fs/proc/base.c | 41 ++++++++++++++++++++++------------------- fs/proc/namespaces.c | 12 ++++++++++++ 3 files changed, 40 insertions(+), 19 deletions(-)
fs/proc/array.c +6 -0
@@ -483,6 +483,11 @@ static int do_task_stat(struct seq_fileunsigned long flags;int exit_code = task->exit_code;struct signal_struct *sig = task->signal; +int ret; + + ret =down_read_killable (&task->signal->exec_update_lock); +if (ret) +return ret; state = *get_task_state (task); vsize = eip = esp =0 ;
@@ -658,6 +663,7 @@ static int do_task_stat(struct seq_fileseq_puts (m," 0" );seq_putc (m,'\n' ); +up_read (&task->signal->exec_update_lock);if (mm)mmput (mm);return 0 ;
fs/proc/base.c +22 -19
101 lines not on this page · raw message
fs/proc/namespaces.c +12 -0
@@ -55,6 +55,10 @@ static const char *proc_ns_get_link(struif (!task)return ERR_PTR (-EACCES ); + error =down_read_killable (&task->signal->exec_update_lock); +if (error) + goto out_put_task; +if (!ptrace_may_access (task,PTRACE_MODE_READ_FSCREDS )) goto out;
@@ -64,6 +68,8 @@ static const char *proc_ns_get_link(stru error =nd_jump_link (&ns_path); out: +up_read (&task->signal->exec_update_lock); +out_put_task:put_task_struct (task);return ERR_PTR (error); }
@@ -80,11 +86,17 @@ static int proc_ns_readlink(struct dentrif (!task)return res; + res =down_read_killable (&task->signal->exec_update_lock); +if (res) + goto out_put_task; +if (ptrace_may_access (task,PTRACE_MODE_READ_FSCREDS )) { res =ns_get_name (name,sizeof (name), task, ns_ops);if (res >=0 ) res =readlink_copy (buffer, buflen, name); } +up_read (&task->signal->exec_update_lock); +out_put_task:put_task_struct (task);return res; }
Greg Kroah-Hartman
maintainerPATCH 1194/1276 treewide: Switch/rename to timer_delete[_sync]()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Gleixner <[email protected]>
[ Upstream commit 8fa7292fee5c5240402371ea89ab285ec856c916 ]
timer_delete[_sync]() replaces del_timer[_sync](). Convert the whole tree over and remove the historical wrapper inlines.
Conversion was done with coccinelle plus manual fixups where necessary.
Stable-dep-of: 75fe87e19d8a ("HID: appleir: fix UAF on pending key_up_timer in remove()")
--- drivers/hid/hid-appleir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hid/hid-appleir.c +1 -1
@@ -319,7 +319,7 @@ static void appleir_remove(struct hid_de {struct appleir *appleir =hid_get_drvdata (hid);hid_hw_stop (hid); -del_timer_sync (&appleir->key_up_timer); +timer_delete_sync (&appleir->key_up_timer); }static const struct hid_device_id appleir_devices[] = {
Greg Kroah-Hartman
maintainerPATCH 1195/1276 HID: appleir: fix UAF on pending key_up_timer in remove()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Manish Khadka <[email protected]>
[ Upstream commit 75fe87e19d8aff81eb2c64d15d244ab8da4de945 ]
appleir_remove() runs hid_hw_stop() before timer_delete_sync(). hid_hw_stop() synchronously unregisters the HID input device via hid_disconnect() -> hidinput_disconnect() -> input_unregister_device(), which drops the last reference and frees the underlying input_dev when no userspace handle holds it open.
key_up_tick() reads appleir->input_dev and calls input_report_key() / input_sync() on it. The timer is armed from appleir_raw_event() with a HZ/8 (~125 ms) timeout on every keydown and key-repeat report. If a key was pressed shortly before the device is disconnected, the timer can fire after hid_hw_stop() has freed input_dev but before the teardown drains it.
A simple reorder is not sufficient. Putting the timer drain first still leaves a window where a USB URB completion (raw_event) running during hid_hw_stop() can call mod_timer() and re-arm the timer, which then fires after hidinput_disconnect() has freed input_dev. The same URB-completion window also lets raw_event() reach key_up(), key_down() and battery_flat() directly, all of which dereference appleir->input_dev.
Introduce a 'removing' flag on struct appleir, gated by the existing spinlock. appleir_remove() sets the flag under the lock and then shuts down the timer with timer_shutdown_sync(), which both drains any in-flight callback and permanently disables further mod_timer() calls. appleir_raw_event() and key_up_tick() bail out early if the flag is set, so no path can arm or run the timer, or dereference appleir->input_dev, after remove() has started tearing down.
The keyrepeat and flatbattery branches of appleir_raw_event() previously called into the input layer without holding the spinlock; take it now so the flag check is well-defined. This incidentally closes a pre-existing read-side race on appleir->current_key in the keyrepeat branch.
This bug is structurally a sibling of commit 4db2af929279 ("HID:
appletb-kbd: fix UAF in inactivity-timer cleanup path") and has been present since the driver was introduced.
--- drivers/hid/hid-appleir.c | 45 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 10 deletions(-)
drivers/hid/hid-appleir.c +35 -10
@@ -109,9 +109,10 @@ struct appleir {struct hid_device *hid;unsigned short keymap[ARRAY_SIZE (appleir_key_table)];struct timer_list key_up_timer;/* timer for key up */ -spinlock_t lock;/* protects .current_key */ +spinlock_t lock;/* protects .current_key, .removing */ int current_key;/* the currently pressed key */ int prev_key_idx;/* key index in a 2 packets message */ +bool removing;/* set during teardown; gates input_dev access */ };static int get_key (int data)
@@ -172,7 +173,7 @@ static void key_up_tick(struct timer_lisunsigned long flags;spin_lock_irqsave (&appleir->lock, flags); -if (appleir->current_key) { +if (!appleir->removing && appleir->current_key) {key_up (hid, appleir, appleir->current_key); appleir->current_key =0 ; }
@@ -195,6 +196,10 @@ static int appleir_raw_event(struct hid_int index;spin_lock_irqsave (&appleir->lock, flags); +if (appleir->removing) { +spin_unlock_irqrestore (&appleir->lock, flags); + goto out; + }/* * If we already have a key down, take it up before marking * this one down
@@ -229,17 +234,25 @@ static int appleir_raw_event(struct hid_ appleir->prev_key_idx =0 ;if (!memcmp (data, keyrepeat,sizeof (keyrepeat))) { -key_down (hid, appleir, appleir->current_key); -/* -* Remote doesn't do key up, either pull them up, in the test -* above, or here set a timer which pulls them up after 1/8 s -*/ -mod_timer (&appleir->key_up_timer, jiffies +HZ /8 ); +spin_lock_irqsave (&appleir->lock, flags); +if (!appleir->removing) { +key_down (hid, appleir, appleir->current_key); +/* +* Remote doesn't do key up, either pull them up, in +* the test above, or here set a timer which pulls them +* up after 1/8 s +*/ +mod_timer (&appleir->key_up_timer, jiffies +HZ /8 ); + } +spin_unlock_irqrestore (&appleir->lock, flags); goto out; }if (!memcmp (data, flatbattery,sizeof (flatbattery))) { -battery_flat (appleir); +spin_lock_irqsave (&appleir->lock, flags); +if (!appleir->removing) +battery_flat (appleir); +spin_unlock_irqrestore (&appleir->lock, flags);/* Fall through */ }
@@ -318,8 +331,20 @@ fail:static void appleir_remove (struct hid_device *hid) {struct appleir *appleir =hid_get_drvdata (hid); +unsigned long flags; + +/* +* Mark the driver as tearing down so that any concurrent raw_event +* (e.g. from a USB URB completion that hid_hw_stop() has not yet +* killed) and the key_up_timer softirq stop touching input_dev +* before hid_hw_stop() frees it via hidinput_disconnect(). +*/ +spin_lock_irqsave (&appleir->lock, flags); + appleir->removing = true; +spin_unlock_irqrestore (&appleir->lock, flags); + +timer_shutdown_sync (&appleir->key_up_timer);hid_hw_stop (hid); -timer_delete_sync (&appleir->key_up_timer); }static const struct hid_device_id appleir_devices[] = {
Greg Kroah-Hartman
maintainerPATCH 1196/1276 HID: pidff: Fix missing blank lines after declarations
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomasz Pakuła <[email protected]>
[ Upstream commit 42a2bd61650f13605f9283b5a9e6b1a26b7d4ec2 ]
Fixes chackpatch.pl warnings
Stable-dep-of: b251598b8bf3 ("HID: pidff: Use correct effect type in effect update")
--- drivers/hid/usbhid/hid-pidff.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/hid/usbhid/hid-pidff.c +4 -1
@@ -249,8 +249,8 @@ static u32 pidff_rescale_time(u16 time, {u32 scaled_time = time;int exponent = field->unit_exponent; -pr_debug ("time field exponent: %d\n" , exponent); +pr_debug ("time field exponent: %d\n" , exponent);for (;exponent <FF_TIME_EXPONENT ; exponent++) scaled_time *=10 ;for (;exponent >FF_TIME_EXPONENT ; exponent--)
@@ -354,6 +354,7 @@ static int pidff_needs_set_envelope(stru struct ff_envelope *old) {bool needs_new_envelope; + needs_new_envelope = envelope->attack_level !=0 || envelope->fade_level !=0 || envelope->attack_length != 0 ||
@@ -733,6 +734,7 @@ static void pidff_playback_pid(struct pistatic int pidff_playback (struct input_dev *dev,int effect_id,int value) {struct pidff_device *pidff = dev->ff->private; +pidff_playback_pid (pidff, pidff->pid_id[effect_id], value);return 0 ; }
@@ -1233,6 +1235,7 @@ static int pidff_find_effects(struct pidfor (i =0 ; i <sizeof (pidff_effect_types); i++) {int pidff_type = pidff->type_id[i]; +if (pidff->set_effect_type->usage[pidff_type].hid != pidff->create_new_effect_type->usage[pidff_type].hid) { hid_err(pidff->hid,
Greg Kroah-Hartman
maintainerPATCH 1197/1276 HID: pidff: Add missing spaces
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomasz Pakuła <[email protected]>
[ Upstream commit 61ea33ded9327a07d9ef85a6933cb6316e2f185f ]
Fixes checkpatch.pl errors
Stable-dep-of: b251598b8bf3 ("HID: pidff: Use correct effect type in effect update")
--- drivers/hid/usbhid/hid-pidff.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/hid/usbhid/hid-pidff.c +5 -5
@@ -251,9 +251,9 @@ static u32 pidff_rescale_time(u16 time,int exponent = field->unit_exponent;pr_debug ("time field exponent: %d\n" , exponent); -for (;exponent <FF_TIME_EXPONENT ; exponent++) +for (; exponent <FF_TIME_EXPONENT ; exponent++) scaled_time *=10 ; -for (;exponent >FF_TIME_EXPONENT ; exponent--) +for (; exponent >FF_TIME_EXPONENT ; exponent--) scaled_time /=10 ;pr_debug ("time calculated from %d to %d\n" , time, scaled_time);
@@ -587,7 +587,7 @@ static void pidff_set_device_control(strhid_dbg (pidff->hid,"DEVICE_CONTROL is a bitmask\n" );/* Clear current bitmask */ -for (i =0 ; i <sizeof (pidff_device_control); i++) { +for (i =0 ; i <sizeof (pidff_device_control); i++) { index = pidff->control_id[i];if (index <1 )continue ;
@@ -638,7 +638,7 @@ static void pidff_fetch_pool(struct pidfstruct hid_device *hid = pidff->hid;/* Repeat if PID_SIMULTANEOUS_MAX < 2 to make sure it's correct */ -for (i =0 ; i <20 ; i++) { +for (i =0 ; i <20 ; i++) {hid_hw_request (hid, pidff->reports[PID_POOL ],HID_REQ_GET_REPORT );hid_hw_wait (hid);
@@ -869,7 +869,7 @@ static int pidff_upload_effect(struct incase FF_INERTIA :case FF_FRICTION :if (!old) { -switch (effect->type) { +switch (effect->type) {case FF_SPRING : type_id =PID_SPRING ;break ;
Greg Kroah-Hartman
maintainerPATCH 1198/1276 HID: pidff: Rework pidff_upload_effect
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomasz Pakuła <[email protected]>
[ Upstream commit 7fbaa031b94182a9c9e58310935a2f74265ef78d ]
One of the more complicated functions. Expunge some of the logic to separate functions (FF -> PID id conversion)
Add a macro for envelope check to make it more readable in the upload function.
All this made it possible to to expunge common code from the big switch statement and reduce the overall function size considerably. Now it can fit on one screen.
Move the effect_cout logic from report functions to upload/erase functions.
Stable-dep-of: b251598b8bf3 ("HID: pidff: Use correct effect type in effect update")
--- drivers/hid/usbhid/hid-pidff.c | 243 +++++++++++++++++++---------------------- 1 file changed, 115 insertions(+), 128 deletions(-)
drivers/hid/usbhid/hid-pidff.c +115 -128
@@ -141,7 +141,7 @@ static const u8 pidff_effect_types[] = {#define PID_BLOCK_LOAD_SUCCESS 0#define PID_BLOCK_LOAD_FULL 1#define PID_BLOCK_LOAD_ERROR 2 -static const u8 pidff_block_load_status[] = {0x8c ,0x8d ,0x8e }; +static const u8 pidff_block_load_status[] = {0x8c ,0x8d ,0x8e };#define PID_EFFECT_START 0#define PID_EFFECT_STOP 1
@@ -214,6 +214,62 @@ static int pidff_is_effect_conditional(s }/* +* Get PID effect index from FF effect type. +* Return 0 if invalid. +*/ +static int pidff_effect_ff_to_pid (struct ff_effect *effect) +{ +switch (effect->type) { +case FF_CONSTANT : +return PID_CONSTANT ; +case FF_RAMP : +return PID_RAMP ; +case FF_SPRING : +return PID_SPRING ; +case FF_DAMPER : +return PID_DAMPER ; +case FF_INERTIA : +return PID_INERTIA ; +case FF_FRICTION : +return PID_FRICTION ; +case FF_PERIODIC : +switch (effect->u.periodic.waveform) { +case FF_SQUARE : +return PID_SQUARE ; +case FF_TRIANGLE : +return PID_TRIANGLE ; +case FF_SINE : +return PID_SINE ; +case FF_SAW_UP : +return PID_SAW_UP ; +case FF_SAW_DOWN : +return PID_SAW_DOWN ; + } + } +pr_err ("invalid effect type\n" ); +return -EINVAL ; +} + +/* +* Get effect id in the device descriptor. +* Return 0 if invalid. +*/ +static int pidff_get_effect_type_id (struct pidff_device *pidff, +struct ff_effect *effect) +{ +int id =pidff_effect_ff_to_pid (effect); + +if (id <0 ) +return 0 ; + +if (effect->type ==FF_PERIODIC && + pidff->quirks &HID_PIDFF_QUIRK_PERIODIC_SINE_ONLY ) + id =PID_SINE ; + +return pidff->type_id[id]; +} + +/* * Clamp value for a given field */ static s32 pidff_clamp (s32 i,struct hid_field *field)
@@ -335,16 +391,16 @@ static void pidff_set_envelope_report(st pidff->set_envelope[PID_FADE_LEVEL].field);pidff_set_time (&pidff->set_envelope[PID_ATTACK_TIME ], - envelope->attack_length); + envelope->attack_length);pidff_set_time (&pidff->set_envelope[PID_FADE_TIME ], - envelope->fade_length); + envelope->fade_length);hid_dbg (pidff->hid,"attack %u => %d\n" , envelope->attack_level, pidff->set_envelope[PID_ATTACK_LEVEL ].value[0 ]);hid_hw_request (pidff->hid, pidff->reports[PID_SET_ENVELOPE ], -HID_REQ_SET_REPORT ); +HID_REQ_SET_REPORT ); }/*
@@ -353,7 +409,7 @@ static void pidff_set_envelope_report(ststatic int pidff_needs_set_envelope (struct ff_envelope *envelope,struct ff_envelope *old) { -bool needs_new_envelope; +int needs_new_envelope; needs_new_envelope = envelope->attack_level !=0 || envelope->fade_level != 0 ||
@@ -361,8 +417,7 @@ static int pidff_needs_set_envelope(stru envelope->fade_length !=0 ;if (!needs_new_envelope) -return false; - +return 0 ;if (!old)return needs_new_envelope;
@@ -375,8 +430,8 @@ static int pidff_needs_set_envelope(stru/* * Send constant force report to the device */ -static void pidff_set_constant_force_report (struct pidff_device *pidff, -struct ff_effect *effect) +static void pidff_set_constant_report (struct pidff_device *pidff, +struct ff_effect *effect) { pidff->set_constant[PID_EFFECT_BLOCK_INDEX ].value[0 ] = pidff->block_load[PID_EFFECT_BLOCK_INDEX ].value[0 ];
@@ -384,7 +439,7 @@ static void pidff_set_constant_force_rep effect->u.constant.level);hid_hw_request (pidff->hid, pidff->reports[PID_SET_CONSTANT ], -HID_REQ_SET_REPORT ); +HID_REQ_SET_REPORT ); }/*
@@ -536,8 +591,8 @@ static int pidff_needs_set_condition(str/* * Send ramp force report to the device */ -static void pidff_set_ramp_force_report (struct pidff_device *pidff, -struct ff_effect *effect) +static void pidff_set_ramp_report (struct pidff_device *pidff, +struct ff_effect *effect) { pidff->set_ramp[PID_EFFECT_BLOCK_INDEX ].value[0 ] = pidff->block_load[PID_EFFECT_BLOCK_INDEX ].value[0 ];
@@ -546,7 +601,7 @@ static void pidff_set_ramp_force_report(pidff_set_signed (&pidff->set_ramp[PID_RAMP_END ], effect->u.ramp.end_level);hid_hw_request (pidff->hid, pidff->reports[PID_SET_RAMP ], -HID_REQ_SET_REPORT ); +HID_REQ_SET_REPORT ); }/*
@@ -664,9 +719,6 @@ static int pidff_request_effect_upload(s {int j; -if (!pidff->effect_count) -pidff_reset (pidff); - pidff->create_new_effect_type->value[0 ] = efnum;hid_hw_request (pidff->hid, pidff->reports[PID_CREATE_NEW_EFFECT ],HID_REQ_SET_REPORT );
@@ -686,8 +738,6 @@ static int pidff_request_effect_upload(shid_dbg (pidff->hid,"device reported free memory: %d bytes\n" , pidff->block_load[PID_RAM_POOL_AVAILABLE ].value ? pidff->block_load[PID_RAM_POOL_AVAILABLE ].value[0 ] :-1 ); - - pidff->effect_count++;return 0 ; } if (pidff->block_load_status->value[0] ==
@@ -725,7 +775,7 @@ static void pidff_playback_pid(struct pi }hid_hw_request (pidff->hid, pidff->reports[PID_EFFECT_OPERATION ], -HID_REQ_SET_REPORT ); +HID_REQ_SET_REPORT ); }/*
@@ -747,10 +797,7 @@ static void pidff_erase_pid(struct pidff { pidff->block_free[PID_EFFECT_BLOCK_INDEX ].value[0 ] = pid_id;hid_hw_request (pidff->hid, pidff->reports[PID_BLOCK_FREE ], -HID_REQ_SET_REPORT ); - -if (pidff->effect_count >0 ) - pidff->effect_count--; +HID_REQ_SET_REPORT ); }/*
@@ -772,139 +819,79 @@ static int pidff_erase_effect(struct inppidff_playback_pid (pidff, pid_id,0 );pidff_erase_pid (pidff, pid_id); +if (pidff->effect_count >0 ) + pidff->effect_count--; + +hid_dbg (pidff->hid,"current effect count: %d" , pidff->effect_count);return 0 ; } +#define PIDFF_SET_REPORT_IF_NEEDED (type, effect, old) \ + ({ if (!old || pidff_needs_set_## type(effect, old)) \ + pidff_set_ ##type## _report(pidff, effect); }) + +#define PIDFF_SET_ENVELOPE_IF_NEEDED (type, effect, old) \ + ({ if (pidff_needs_set_envelope(&effect->u.type.envelope, \ + old ? &old->u.type.envelope : NULL)) \ + pidff_set_envelope_report(pidff, &effect->u.type.envelope); }) +/* * Effect upload handler */ -static int pidff_upload_effect (struct input_dev *dev,struct ff_effect *effect, +static int pidff_upload_effect (struct input_dev *dev,struct ff_effect *new,struct ff_effect *old) {struct pidff_device *pidff = dev->ff->private; -int type_id; -int error; +const int type_id =pidff_get_effect_type_id (pidff, new); - pidff->block_load[PID_EFFECT_BLOCK_INDEX ].value[0 ] =0 ; -if (old) { - pidff->block_load[PID_EFFECT_BLOCK_INDEX ].value[0 ] = - pidff->pid_id[effect->id]; +if (!type_id) { +hid_err (pidff->hid,"effect type not supported\n" ); +return -EINVAL ; } -switch (effect->type) { +if (!pidff->effect_count) +pidff_reset (pidff); + +if (!old) { +int error =pidff_request_effect_upload (pidff, type_id); + +if (error) +return error; + + pidff->effect_count++; +hid_dbg (pidff->hid,"current effect count: %d" , pidff->effect_count); + pidff->pid_id[new->id] = + pidff->block_load[PID_EFFECT_BLOCK_INDEX ].value[0 ]; + } + + pidff->block_load[PID_EFFECT_BLOCK_INDEX ].value[0 ] = + pidff->pid_id[new->id]; + +PIDFF_SET_REPORT_IF_NEEDED (effect, new, old); +switch (new->type) {case FF_CONSTANT : -if (!old) { - error =pidff_request_effect_upload (pidff, - pidff->type_id[PID_CONSTANT ]); -if (error) -return error; - } -if (!old ||pidff_needs_set_effect (effect, old)) -pidff_set_effect_report (pidff, effect); -if (!old ||pidff_needs_set_constant (effect, old)) -pidff_set_constant_force_report (pidff, effect); -if (pidff_needs_set_envelope (&effect->u.constant.envelope, - old ? &old->u.constant.envelope :NULL )) -pidff_set_envelope_report (pidff, &effect->u.constant.envelope); +PIDFF_SET_REPORT_IF_NEEDED (constant, new, old); +PIDFF_SET_ENVELOPE_IF_NEEDED (constant, new, old);break ;case FF_PERIODIC : -if (!old) { -switch (effect->u.periodic.waveform) { -case FF_SQUARE : - type_id =PID_SQUARE ; -break ; -case FF_TRIANGLE : - type_id =PID_TRIANGLE ; -break ; -case FF_SINE : - type_id =PID_SINE ; -break ; -case FF_SAW_UP : - type_id =PID_SAW_UP ; -break ; -case FF_SAW_DOWN : - type_id =PID_SAW_DOWN ; -break ; -default : -hid_err (pidff->hid,"invalid waveform\n" ); -return -EINVAL ; - } - -if (pidff->quirks &HID_PIDFF_QUIRK_PERIODIC_SINE_ONLY ) - type_id =PID_SINE ; - - error =pidff_request_effect_upload (pidff, - pidff->type_id[type_id]); -if (error) -return error; - } -if (!old ||pidff_needs_set_effect (effect, old)) -pidff_set_effect_report (pidff, effect); -if (!old ||pidff_needs_set_periodic (effect, old)) -pidff_set_periodic_report (pidff, effect); -if (pidff_needs_set_envelope (&effect->u.periodic.envelope, - old ? &old->u.periodic.envelope :NULL )) -pidff_set_envelope_report (pidff, &effect->u.periodic.envelope); +PIDFF_SET_REPORT_IF_NEEDED (periodic, new, old); +PIDFF_SET_ENVELOPE_IF_NEEDED (periodic, new, old);break ;case FF_RAMP : -if (!old) { - error =pidff_request_effect_upload (pidff, - pidff->type_id[PID_RAMP ]); -if (error) -return error; - } -if (!old ||pidff_needs_set_effect (effect, old)) -pidff_set_effect_report (pidff, effect); -if (!old ||pidff_needs_set_ramp (effect, old)) -pidff_set_ramp_force_report (pidff, effect); -if (pidff_needs_set_envelope (&effect->u.ramp.envelope, - old ? &old->u.ramp.envelope :NULL )) -pidff_set_envelope_report (pidff, &effect->u.ramp.envelope); +PIDFF_SET_REPORT_IF_NEEDED (ramp, new, old); +PIDFF_SET_ENVELOPE_IF_NEEDED (ramp, new, old);break ;case FF_SPRING :case FF_DAMPER :case FF_INERTIA :case FF_FRICTION : -if (!old) { -switch (effect->type) { -case FF_SPRING : - type_id =PID_SPRING ; -break ; -case FF_DAMPER : - type_id =PID_DAMPER ; -break ; -case FF_INERTIA : - type_id =PID_INERTIA ; -break ; -case FF_FRICTION : - type_id =PID_FRICTION ; -break ; - } - error =pidff_request_effect_upload (pidff, - pidff->type_id[type_id]); -if (error) -return error; - } -if (!old ||pidff_needs_set_effect (effect, old)) -pidff_set_effect_report (pidff, effect); -if (!old ||pidff_needs_set_condition (effect, old)) -pidff_set_condition_report (pidff, effect); +PIDFF_SET_REPORT_IF_NEEDED (condition, new, old);break ; - -default : -hid_err (pidff->hid,"invalid type\n" ); -return -EINVAL ; } - -if (!old) - pidff->pid_id[effect->id] = - pidff->block_load[PID_EFFECT_BLOCK_INDEX ].value[0 ]; -hid_dbg (pidff->hid,"uploaded\n" ); -return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 1199/1276 HID: pidff: Use correct effect type in effect update
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleg Makarenko <[email protected]>
[ Upstream commit b251598b8bf37300510868f739a79e07800d41ce ]
When updating an existing effect, the effect type from the last created effect was sent to the device instead of the updated one. This caused incorrect reports when a game creates multiple different effects and updates only one that is not the last created.
Fixes FFB in multiple games that create multiple simultaneous effects (Forza Horizon 5/6).
--- drivers/hid/usbhid/hid-pidff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hid/usbhid/hid-pidff.c +1 -1
@@ -460,7 +460,7 @@ static void pidff_set_effect_report(stru pidff->set_effect[PID_EFFECT_BLOCK_INDEX ].value[0 ] = pidff->block_load[PID_EFFECT_BLOCK_INDEX ].value[0 ]; pidff->set_effect_type->value[0 ] = - pidff->create_new_effect_type->value[0 ]; +pidff_get_effect_type_id (pidff, effect);pidff_set_duration (&pidff->set_effect[PID_DURATION ], effect->replay.length);
Greg Kroah-Hartman
maintainerPATCH 1200/1276 hfs/hfsplus: prevent getting negative values of offset/length
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Viacheslav Dubeyko <[email protected]>
[ Upstream commit 00c14a09a70e10ae18eb3707d0059291425c04bd ]
The syzbot reported KASAN out-of-bounds issue inhfs_bnode_move():
[ 45.588165][ T9821] hfs: dst 14, src 65536, len -65536 [ 45.588895][ T9821] ================================================================== [ 45.590114][ T9821] BUG: KASAN: out-of-bounds in hfs_bnode_move+0xfd/0x140 [ 45.591127][ T9821] Read of size 18446744073709486080 at addr ffff888035935400 by task repro/9821 [ 45.592207][ T9821] [ 45.592420][ T9821] CPU: 0 UID: 0 PID: 9821 Comm: repro Not tainted 6.16.0-rc7-dirty #42 PREEMPT(full) [ 45.592428][ T9821] Hardware name: QEMU Ubuntu 24.04 PC (i440FX + PIIX, 1996), BIOS 1.16.3-debian-1.16.3-2 04/01/2014 [ 45.592431][ T9821] Call Trace: [ 45.592434][ T9821] <TASK> [ 45.592437][ T9821] dump_stack_lvl+0x1c1/0x2a0 [ 45.592446][ T9821] ? __virt_addr_valid+0x1c8/0x5c0 [ 45.592454][ T9821] ? __pfx_dump_stack_lvl+0x10/0x10 [ 45.592461][ T9821] ? rcu_is_watching+0x15/0xb0 [ 45.592469][ T9821] ? lock_release+0x4b/0x3e0 [ 45.592476][ T9821] ? __virt_addr_valid+0x1c8/0x5c0 [ 45.592483][ T9821] ? __virt_addr_valid+0x4a5/0x5c0 [ 45.592491][ T9821] print_report+0x17e/0x7c0 [ 45.592497][ T9821] ? __virt_addr_valid+0x1c8/0x5c0 [ 45.592504][ T9821] ? __virt_addr_valid+0x4a5/0x5c0 [ 45.592511][ T9821] ? __phys_addr+0xd3/0x180 [ 45.592519][ T9821] ? hfs_bnode_move+0xfd/0x140 [ 45.592526][ T9821] kasan_report+0x147/0x180 [ 45.592531][ T9821] ? _printk+0xcf/0x120 [ 45.592537][ T9821] ? hfs_bnode_move+0xfd/0x140 [ 45.592544][ T9821] ? hfs_bnode_move+0xfd/0x140 [ 45.592552][ T9821] kasan_check_range+0x2b0/0x2c0 [ 45.592557][ T9821] ? hfs_bnode_move+0xfd/0x140 [ 45.592565][ T9821] __asan_memmove+0x29/0x70 [ 45.592572][ T9821] hfs_bnode_move+0xfd/0x140 [ 45.592580][ T9821] hfs_brec_remove+0x473/0x560 [ 45.592589][ T9821] hfs_cat_move+0x6fb/0x960 [ 45.592598][ T9821] ? __pfx_hfs_cat_move+0x10/0x10 [ 45.592607][ T9821] ? seqcount_lockdep_reader_access+0x122/0x1c0 [ 45.592614][ T9821] ? lockdep_hardirqs_on+0x9c/0x150 [ 45.592631][ T9821] ? __lock_acquire+0xaec/0xd80 [ 45.592641][ T9821] hfs_rename+0x1dc/0x2d0 [ 45.592649][ T9821] ? __pfx_hfs_rename+0x10/0x10 [ 45.592657][ T9821] vfs_rename+0xac6/0xed0 [ 45.592664][ T9821] ? __pfx_vfs_rename+0x10/0x10 [ 45.592670][ T9821] ? d_alloc+0x144/0x190 [ 45.592677][ T9821] ? bpf_lsm_path_rename+0x9/0x20 [ 45.592683][ T9821] ? security_path_rename+0x17d/0x490 [ 45.592691][ T9821] do_renameat2+0x890/0xc50 [ 45.592699][ T9821] ? __pfx_do_renameat2+0x10/0x10 [ 45.592707][ T9821] ? getname_flags+0x1e5/0x540 [ 45.592714][ T9821] __x64_sys_rename+0x82/0x90 [ 45.592720][ T9821] ? entry_SYSCALL_64_after_hwframe+0x77/0x7f [ 45.592725][ T9821] do_syscall_64+0xf3/0x3a0 [ 45.592741][ T9821] ? exc_page_fault+0x9f/0xf0 [ 45.592748][ T9821] entry_SYSCALL_64_after_hwframe+0x77/0x7f [ 45.592754][ T9821] RIP: 0033:0x7f7f73fe3fc9 [ 45.592760][ T9821] Code: 00 c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 48 [ 45.592765][ T9821] RSP: 002b:00007ffc7e116cf8 EFLAGS: 00000283 ORIG_RAX: 0000000000000052 [ 45.592772][ T9821] RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f7f73fe3fc9 [ 45.592776][ T9821] RDX: 0000200000000871 RSI: 0000200000000780 RDI: 00002000000003c0 [ 45.592781][ T9821] RBP: 00007ffc7e116d00 R08: 0000000000000000 R09: 00007ffc7e116d30 [ 45.592784][ T9821] R10: fffffffffffffff0 R11: 0000000000000283 R12: 00005557e81f8250 [ 45.592788][ T9821] R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 [ 45.592795][ T9821] </TASK> [ 45.592797][ T9821] [ 45.619721][ T9821] The buggy address belongs to the physical page: [ 45.620300][ T9821] page: refcount:1 mapcount:1 mapping:0000000000000000 index:0x559a88174 pfn:0x35935 [ 45.621150][ T9821] memcg:ffff88810a1d5b00 [ 45.621531][ T9821] anon flags: 0xfff60000020838(uptodate|dirty|lru|owner_2|swapbacked|node=0|zone=1|lastcpupid=0x7ff) [ 45.622496][ T9821] raw: 00fff60000020838 ffffea0000d64d88 ffff888021753e10 ffff888029da0771 [ 45.623260][ T9821] raw: 0000000559a88174 0000000000000000 0000000100000000 ffff88810a1d5b00 [ 45.624030][ T9821] page dumped because: kasan: bad access detected [ 45.624602][ T9821] page_owner tracks the page as allocated [ 45.625115][ T9821] page last allocated via order 0, migratetype Movable, gfp_mask 0x140dca(GFP_HIGHUSER_MOVABLE|__GFP_ZERO0 [ 45.626685][ T9821] post_alloc_hook+0x240/0x2a0 [ 45.627127][ T9821] get_page_from_freelist+0x2101/0x21e0 [ 45.627628][ T9821] __alloc_frozen_pages_noprof+0x274/0x380 [ 45.628154][ T9821] alloc_pages_mpol+0x241/0x4b0 [ 45.628593][ T9821] vma_alloc_folio_noprof+0xe4/0x210 [ 45.629066][ T9821] folio_prealloc+0x30/0x180 [ 45.629487][ T9821] __handle_mm_fault+0x34bd/0x5640 [ 45.629957][ T9821] handle_mm_fault+0x40e/0x8e0 [ 45.630392][ T9821] do_user_addr_fault+0xa81/0x1390 [ 45.630862][ T9821] exc_page_fault+0x76/0xf0 [ 45.631273][ T9821] asm_exc_page_fault+0x26/0x30 [ 45.631712][ T9821] page last free pid 5269 tgid 5269 stack trace: [ 45.632281][ T9821] free_unref_folios+0xc73/0x14c0 [ 45.632740][ T9821] folios_put_refs+0x55b/0x640 [ 45.633177][ T9821] free_pages_and_swap_cache+0x26d/0x510 [ 45.633685][ T9821] tlb_flush_mmu+0x3a0/0x680 [ 45.634105][ T9821] tlb_finish_mmu+0xd4/0x200 [ 45.634525][ T9821] exit_mmap+0x44c/0xb70 [ 45.634914][ T9821] __mmput+0x118/0x420 [ 45.635286][ T9821] exit_mm+0x1da/0x2c0 [ 45.635659][ T9821] do_exit+0x652/0x2330 [ 45.636039][ T9821] do_group_exit+0x21c/0x2d0 [ 45.636457][ T9821] __x64_sys_exit_group+0x3f/0x40 [ 45.636915][ T9821] x64_sys_call+0x21ba/0x21c0 [ 45.637342][ T9821] do_syscall_64+0xf3/0x3a0 [ 45.637756][ T9821] entry_SYSCALL_64_after_hwframe+0x77/0x7f [ 45.638290][ T9821] page has been migrated, last migrate reason: numa_misplaced [ 45.638956][ T9821] [ 45.639173][ T9821] Memory state around the buggy address: [ 45.639677][ T9821] ffff888035935300: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [ 45.640397][ T9821] ffff888035935380: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [ 45.641117][ T9821] >ffff888035935400: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [ 45.641837][ T9821] ^ [ 45.642207][ T9821] ffff888035935480: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [ 45.642929][ T9821] ffff888035935500: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [ 45.643650][ T9821] ==================================================================
This commit [1] fixes the issue if an offset inside of b-tree node or length of the request is bigger than b-tree node. However, this fix is still not ready for negative values
of the offset or length. Moreover, negative values of the offset or length doesn't make sense for b-tree's operations. Because we could try to access the memory address outside of the beginning of memory page's addresses range. Also, using of negative values make logic very complicated, unpredictable, and we could access the wrong item(s)
in the b-tree node.
This patch changes b-tree interface by means of converting signed integer arguments of offset and length on u32 type. Such conversion has goal to prevent of using negative values unintentionally or by mistake in b-tree operations.
[1] 'commit a431930c9bac ("hfs: fix slab-out-of-bounds in hfs_bnode_read()")'
Stable-dep-of: 966cb76fb285 ("hfs/hfsplus: fix u32 overflow in check_and_correct_requested_length")
--- fs/hfs/bfind.c | 2 - fs/hfs/bnode.c | 52 ++++++++++++++-------------- fs/hfs/brec.c | 2 - fs/hfs/btree.c | 2 - fs/hfs/btree.h | 71 +++++++++++++++++++------------------- fs/hfs/hfs_fs.h | 88 ++++++++++++++++++++++++++++-------------------- fs/hfs/inode.c | 3 + fs/hfsplus/bfind.c | 2 - fs/hfsplus/bnode.c | 60 ++++++++++++++++---------------- fs/hfsplus/brec.c | 2 - fs/hfsplus/btree.c | 2 - fs/hfsplus/hfsplus_fs.h | 38 ++++++++++---------- 12 files changed, 171 insertions(+), 153 deletions(-)
fs/hfs/bfind.c +1 -1
@@ -167,7 +167,7 @@ release:return res; } -int hfs_brec_read (struct hfs_find_data *fd,void *rec,int rec_len) +int hfs_brec_read (struct hfs_find_data *fd,void *rec,u32 rec_len) {int res;
fs/hfs/bnode.c +26 -26
172 lines not on this page · raw message
fs/hfs/brec.c +1 -1
@@ -62,7 +62,7 @@ u16 hfs_brec_keylen(struct hfs_bnode *noreturn retval; } -int hfs_brec_insert (struct hfs_find_data *fd,void *entry,int entry_len) +int hfs_brec_insert (struct hfs_find_data *fd,void *entry,u32 entry_len) {struct hfs_btree *tree;struct hfs_bnode *node, *new_node;
fs/hfs/btree.c +1 -1
@@ -259,7 +259,7 @@ static struct hfs_bnode *hfs_bmap_new_bm }/* Make sure @tree has enough space for the @rsvd_nodes */ -int hfs_bmap_reserve (struct hfs_btree *tree,int rsvd_nodes) +int hfs_bmap_reserve (struct hfs_btree *tree,u32 rsvd_nodes) {struct inode *inode = tree->inode;u32 count;
fs/hfs/btree.h +36 -35
84 lines not on this page · raw message
fs/hfs/hfs_fs.h +52 -36
126 lines not on this page · raw message
fs/hfs/inode.c +2 -1
@@ -45,7 +45,8 @@ static void hfs_write_failed(struct addr }int hfs_write_begin (struct file *file,struct address_space *mapping, -loff_t pos,unsigned len,struct folio **foliop,void **fsdata) +loff_t pos,unsigned int len,struct folio **foliop, +void **fsdata) {int ret;
fs/hfsplus/bfind.c +1 -1
@@ -210,7 +210,7 @@ release:return res; } -int hfs_brec_read (struct hfs_find_data *fd,void *rec,int rec_len) +int hfs_brec_read (struct hfs_find_data *fd,void *rec,u32 rec_len) {int res;
fs/hfsplus/bnode.c +30 -30
200 lines not on this page · raw message
fs/hfsplus/brec.c +1 -1
@@ -60,7 +60,7 @@ u16 hfs_brec_keylen(struct hfs_bnode *noreturn retval; } -int hfs_brec_insert (struct hfs_find_data *fd,void *entry,int entry_len) +int hfs_brec_insert (struct hfs_find_data *fd,void *entry,u32 entry_len) {struct hfs_btree *tree;struct hfs_bnode *node, *new_node;
fs/hfsplus/btree.c +1 -1
@@ -344,7 +344,7 @@ static struct hfs_bnode *hfs_bmap_new_bm }/* Make sure @tree has enough space for the @rsvd_nodes */ -int hfs_bmap_reserve (struct hfs_btree *tree,int rsvd_nodes) +int hfs_bmap_reserve (struct hfs_btree *tree,u32 rsvd_nodes) {struct inode *inode = tree->inode;struct hfsplus_inode_info *hip =HFSPLUS_I (inode);
fs/hfsplus/hfsplus_fs.h +19 -19
@@ -389,21 +389,21 @@ u32 hfsplus_calc_btree_clump_size(u32 blstruct hfs_btree *hfs_btree_open (struct super_block *sb,u32 id);void hfs_btree_close (struct hfs_btree *tree);int hfs_btree_write (struct hfs_btree *tree); -int hfs_bmap_reserve (struct hfs_btree *tree,int rsvd_nodes); +int hfs_bmap_reserve (struct hfs_btree *tree,u32 rsvd_nodes);struct hfs_bnode *hfs_bmap_alloc (struct hfs_btree *tree);void hfs_bmap_free (struct hfs_bnode *node);/* bnode.c */ -void hfs_bnode_read (struct hfs_bnode *node,void *buf,int off,int len); -u16 hfs_bnode_read_u16 (struct hfs_bnode *node,int off); -u8 hfs_bnode_read_u8 (struct hfs_bnode *node,int off); -void hfs_bnode_read_key (struct hfs_bnode *node,void *key,int off); -void hfs_bnode_write (struct hfs_bnode *node,void *buf,int off,int len); -void hfs_bnode_write_u16 (struct hfs_bnode *node,int off,u16 data); -void hfs_bnode_clear (struct hfs_bnode *node,int off,int len); -void hfs_bnode_copy (struct hfs_bnode *dst_node,int dst, -struct hfs_bnode *src_node,int src,int len); -void hfs_bnode_move (struct hfs_bnode *node,int dst,int src,int len); +void hfs_bnode_read (struct hfs_bnode *node,void *buf,u32 off,u32 len); +u16 hfs_bnode_read_u16 (struct hfs_bnode *node,u32 off); +u8 hfs_bnode_read_u8 (struct hfs_bnode *node,u32 off); +void hfs_bnode_read_key (struct hfs_bnode *node,void *key,u32 off); +void hfs_bnode_write (struct hfs_bnode *node,void *buf,u32 off,u32 len); +void hfs_bnode_write_u16 (struct hfs_bnode *node,u32 off,u16 data); +void hfs_bnode_clear (struct hfs_bnode *node,u32 off,u32 len); +void hfs_bnode_copy (struct hfs_bnode *dst_node,u32 dst, +struct hfs_bnode *src_node,u32 src,u32 len); +void hfs_bnode_move (struct hfs_bnode *node,u32 dst,u32 src,u32 len);void hfs_bnode_dump (struct hfs_bnode *node);void hfs_bnode_unlink (struct hfs_bnode *node);struct hfs_bnode *hfs_bnode_findhash (struct hfs_btree *tree,u32 cnid);
@@ -418,7 +418,7 @@ bool hfs_bnode_need_zeroout(struct hfs_b/* brec.c */ u16 hfs_brec_lenoff (struct hfs_bnode *node,u16 rec,u16 *off);u16 hfs_brec_keylen (struct hfs_bnode *node,u16 rec); -int hfs_brec_insert (struct hfs_find_data *fd,void *entry,int entry_len); +int hfs_brec_insert (struct hfs_find_data *fd,void *entry,u32 entry_len);int hfs_brec_remove (struct hfs_find_data *fd);/* bfind.c */
@@ -431,7 +431,7 @@ int hfs_find_rec_by_key(struct hfs_bnodeint __hfs_brec_find (struct hfs_bnode *bnode,struct hfs_find_data *fd,search_strategy_t rec_found);int hfs_brec_find (struct hfs_find_data *fd,search_strategy_t do_key_compare); -int hfs_brec_read (struct hfs_find_data *fd,void *rec,int rec_len); +int hfs_brec_read (struct hfs_find_data *fd,void *rec,u32 rec_len);int hfs_brec_goto (struct hfs_find_data *fd,int cnt);/* catalog.c */
@@ -589,14 +589,14 @@ hfsplus_btree_lock_class(struct hfs_btre }static inline -bool is_bnode_offset_valid (struct hfs_bnode *node,int off) +bool is_bnode_offset_valid (struct hfs_bnode *node,u32 off) {bool is_valid = off < node->tree->node_size;if (!is_valid) {pr_err ("requested invalid offset: " "NODE: id %u, type %#x, height %u, " -"node_size %u, offset %d\n" , +"node_size %u, offset %u\n" , node->this, node->type, node->height, node->tree->node_size, off); }
@@ -605,7 +605,7 @@ bool is_bnode_offset_valid(struct hfs_bn }static inline -int check_and_correct_requested_length (struct hfs_bnode *node,int off,int len) +u32 check_and_correct_requested_length (struct hfs_bnode *node,u32 off,u32 len) {unsigned int node_size;
@@ -615,12 +615,12 @@ int check_and_correct_requested_length(s node_size = node->tree->node_size;if ((off + len) > node_size) { -int new_len = (int )node_size - off; +u32 new_len = node_size - off;pr_err ("requested length has been corrected: " "NODE: id %u, type %#x, height %u, " -"node_size %u, offset %d, " -"requested_len %d, corrected_len %d\n" , +"node_size %u, offset %u, " +"requested_len %u, corrected_len %u\n" , node->this, node->type, node->height, node->tree->node_size, off, len, new_len);
Greg Kroah-Hartman
maintainerPATCH 1201/1276 hfs/hfsplus: fix u32 overflow in check_and_correct_requested_length
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tristan Madani <[email protected]>
[ Upstream commit 966cb76fb2857a4242cab6ea2ea17acf818a3da7 ]
check_and_correct_requested_length() compares (off + len) against node_size using u32 arithmetic. When the caller passes a large len value (e.g. from an underflowed subtraction in hfs_brec_remove()), off + len can wrap past 2^32 and produce a small result, causing the bounds check to pass when it should fail.
For example, with off=14 and len=0xFFFFFFF2 (underflowed from data_off - keyoffset - size in hfs_brec_remove), off + len wraps to 6, which is less than a typical node_size of 512, so the check passes and the subsequent memmove reads ~4GB past the node buffer.
Fix this by widening the addition to u64 before comparing against node_size. This prevents the u32 wrap while keeping the logic straightforward.
--- fs/hfs/bnode.c | 2 +- fs/hfsplus/hfsplus_fs.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
fs/hfs/bnode.c +1 -1
@@ -41,7 +41,7 @@ u32 check_and_correct_requested_length(s node_size = node->tree->node_size; -if ((off + len) > node_size) { +if ((u64 )off + len > node_size) {u32 new_len = node_size - off; pr_err("requested length has been corrected: "
fs/hfsplus/hfsplus_fs.h +1 -1
@@ -614,7 +614,7 @@ u32 check_and_correct_requested_length(s node_size = node->tree->node_size; -if ((off + len) > node_size) { +if ((u64 )off + len > node_size) {u32 new_len = node_size - off; pr_err("requested length has been corrected: "
Greg Kroah-Hartman
maintainerPATCH 1202/1276 bpf: Convert lpm_trie.c to rqspinlock
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kumar Kartikeya Dwivedi <[email protected]>
[ Upstream commit 47979314c0fe245ed54306e2f91b3f819c7c0f9f ]
Convert all LPM trie usage of raw_spinlock to rqspinlock.
Note that rcu_dereference_protected in trie_delete_elem is switched over to plain rcu_dereference, the RCU read lock should be held from BPF program side or eBPF syscall path, and the trie->lock is just acquired before the dereference. It is not clear the reason the protected variant was used from the commit history, but the above reasoning makes sense so switch over.
Stable-dep-of: 2f884d371faf ("bpf: Allow LPM map access from sleepable BPF programs")
--- kernel/bpf/lpm_trie.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
kernel/bpf/lpm_trie.c +3 -4
@@ -15,6 +15,7 @@#include <net/ipv6.h> #include <uapi/linux/btf.h> #include <linux/btf_ids.h> +#include <linux/bpf_local_storage.h> /* Intermediate node */ #define LPM_TREE_NODE_FLAG_IM BIT(0)
@@ -361,8 +362,7 @@ static long trie_update_elem(struct bpf_*/ slot = &trie->root; -while ((node =rcu_dereference_protected (*slot, -lockdep_is_held (&trie->lock)))) { +while ((node =rcu_dereference (*slot))) { matchlen =longest_prefix_match (trie, node, key); if (node->prefixlen != matchlen ||
@@ -483,8 +483,7 @@ static long trie_delete_elem(struct bpf_ trim = &trie->root; trim2 = trim; parent =NULL ; -while ((node =rcu_dereference_protected ( - *trim,lockdep_is_held (&trie->lock)))) { +while ((node =rcu_dereference (*trim))) { matchlen =longest_prefix_match (trie, node, key); if (node->prefixlen != matchlen ||
Greg Kroah-Hartman
maintainerPATCH 1203/1276 bpf, arm64, powerpc: Add bpf_jit_bypass_spec_v1/v4()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luis Gerhorst <[email protected]>
[ Upstream commit 03c68a0f8c68936a0bb915b030693923784724cb ]
JITs can set bpf_jit_bypass_spec_v1/v4() if they want the verifier to skip analysis/patching for the respective vulnerability. For v4, this will reduce the number of barriers the verifier inserts. For v1, it allows more programs to be accepted.
The primary motivation for this is to not regress unpriv BPF's performance on ARM64 in a future commit where BPF_NOSPEC is also used against Spectre v1.
This has the user-visible change that v1-induced rejections on non-vulnerable PowerPC CPUs are avoided.
For now, this does not change the semantics of BPF_NOSPEC. It is still a v4-only barrier and must not be implemented if bypass_spec_v4 is always true for the arch. Changing it to a v1 AND v4-barrier is done in a future commit.
As an alternative to bypass_spec_v1/v4, one could introduce NOSPEC_V1 AND NOSPEC_V4 instructions and allow backends to skip their lowering as suggested by commit f5e81d111750 ("bpf: Introduce BPF nospec instruction for mitigating Spectre v4"). Adding bpf_jit_bypass_spec_v1/v4() was found to be preferable for the following reason:
* bypass_spec_v1/v4 benefits non-vulnerable CPUs: Always performing the same analysis (not taking into account whether the current CPU is vulnerable), needlessly restricts users of CPUs that are not vulnerable. The only use case for this would be portability-testing, but this can later be added easily when needed by allowing users to force bypass_spec_v1/v4 to false.
* Portability is still acceptable: Directly disabling the analysis instead of skipping the lowering of BPF_NOSPEC(_V1/V4) might allow programs on non-vulnerable CPUs to be accepted while the program will be rejected on vulnerable CPUs. With the fallback to speculation barriers for Spectre v1 implemented in a future commit, this will only affect programs that do variable stack-accesses or are very complex.
For PowerPC, the SEC_FTR checking in bpf_jit_bypass_spec_v4() is based on the check that was previously located in the BPF_NOSPEC case.
For LoongArch, it would likely be safe to set both bpf_jit_bypass_spec_v1() and _v4() according to
commit a6f6a95f2580 ("LoongArch, bpf: Fix jit to skip speculation barrier opcode"). This is omitted here as I am unable to do any testing for LoongArch.
Hari's ack concerns the PowerPC part only.
Stable-dep-of: 2f884d371faf ("bpf: Allow LPM map access from sleepable BPF programs")
--- arch/arm64/net/bpf_jit_comp.c | 21 ++++++++++++--------- arch/powerpc/net/bpf_jit_comp64.c | 21 +++++++++++++++++---- include/linux/bpf.h | 11 +++++++++-- kernel/bpf/core.c | 15 +++++++++++++++ 4 files changed, 53 insertions(+), 15 deletions(-)
arch/arm64/net/bpf_jit_comp.c +12 -9
@@ -1558,15 +1558,7 @@ emit_cond_jmp:/* speculation barrier */ case BPF_ST |BPF_NOSPEC : -/* -* Nothing required here. -* -* In case of arm64, we rely on the firmware mitigation of -* Speculative Store Bypass as controlled via the ssbd kernel -* parameter. Whenever the mitigation is enabled, it works -* for all of the kernel code with no need to provide any -* additional instructions. -*/ +/* See bpf_jit_bypass_spec_v4() */ break ;/* ST: *(size *)(dst + off) = imm */
@@ -2730,6 +2722,17 @@ bool bpf_jit_supports_percpu_insn(void)return true; } +bool bpf_jit_bypass_spec_v4 (void ) +{ +/* In case of arm64, we rely on the firmware mitigation of Speculative +* Store Bypass as controlled via the ssbd kernel parameter. Whenever +* the mitigation is enabled, it works for all of the kernel code with +* no need to provide any additional instructions. Therefore, skip +* inserting nospec insns against Spectre v4. +*/ +return true; +} +bool bpf_jit_inlines_helper_call (s32 imm) {switch (imm) {
arch/powerpc/net/bpf_jit_comp64.c +17 -4
@@ -440,6 +440,23 @@ static int bpf_jit_emit_tail_call(u32 *ireturn 0 ; } +bool bpf_jit_bypass_spec_v1 (void ) +{ +#if defined(CONFIG_PPC_E500 ) || defined(CONFIG_PPC_BOOK3S_64 ) +return !(security_ftr_enabled (SEC_FTR_FAVOUR_SECURITY ) && +security_ftr_enabled (SEC_FTR_BNDS_CHK_SPEC_BAR )); +#else +return true; +#endif +} + +bool bpf_jit_bypass_spec_v4 (void ) +{ +return !(security_ftr_enabled (SEC_FTR_FAVOUR_SECURITY ) && +security_ftr_enabled (SEC_FTR_STF_BARRIER ) && +stf_barrier_type_get () !=STF_BARRIER_NONE ); +} +/* * We spill into the redzone always, even if the bpf program has its own stackframe. * Offsets hardcoded based on BPF_PPC_STACK_SAVE -- see bpf_jit_stack_local()
@@ -864,10 +881,6 @@ emit_clear:* BPF_ST NOSPEC (speculation barrier) */ case BPF_ST |BPF_NOSPEC : -if (!security_ftr_enabled (SEC_FTR_FAVOUR_SECURITY ) || - !security_ftr_enabled (SEC_FTR_STF_BARRIER )) -break ; -switch (stf_barrier) {case STF_BARRIER_EIEIO :EMIT (PPC_RAW_EIEIO () |0x02000000 );
include/linux/bpf.h +9 -2
@@ -2216,6 +2216,9 @@ bpf_prog_run_array_uprobe(const struct breturn ret; } +bool bpf_jit_bypass_spec_v1 (void ); +bool bpf_jit_bypass_spec_v4 (void ); +#ifdef CONFIG_BPF_SYSCALL DECLARE_PER_CPU (int, bpf_prog_active);extern struct mutex bpf_stats_enabled_mutex;
@@ -2386,12 +2389,16 @@ static inline bool bpf_allow_uninit_stacstatic inline bool bpf_bypass_spec_v1 (const struct bpf_token *token) { -return cpu_mitigations_off () ||bpf_token_capable (token,CAP_PERFMON ); +return bpf_jit_bypass_spec_v1 () || +cpu_mitigations_off () || +bpf_token_capable (token,CAP_PERFMON ); }static inline bool bpf_bypass_spec_v4 (const struct bpf_token *token) { -return cpu_mitigations_off () ||bpf_token_capable (token,CAP_PERFMON ); +return bpf_jit_bypass_spec_v4 () || +cpu_mitigations_off () || +bpf_token_capable (token,CAP_PERFMON ); }int bpf_map_new_fd (struct bpf_map *map,int flags);
kernel/bpf/core.c +15 -0
@@ -3088,6 +3088,21 @@ bool __weak bpf_jit_needs_zext(void)return false; } +/* By default, enable the verifier's mitigations against Spectre v1 and v4 for +* all archs. The value returned must not change at runtime as there is +* currently no support for reloading programs that were loaded without +* mitigations. +*/ +bool __weak bpf_jit_bypass_spec_v1 (void ) +{ +return false; +} + +bool __weak bpf_jit_bypass_spec_v4 (void ) +{ +return false; +} +/* Return true if the JIT inlines the call to the helper corresponding to * the imm. *
Greg Kroah-Hartman
maintainerPATCH 1204/1276 bpf: Consistently use bpf_rcu_lock_held() everywhere
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrii Nakryiko <[email protected]>
[ Upstream commit 48a97ffc6c826640907d13b199e29008f4fe2c15 ]
We have many places which open-code what's now is bpf_rcu_lock_held() macro, so replace all those places with a clean and short macro invocation. For that, move bpf_rcu_lock_held() macro into include/linux/bpf.h.
Stable-dep-of: 2f884d371faf ("bpf: Allow LPM map access from sleepable BPF programs")
--- include/linux/bpf.h | 3 +++ include/linux/bpf_local_storage.h | 3 --- kernel/bpf/hashtab.c | 21 +++++++-------------- kernel/bpf/helpers.c | 12 ++++-------- 4 files changed, 14 insertions(+), 25 deletions(-)
include/linux/bpf.h +3 -0
@@ -2219,6 +2219,9 @@ bpf_prog_run_array_uprobe(const struct bbool bpf_jit_bypass_spec_v1 (void );bool bpf_jit_bypass_spec_v4 (void ); +#define bpf_rcu_lock_held () \ + (rcu_read_lock_held() || rcu_read_lock_trace_held() || rcu_read_lock_bh_held()) +#ifdef CONFIG_BPF_SYSCALL DECLARE_PER_CPU (int, bpf_prog_active);extern struct mutex bpf_stats_enabled_mutex;
include/linux/bpf_local_storage.h +0 -3
@@ -18,9 +18,6 @@#define BPF_LOCAL_STORAGE_CACHE_SIZE 16 -#define bpf_rcu_lock_held () \ - (rcu_read_lock_held() || rcu_read_lock_trace_held() || \ - rcu_read_lock_bh_held())struct bpf_local_storage_map_bucket {struct hlist_head list;raw_spinlock_t lock;
kernel/bpf/hashtab.c +7 -14
@@ -685,8 +685,7 @@ static void *__htab_map_lookup_elem(strustruct htab_elem *l;u32 hash, key_size; -WARN_ON_ONCE (!rcu_read_lock_held () && !rcu_read_lock_trace_held () && - !rcu_read_lock_bh_held ()); +WARN_ON_ONCE (!bpf_rcu_lock_held ()); key_size = map->key_size;
@@ -1122,8 +1121,7 @@ static long htab_map_update_elem(struct/* unknown flags */ return -EINVAL ; -WARN_ON_ONCE (!rcu_read_lock_held () && !rcu_read_lock_trace_held () && - !rcu_read_lock_bh_held ()); +WARN_ON_ONCE (!bpf_rcu_lock_held ()); key_size = map->key_size;
@@ -1240,8 +1238,7 @@ static long htab_lru_map_update_elem(str/* unknown flags */ return -EINVAL ; -WARN_ON_ONCE (!rcu_read_lock_held () && !rcu_read_lock_trace_held () && - !rcu_read_lock_bh_held ()); +WARN_ON_ONCE (!bpf_rcu_lock_held ()); key_size = map->key_size;
@@ -1309,8 +1306,7 @@ static long __htab_percpu_map_update_ele/* unknown flags */ return -EINVAL ; -WARN_ON_ONCE (!rcu_read_lock_held () && !rcu_read_lock_trace_held () && - !rcu_read_lock_bh_held ()); +WARN_ON_ONCE (!bpf_rcu_lock_held ()); key_size = map->key_size;
@@ -1364,8 +1360,7 @@ static long __htab_lru_percpu_map_update/* unknown flags */ return -EINVAL ; -WARN_ON_ONCE (!rcu_read_lock_held () && !rcu_read_lock_trace_held () && - !rcu_read_lock_bh_held ()); +WARN_ON_ONCE (!bpf_rcu_lock_held ()); key_size = map->key_size;
@@ -1442,8 +1437,7 @@ static long htab_map_delete_elem(structu32 hash, key_size;int ret; -WARN_ON_ONCE (!rcu_read_lock_held () && !rcu_read_lock_trace_held () && - !rcu_read_lock_bh_held ()); +WARN_ON_ONCE (!bpf_rcu_lock_held ()); key_size = map->key_size;
@@ -1478,8 +1472,7 @@ static long htab_lru_map_delete_elem(stru32 hash, key_size;int ret; -WARN_ON_ONCE (!rcu_read_lock_held () && !rcu_read_lock_trace_held () && - !rcu_read_lock_bh_held ()); +WARN_ON_ONCE (!bpf_rcu_lock_held ()); key_size = map->key_size;
kernel/bpf/helpers.c +4 -8
@@ -37,8 +37,7 @@*/ BPF_CALL_2(bpf_map_lookup_elem, struct bpf_map *, map, void *, key) { -WARN_ON_ONCE (!rcu_read_lock_held () && !rcu_read_lock_trace_held () && - !rcu_read_lock_bh_held ()); +WARN_ON_ONCE (!bpf_rcu_lock_held ());return (unsigned long ) map->ops->map_lookup_elem (map, key); }
@@ -54,8 +53,7 @@ const struct bpf_func_proto bpf_map_look BPF_CALL_4(bpf_map_update_elem, struct bpf_map *, map, void *, key, void *, value, u64, flags) { -WARN_ON_ONCE (!rcu_read_lock_held () && !rcu_read_lock_trace_held () && - !rcu_read_lock_bh_held ()); +WARN_ON_ONCE (!bpf_rcu_lock_held ());return map->ops->map_update_elem (map, key, value, flags); }
@@ -72,8 +70,7 @@ const struct bpf_func_proto bpf_map_upda BPF_CALL_2(bpf_map_delete_elem, struct bpf_map *, map, void *, key) { -WARN_ON_ONCE (!rcu_read_lock_held () && !rcu_read_lock_trace_held () && - !rcu_read_lock_bh_held ()); +WARN_ON_ONCE (!bpf_rcu_lock_held ());return map->ops->map_delete_elem (map, key); }
@@ -129,8 +126,7 @@ const struct bpf_func_proto bpf_map_peek BPF_CALL_3(bpf_map_lookup_percpu_elem, struct bpf_map *, map, void *, key, u32, cpu) { -WARN_ON_ONCE (!rcu_read_lock_held () && !rcu_read_lock_trace_held () && - !rcu_read_lock_bh_held ()); +WARN_ON_ONCE (!bpf_rcu_lock_held ());return (unsigned long ) map->ops->map_lookup_percpu_elem (map, key, cpu); }
Greg Kroah-Hartman
maintainerPATCH 1205/1276 bpf: Allow LPM map access from sleepable BPF programs
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vlad Poenaru <[email protected]>
[ Upstream commit 2f884d371fafea137afea504d49ee4a7c8d7985b ]
trie_lookup_elem() annotates its rcu_dereference_check() walks with only rcu_read_lock_bh_held(). Because rcu_dereference_check(p, c) resolves to "c || rcu_read_lock_held()", this passes for XDP/NAPI and classic RCU readers but fails for sleepable BPF programs, which enter via __bpf_prog_enter_sleepable() and hold only rcu_read_lock_trace().
trie_update_elem() and trie_delete_elem() have the same problem in a different form: they walk the trie with plain rcu_dereference(), which asserts rcu_read_lock_held() unconditionally. Both are reachable from sleepable BPF programs via the bpf_map_update_elem / bpf_map_delete_elem helpers, and from the syscall path under classic rcu_read_lock(). In the writer paths the trie is actually protected by trie->lock (an rqspinlock taken across the walk); we never relied on the RCU read-side lock to keep nodes alive there.
A sleepable LSM hook that ends up touching an LPM trie therefore triggers lockdep on debug kernels:
=============================
WARNING: suspicious RCU usage
7.1.0-... Tainted: G E
-----------------------------
kernel/bpf/lpm_trie.c:249 suspicious rcu_dereference_check() usage! 1 lock held by net_tests/540:
#0: (rcu_tasks_trace_srcu_struct){....}-{0:0},
at: __bpf_prog_enter_sleepable+0x26/0x280 Call Trace: dump_stack_lvl lockdep_rcu_suspicious trie_lookup_elem bpf_prog_..._enforce_security_socket_connect bpf_trampoline_... security_socket_connect __sys_connect do_syscall_64
This is lockdep-only -- no UAF, since Tasks Trace RCU does serialize against the trie's reclaim path -- but it spams the console once per distinct callsite on every debug kernel running a sleepable BPF LSM that touches an LPM trie, which is increasingly common.
For the lookup path, switch the rcu_dereference_check() annotation from rcu_read_lock_bh_held() to bpf_rcu_lock_held(), which accepts all three contexts (classic, BH, Tasks Trace). Other map types already follow this convention.
For trie_update_elem() and trie_delete_elem(), annotate the walks as rcu_dereference_protected(*p, 1) -- matching trie_free() in the same file -- since trie->lock is held across the walk. rqspinlock has no lockdep_map, so the predicate degenerates to '1' rather than lockdep_is_held(&trie->lock); the protection is real but not machine-verifiable. trie_get_next_key() also uses bare rcu_dereference() but is reachable only from the BPF syscall, which holds classic rcu_read_lock() before dispatching, so it is left untouched.
--- kernel/bpf/lpm_trie.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
kernel/bpf/lpm_trie.c +4 -4
@@ -245,7 +245,7 @@ static void *trie_lookup_elem(struct bpf/* Start walking the trie from the root node ... */ -for (node =rcu_dereference_check (trie->root,rcu_read_lock_bh_held ()); +for (node =rcu_dereference_check (trie->root,bpf_rcu_lock_held ()); node;) {unsigned int next_bit;size_t matchlen;
@@ -279,7 +279,7 @@ static void *trie_lookup_elem(struct bpf*/ next_bit =extract_bit (key->data, node->prefixlen); node =rcu_dereference_check (node->child[next_bit], -rcu_read_lock_bh_held ()); +bpf_rcu_lock_held ()); }if (!found)
@@ -362,7 +362,7 @@ static long trie_update_elem(struct bpf_*/ slot = &trie->root; -while ((node =rcu_dereference (*slot))) { +while ((node =rcu_dereference_protected (*slot,1 ))) { matchlen =longest_prefix_match (trie, node, key); if (node->prefixlen != matchlen ||
@@ -483,7 +483,7 @@ static long trie_delete_elem(struct bpf_ trim = &trie->root; trim2 = trim; parent =NULL ; -while ((node =rcu_dereference (*trim))) { +while ((node =rcu_dereference_protected (*trim,1 ))) { matchlen =longest_prefix_match (trie, node, key); if (node->prefixlen != matchlen ||
Greg Kroah-Hartman
maintainerPATCH 1206/1276 usb: iowarrior: remove inherent race with minor number
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Neukum <[email protected]>
[ Upstream commit 56dd29088c9d9510c48a8ebad2465248fde36551 ]
The driver saves the minor number it gets upon registration in its descriptor for debugging purposes. However, there is inevitably a window between registration and saving the correct minor in a descriptor. During this window the debugging output will be wrong.
As wrong debug output is worse than no debug output, just remove it.
Stable-dep-of: c602254ba4c1 ("USB: iowarrior: fix use-after-free on disconnect race")
--- drivers/usb/misc/iowarrior.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-)
drivers/usb/misc/iowarrior.c +3 -14
@@ -74,7 +74,6 @@ struct iowarrior {struct mutex mutex;/* locks this structure */ struct usb_device *udev;/* save off the usb device pointer */ struct usb_interface *interface;/* the interface for this device */ -unsigned char minor;/* the starting minor number for this device */ struct usb_endpoint_descriptor *int_out_endpoint;/* endpoint for reading (needed for IOW56 only) */ struct usb_endpoint_descriptor *int_in_endpoint;/* endpoint for reading */ struct urb *int_in_urb;/* the urb for reading data */
@@ -246,7 +245,6 @@ static void iowarrior_write_callback(str*/ static inline void iowarrior_delete (struct iowarrior *dev) { -dev_dbg (&dev->interface->dev,"minor %d\n" , dev->minor);kfree (dev->int_in_buffer);usb_free_urb (dev->int_in_urb);kfree (dev->read_queue);
@@ -297,9 +295,6 @@ static ssize_t iowarrior_read(struct fil goto exit; } -dev_dbg (&dev->interface->dev,"minor %d, count = %zd\n" , - dev->minor, count); -/* read count must be packet size (+ time stamp) */ if ((count != dev->report_size) && (count != (dev->report_size +1 ))) {
@@ -379,8 +374,6 @@ static ssize_t iowarrior_write(struct fi retval = -ENODEV ; goto exit; } -dev_dbg (&dev->interface->dev,"minor %d, count = %zd\n" , - dev->minor, count);/* if count is 0 we're already done */ if (count ==0 ) { retval =0 ;
@@ -523,9 +516,6 @@ static long iowarrior_ioctl(struct file goto error_out; } -dev_dbg (&dev->interface->dev,"minor %d, cmd 0x%.4x, arg %ld\n" , - dev->minor, cmd, arg); - retval =0 ;switch (cmd) {case IOW_WRITE :
@@ -671,8 +661,6 @@ static int iowarrior_release(struct inodif (!dev)return -ENODEV ; -dev_dbg (&dev->interface->dev,"minor %d\n" , dev->minor); -/* lock our device */ mutex_lock (&dev->mutex);
@@ -775,6 +763,7 @@ static int iowarrior_probe(struct usb_instruct usb_host_interface *iface_desc;int retval = -ENOMEM ;int res; +int minor;/* allocate memory for our device state and initialize it */ dev =kzalloc (sizeof (struct iowarrior ),GFP_KERNEL );
@@ -890,12 +879,12 @@ static int iowarrior_probe(struct usb_in goto error; } - dev->minor = interface->minor; + minor = interface->minor;/* let the user know what node this device is now attached to */ dev_info (&interface->dev,"IOWarrior product=0x%x, serial=%s interface=%d " "now attached to iowarrior%d\n" , dev->product_id, dev->chip_serial, - iface_desc->desc.bInterfaceNumber, dev->minor -IOWARRIOR_MINOR_BASE ); + iface_desc->desc.bInterfaceNumber, minor -IOWARRIOR_MINOR_BASE );return retval; error:
Greg Kroah-Hartman
maintainerPATCH 1207/1276 USB: iowarrior: fix use-after-free on disconnect race
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
[ Upstream commit c602254ba4c10f60a73cd99d147874f86a3f485c ]
mutex_unlock() may access the mutex structure after releasing the lock and therefore cannot be used to manage lifetime of objects directly (unlike spinlocks and refcounts). [1][2]
Use a kref to release the driver data to avoid use-after-free in mutex_unlock() when release() races with disconnect().
[1] a51749ab34d9 ("locking/mutex: Document that mutex_unlock() is non-atomic")
[2] 2b9d9e0a9ba0 ("locking/mutex: Clarify that mutex_unlock(), and most other sleeping locks, can still use the lock object after it's unlocked")
--- drivers/usb/misc/iowarrior.c | 57 ++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 33 deletions(-)
drivers/usb/misc/iowarrior.c +24 -33
@@ -71,6 +71,7 @@ static struct usb_driver iowarrior_drive/* Structure to hold all of our device specific stuff */ struct iowarrior { +struct kref kref;struct mutex mutex;/* locks this structure */ struct usb_device *udev;/* save off the usb device pointer */ struct usb_interface *interface;/* the interface for this device */
@@ -243,8 +244,10 @@ static void iowarrior_write_callback(str/* * iowarrior_delete */ -static inline void iowarrior_delete (struct iowarrior *dev) +static inline void iowarrior_delete (struct kref *kref) { + struct iowarrior *dev = container_of(kref, struct iowarrior, kref); +kfree (dev->int_in_buffer);usb_free_urb (dev->int_in_urb);kfree (dev->read_queue);
@@ -640,6 +643,9 @@ static int iowarrior_open(struct inode * }/* increment our usage count for the driver */ ++dev->opened; + +kref_get (&dev->kref); +/* save our object in the file's private structure */ file->private_data = dev; retval =0 ;
@@ -655,7 +661,6 @@ out:static int iowarrior_release (struct inode *inode,struct file *file) {struct iowarrior *dev; -int retval =0 ; dev = file->private_data;if (!dev)
@@ -663,29 +668,18 @@ static int iowarrior_release(struct inod/* lock our device */ mutex_lock (&dev->mutex); + dev->opened =0 ;/* we're closing now */ -if (dev->opened <=0 ) { - retval = -ENODEV ;/* close called more than once */ -mutex_unlock (&dev->mutex); - }else { - dev->opened =0 ;/* we're closing now */ - retval =0 ; -if (dev->present) { -/* -The device is still connected so we only shutdown -pending read-/write-ops. -*/ -usb_kill_urb (dev->int_in_urb); -wake_up_interruptible (&dev->read_wait); -wake_up_interruptible (&dev->write_wait); -mutex_unlock (&dev->mutex); - }else { -/* The device was unplugged, cleanup resources */ -mutex_unlock (&dev->mutex); -iowarrior_delete (dev); - } +if (dev->present) { +usb_kill_urb (dev->int_in_urb); +wake_up_interruptible (&dev->read_wait); +wake_up_interruptible (&dev->write_wait); } -return retval; +mutex_unlock (&dev->mutex); + +kref_put (&dev->kref, iowarrior_delete); + +return 0 ; }static __poll_t iowarrior_poll (struct file *file,poll_table * wait)
@@ -770,6 +764,7 @@ static int iowarrior_probe(struct usb_inif (!dev)return retval; +kref_init (&dev->kref);mutex_init (&dev->mutex);atomic_set (&dev->intr_idx,0 );
@@ -888,7 +883,8 @@ static int iowarrior_probe(struct usb_inreturn retval; error: -iowarrior_delete (dev); +kref_put (&dev->kref, iowarrior_delete); +return retval; }
@@ -912,19 +908,14 @@ static void iowarrior_disconnect(structusb_kill_anchored_urbs (&dev->submitted);if (dev->opened) { -/* There is a process that holds a filedescriptor to the device , -so we only shutdown read-/write-ops going on. -Deleting the device is postponed until close() was called. -*/ usb_kill_urb (dev->int_in_urb);wake_up_interruptible (&dev->read_wait);wake_up_interruptible (&dev->write_wait); -mutex_unlock (&dev->mutex); - }else { -/* no process is using the device, cleanup now */ -mutex_unlock (&dev->mutex); -iowarrior_delete (dev); } + +mutex_unlock (&dev->mutex); + +kref_put (&dev->kref, iowarrior_delete); }/* usb specific object needed to register this driver with the usb subsystem */
Greg Kroah-Hartman
maintainerPATCH 1208/1276 usb: atm: ueagle-atm: wait for pre-firmware load in .disconnect()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mauricio Faria de Oliveira <[email protected]>
[ Upstream commit e2674dfbed8a30d57e2bc872c4bfa6c3eec918bf ]
ueagle-atm uses the asynchronous request_firmware_nowait() in .probe(), but does not wait for its completion, not even in .disconnect(); so, if the device is unplugged meanwhile, its teardown runs concurrently with that.
Even though this inconsistency is worth addressing on its own, it has also triggered several bug reports in syzbot over the years (some auto-closed) where the firmware sysfs fallback mechanism (CONFIG_FW_LOADER_USER_HELPER) creates a firmware subdirectory in the device directory during its removal, which might hit unexpected conditions in kernfs, apparently, depending at which point the add and remove operations raced. (See links.)
The pattern is:
usb ?-?: Direct firmware load for ueagle-atm/eagle?.fw failed with error -2 usb ?-?: Falling back to sysfs fallback for: ueagle-atm/eagle?.fw <ERROR>
Call trace: ... kernfs_create_dir_ns sysfs_create_dir_ns create_dir kobject_add_internal kobject_add_varg kobject_add class_dir_create_and_add get_device_parent device_add fw_load_sysfs_fallback fw_load_from_user_helper firmware_fallback_sysfs _request_firmware request_firmware_work_func ...
(Some variations are observed, after fw_load_sysfs_fallback(), e.g., [1].)
While the kernfs side is being looked at, the ueagle-atm side can be fixed by waiting for the pre-firmware load in the .disconnect() handler.
This change has a similar approach to previous work by Andrey Tsygunka [2] (wait_for_completion() in .disconnect()), but it is relatively different in design/implementation; using the Originally-by tag for credit assignment.
This has been tested with:
- synthetic reproducer to check the error path;
- USB gadget (virtual device) to check the firmware upload path;
- QEMU device emulator to check the device ID re-enumeration path; (The latter two were written by Claude; no other code/text in this commit.)
Links (year first reported):
2025 https://syzbot.org/bug?extid=ce1e5a1b4e086b43e56d
2025 https://syzbot.org/bug?extid=9af8471255ac36e34fd4
2024 https://syzbot.org/bug?extid=306212936b13e520679d
2023 https://syzkaller.appspot.com/bug?extid=457452d30bcdda75ead2
2022 https://syzbot.org/bug?extid=782984d6f1701b526edb
2021 https://syzbot.org/bug?id=f3f221579f4ef7e9691281f3c6f56c05f83e8490
2021 https://syzbot.org/bug?id=84d86f0d71394829df6fc53daf6642c045983881
2021 https://syzbot.org/bug?id=3302dc1c0e2b9c94f2e8edb404eabc9267bc6f90
[1] https://syzkaller.appspot.com/bug?extid=457452d30bcdda75ead2
[2] https://lore.kernel.org/lkml/[email protected]/
--- drivers/usb/atm/ueagle-atm.c | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-)
drivers/usb/atm/ueagle-atm.c +31 -5
@@ -599,7 +599,9 @@ static int uea_send_modem_cmd(struct usbstatic void uea_upload_pre_firmware (const struct firmware *fw_entry,void *context) { -struct usb_device *usb = context; +struct usb_interface *intf = context; +struct usb_device *usb =interface_to_usbdev (intf); +struct completion *fw_done =usb_get_intfdata (intf);const u8 *pfw;u8 value;u32 crc =0 ;
@@ -670,15 +672,17 @@ err_fw_corrupted: err:release_firmware (fw_entry);uea_leaves (usb); +complete (fw_done); }/* * uea_load_firmware - Load usb firmware for pre-firmware devices. */ -static int uea_load_firmware (struct usb_device *usb,unsigned int ver) +static int uea_load_firmware (struct usb_interface *intf,unsigned int ver) {int ret;char *fw_name =EAGLE_FIRMWARE ; +struct usb_device *usb =interface_to_usbdev (intf);uea_enters (usb);uea_info (usb,"pre-firmware device, uploading firmware\n" );
@@ -702,7 +706,7 @@ static int uea_load_firmware(struct usb_ } ret =request_firmware_nowait (THIS_MODULE ,1 , fw_name, &usb->dev, -GFP_KERNEL , usb, +GFP_KERNEL , intf, uea_upload_pre_firmware);if (ret)uea_err (usb,"firmware %s is not available\n" , fw_name);
@@ -2597,8 +2601,23 @@ static int uea_probe(struct usb_interfacusb_reset_device (usb); -if (UEA_IS_PREFIRM (id)) -return uea_load_firmware (usb,UEA_CHIP_VERSION (id)); +if (UEA_IS_PREFIRM (id)) { +struct completion *fw_done; + +/* Wait for the firmware load to be done, in .disconnect() */ + fw_done =kzalloc (sizeof (*fw_done),GFP_KERNEL ); +if (!fw_done) +return -ENOMEM ; + +init_completion (fw_done); +usb_set_intfdata (intf, fw_done); + + ret =uea_load_firmware (intf,UEA_CHIP_VERSION (id)); +if (ret) +kfree (fw_done); + +return ret; + } ret =usbatm_usb_probe (intf, id, &uea_usbatm_driver);if (ret ==0 ) {
@@ -2629,6 +2648,13 @@ static void uea_disconnect(struct usb_inusbatm_usb_disconnect (intf);mutex_unlock (&uea_mutex);uea_info (usb,"ADSL device removed\n" ); + }else if (usb->config->desc.bNumInterfaces ==1 ) { +struct completion *fw_done =usb_get_intfdata (intf); + +uea_dbg (usb,"pre-firmware device, waiting firmware upload\n" ); +wait_for_completion (fw_done); +uea_dbg (usb,"pre-firmware device, finished waiting\n" ); +kfree (fw_done); }uea_leaves (usb);
Greg Kroah-Hartman
maintainerPATCH 1209/1276 crypto: atmel - Drop explicit initialization of struct i2c_device_id::driver_data to 0
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
[ Upstream commit d86ad3911a5d4549297ed810ee450e5772fd665f ]
These drivers don't use the driver_data member of struct i2c_device_id, so don't explicitly initialize this member.
This prepares putting driver_data in an anonymous union which requires either no initialization or named designators. But it's also a nice cleanup on its own.
Stable-dep-of: ea5e57cc9718 ("crypto: atmel-sha204a - drop hwrng quality reduction for ATSHA204A")
--- drivers/crypto/atmel-ecc.c | 2 +- drivers/crypto/atmel-sha204a.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/crypto/atmel-ecc.c +1 -1
@@ -380,7 +380,7 @@ MODULE_DEVICE_TABLE(of, atmel_ecc_dt_ids#endif static const struct i2c_device_id atmel_ecc_id[] = { - {"atecc508a" ,0 }, + {"atecc508a" }, { } };MODULE_DEVICE_TABLE (i2c, atmel_ecc_id);
drivers/crypto/atmel-sha204a.c +2 -2
@@ -214,8 +214,8 @@ static const struct of_device_id atmel_sMODULE_DEVICE_TABLE (of, atmel_sha204a_dt_ids);static const struct i2c_device_id atmel_sha204a_id[] = { - {"atsha204" ,0 }, - {"atsha204a" ,0 }, + {"atsha204" }, + {"atsha204a" }, {/* sentinel */ } };MODULE_DEVICE_TABLE (i2c, atmel_sha204a_id);
Greg Kroah-Hartman
maintainerPATCH 1210/1276 crypto: atmel-sha204a - drop hwrng quality reduction for ATSHA204A
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thorsten Blum <[email protected]>
[ Upstream commit ea5e57cc97185329dcc5ebdcaae7e1500bf0ad0b ]
Commit 8006aff15516 ("crypto: atmel-sha204a - Set hwrng quality to lowest possible") reduced the hwrng quality to 1 based on a review by Bill Cox [1]. However, despite its title, the review only tested the ATSHA204, not the ATSHA204A.
In the same thread, Atmel engineer Landon Cox wrote "this behavior has been eliminated entirely"[2] in the ATSHA204A and "this problem does not affect the ATECC108 or the ATECC108A (or the ATSHA204A)"[3].
According to the official ATSHA204A datasheet [4], the device contains a high-quality hardware RNG that combines its output with an internal seed value stored in EEPROM or SRAM to generate random numbers. The device also implements all security functions using SHA-256, and the driver uses the chip's Random command in seed-update mode.
Keep 'quality = 1' for ATSHA204, but drop the explicit hwrng quality reduction for ATSHA204A and fall back to the hwrng core default.
[1] https://www.metzdowd.com/pipermail/cryptography/2014-December/023858.html
[2] https://www.metzdowd.com/pipermail/cryptography/2014-December/023852.html
[3] https://www.metzdowd.com/pipermail/cryptography/2014-December/023886.html
[4] https://ww1.microchip.com/downloads/en/DeviceDoc/ATSHA204A-Data-Sheet-40002025A.pdf
--- drivers/crypto/atmel-sha204a.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
drivers/crypto/atmel-sha204a.c +12 -7
@@ -19,6 +19,12 @@#include <linux/workqueue.h> #include "atmel-i2c.h" +/* +* According to review by Bill Cox [1], the ATSHA204 has very low entropy. +* [1] https://www.metzdowd.com/pipermail/cryptography/2014-December/023858.html +*/ +static const unsigned short atsha204_quality =1 ; +static void atmel_sha204a_rng_done (struct atmel_i2c_work_data *work_data,void *areq,int status) {
@@ -158,6 +164,7 @@ static const struct attribute_group atmestatic int atmel_sha204a_probe (struct i2c_client *client) {struct atmel_i2c_client_priv *i2c_priv; +const unsigned short *quality;int ret; ret =atmel_i2c_probe (client);
@@ -171,11 +178,9 @@ static int atmel_sha204a_probe(struct i2 i2c_priv->hwrng.name =dev_name (&client->dev); i2c_priv->hwrng.read = atmel_sha204a_rng_read; -/* -* According to review by Bill Cox [1], this HWRNG has very low entropy. -* [1] https://www.metzdowd.com/pipermail/cryptography/2014-December/023858.html -*/ - i2c_priv->hwrng.quality =1 ; + quality =i2c_get_match_data (client); +if (quality) + i2c_priv->hwrng.quality = *quality; ret =devm_hwrng_register (&client->dev, &i2c_priv->hwrng);if (ret)
@@ -207,14 +212,14 @@ static void atmel_sha204a_remove(struct }static const struct of_device_id atmel_sha204a_dt_ids[]__maybe_unused = { - { .compatible ="atmel,atsha204" , }, + { .compatible ="atmel,atsha204" , .data = &atsha204_quality }, { .compatible ="atmel,atsha204a" , }, {/* sentinel */ } };MODULE_DEVICE_TABLE (of, atmel_sha204a_dt_ids);static const struct i2c_device_id atmel_sha204a_id[] = { - {"atsha204" }, + {"atsha204" , (kernel_ulong_t)&atsha204_quality }, {"atsha204a" }, {/* sentinel */ } };
Greg Kroah-Hartman
maintainerPATCH 1211/1276 usb: gadget: f_fs: initialize reset_work at allocation time
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tyler Baker <[email protected]>
[ Upstream commit 3137b243c93982fe3460335e12f9247739766e10 ]
ffs_fs_kill_sb() unconditionally calls cancel_work_sync() on ffs->reset_work when a functionfs instance is unmounted:
ffs_data_reset(ffs); cancel_work_sync(&ffs->reset_work);
However ffs->reset_work is only ever initialized via INIT_WORK() in ffs_func_set_alt() and ffs_func_disable(), and only on the FFS_DEACTIVATED path. That state is reached solely by ffs_data_closed() when the instance is mounted with the "no_disconnect" option, so for the common case (no "no_disconnect", or mounted and unmounted without ever being deactivated) reset_work is never initialized.
ffs_data_new() allocates the ffs_data with kzalloc_obj() and does not initialize reset_work, and ffs_data_reset()/ffs_data_clear() do not touch it either, so reset_work.func is left NULL. cancel_work_sync() on such a work then trips the WARN_ON(!work->func) guard in __flush_work():
WARNING: kernel/workqueue.c:4301 at __flush_work+0x330/0x360, CPU#3: umount Call trace: __flush_work cancel_work_sync ffs_fs_kill_sb [usb_f_fs] deactivate_locked_super deactivate_super cleanup_mnt __cleanup_mnt task_work_run exit_to_user_mode_loop el0_svc
On older kernels cancel_work_sync() on a zero-initialized work struct was a silent no-op, which hid the missing initialization.
Initialize reset_work once in ffs_data_new() so it is always valid for the lifetime of the ffs_data, and drop the now-redundant INIT_WORK() calls from the two deactivation paths.
--- drivers/usb/gadget/function/f_fs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/gadget/function/f_fs.c +2 -2
@@ -291,6 +291,7 @@ static int ffs_acquire_dev(const char *dstatic void ffs_release_dev (struct ffs_dev *ffs_dev);static int ffs_ready (struct ffs_data *ffs);static void ffs_closed (struct ffs_data *ffs); +static void ffs_reset_work (struct work_struct *work);/* Misc helper functions ****************************************************/
@@ -2224,6 +2225,7 @@ static struct ffs_data *ffs_data_new(coninit_waitqueue_head (&ffs->ev.waitq);init_waitqueue_head (&ffs->wait);init_completion (&ffs->ep0req_completion); +INIT_WORK (&ffs->reset_work, ffs_reset_work);/* XXX REVISIT need to update it in some places, or do we? */ ffs->ev.can_stall =1 ;
@@ -3770,7 +3772,6 @@ static int ffs_func_set_alt(struct usb_fif (ffs->state ==FFS_DEACTIVATED ) { ffs->state =FFS_CLOSING ; -INIT_WORK (&ffs->reset_work, ffs_reset_work);schedule_work (&ffs->reset_work);return -ENODEV ; }
@@ -3797,7 +3798,6 @@ static void ffs_func_disable(struct usb_if (ffs->state ==FFS_DEACTIVATED ) { ffs->state =FFS_CLOSING ; -INIT_WORK (&ffs->reset_work, ffs_reset_work);schedule_work (&ffs->reset_work);return ; }
Greg Kroah-Hartman
maintainerPATCH 1212/1276 crypto: atmel-sha204a - fail on hwrng registration error in probe path
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thorsten Blum <[email protected]>
[ Upstream commit 49e05bb00f2e8168695f7af4d694c39e1423e8a2 ]
Commit 13909a0c8897 ("crypto: atmel-sha204a - provide the otp content") overwrote the hwrng registration return value when creating the sysfs group, which allowed atmel_sha204a_probe() to succeed even if devm_hwrng_register() failed.
Return immediately when devm_hwrng_register() fails, and report both hwrng and sysfs registration errors with dev_err(). Adjust the sysfs error log message for consistency.
--- drivers/crypto/atmel-sha204a.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/crypto/atmel-sha204a.c +5 -3
@@ -183,8 +183,10 @@ static int atmel_sha204a_probe(struct i2 i2c_priv->hwrng.quality = *quality; ret =devm_hwrng_register (&client->dev, &i2c_priv->hwrng); -if (ret) -dev_warn (&client->dev,"failed to register RNG (%d)\n" , ret); +if (ret) { +dev_err (&client->dev,"failed to register RNG (%d)\n" , ret); +return ret; + }/* otp read out */ if (!i2c_check_functionality (client->adapter,I2C_FUNC_I2C ))
@@ -192,7 +194,7 @@ static int atmel_sha204a_probe(struct i2 ret =sysfs_create_group (&client->dev.kobj, &atmel_sha204a_groups);if (ret) { -dev_err (&client->dev,"failed to register sysfs entry\n" ); +dev_err (&client->dev,"failed to create sysfs group (%d)\n" , ret);return ret; }
Greg Kroah-Hartman
maintainerPATCH 1213/1276 usb: gadget: f_fs: Tie read_buffer lifetime to ffs_epfile
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Neill Kapron <[email protected]>
[ Upstream commit 8bdcf96eb135aebacac319667f87db034fb38406 ]
Currently, ffs_epfile_release unconditionally frees the endpoint's read_buffer when a file descriptor is closed. If userspace explicitly opens the endpoint multiple times and closes one, the read_buffer is destroyed. This can lead to silent data loss if other file descriptors are still actively reading from the endpoint.
By tying the lifetime of the read_buffer to the ffs_epfile structure itself (which is destroyed when the functionfs instance is torn down in ffs_epfiles_destroy), we eliminate the brittle dependency on open/release calls while correctly matching the conceptual lifetime of unread data on the hardware endpoint.
--- drivers/usb/gadget/function/f_fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/gadget/function/f_fs.c +1 -1
@@ -1365,7 +1365,6 @@ ffs_epfile_release(struct inode *inode,mutex_unlock (&epfile->dmabufs_mutex); -__ffs_epfile_read_buffer_free (epfile);ffs_data_closed (epfile->ffs);return 0 ;
@@ -2386,6 +2385,7 @@ static void ffs_epfiles_destroy(struct ffor (; count; --count, ++epfile) {BUG_ON (mutex_is_locked (&epfile->mutex)); +__ffs_epfile_read_buffer_free (epfile);if (epfile->dentry) {d_delete (epfile->dentry);dput (epfile->dentry);
Greg Kroah-Hartman
maintainerPATCH 1214/1276 btrfs: concentrate the error handling of submit_one_sector()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qu Wenruo <[email protected]>
[ Upstream commit 44820d80026e0b509007d41c83d42f1213ee8589 ]
Currently submit_one_sector() has only one failure path from btrfs_get_extent().
However the error handling is split into two parts, one inside submit_one_sector(), which clears the dirty flag and finishes the writeback for the fs block.
The other part is to submit any remaining bio inside bio_ctrl and mark the ordered extent finished for the fs block.
There is no special reason that we must split the error handling, let's just concentrate all the error handling into submit_one_sector().
Stable-dep-of: 66ff4d366e7e ("btrfs: fix false IO failure after falling back to buffered write")
--- fs/btrfs/extent_io.c | 46 ++++++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 18 deletions(-)
fs/btrfs/extent_io.c +28 -18
@@ -1417,7 +1417,7 @@ out:/* * Return 0 if we have submitted or queued the sector for submission. -* Return <0 for critical errors. +* Return <0 for critical errors, and the involved sector will be cleaned up. * * Caller should make sure filepos < i_size and handle filepos >= i_size case. */
@@ -1440,8 +1440,31 @@ static int submit_one_sector(struct btrfASSERT (filepos < i_size); em =btrfs_get_extent (inode,NULL , filepos, sectorsize); -if (IS_ERR (em)) -return PTR_ERR_OR_ZERO (em); +if (IS_ERR (em)) { +/* +* bio_ctrl may contain a bio crossing several folios. +* Submit it immediately so that the bio has a chance +* to finish normally, other than marked as error. +*/ +submit_one_bio (bio_ctrl); + +/* +* When submission failed, we should still clear the folio dirty. +* Or the folio will be written back again but without any +* ordered extent. +*/ +btrfs_folio_clear_dirty (fs_info, folio, filepos, sectorsize); +btrfs_folio_set_writeback (fs_info, folio, filepos, sectorsize); +btrfs_folio_clear_writeback (fs_info, folio, filepos, sectorsize); + +/* +* Since there is no bio submitted to finish the ordered +* extent, we have to manually finish this sector. +*/ +btrfs_mark_ordered_io_finished (inode, folio, filepos, + fs_info->sectorsize, false); +return PTR_ERR (em); + } extent_offset = filepos - em->start; em_end =extent_map_end (em);
@@ -1559,19 +1582,6 @@ static noinline_for_stack int extent_wri } ret =submit_one_sector (inode, folio, cur, bio_ctrl, i_size);if (unlikely (ret <0 )) { -/* -* bio_ctrl may contain a bio crossing several folios. -* Submit it immediately so that the bio has a chance -* to finish normally, other than marked as error. -*/ -submit_one_bio (bio_ctrl); -/* -* Failed to grab the extent map which should be very rare. -* Since there is no bio submitted to finish the ordered -* extent, we have to manually finish this sector. -*/ -btrfs_mark_ordered_io_finished (inode, folio, cur, - fs_info->sectorsize, false);if (!found_error) found_error = ret;continue ;
@@ -1587,8 +1597,8 @@ static noinline_for_stack int extent_wri* Here we set writeback and clear for the range. If the full folio * is no longer dirty then we clear the PAGECACHE_TAG_DIRTY tag. * -* If we hit any error, the corresponding sector will still be dirty -* thus no need to clear PAGECACHE_TAG_DIRTY. +* If we hit any error, the corresponding sector will have its dirty +* flag cleared and writeback finished, thus no need to handle the error case. */ if (!submitted_io && !found_error) {btrfs_folio_set_writeback (fs_info, folio, start, len);
Greg Kroah-Hartman
maintainerPATCH 1215/1276 btrfs: replace for_each_set_bit() with for_each_set_bitmap()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qu Wenruo <[email protected]>
[ Upstream commit e6698b34fab33867ef3faeeea6feb165f31aae24 ]
Inside extent_io.c, there are several simple call sites doing things like:
for_each_set_bit(bit, bitmap, bitmap_size) {
/* handle one fs block */
}The workload includes:
- set_bit()
Inside extent_writepage_io().
This can be replaced with a bitmap_set().
- btrfs_folio_set_lock()
- btrfs_mark_ordered_io_finished()
Inside writepage_delalloc().
Instead of calling it multiple times, we can pass a range into the function with one call.
Stable-dep-of: 66ff4d366e7e ("btrfs: fix false IO failure after falling back to buffered write")
--- fs/btrfs/extent_io.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-)
fs/btrfs/extent_io.c +16 -10
@@ -1245,8 +1245,9 @@ static noinline_for_stack int writepage_u64 delalloc_start = page_start;u64 delalloc_end = page_end;u64 delalloc_to_write =0 ; +unsigned int start_bit; +unsigned int end_bit;int ret =0 ; -int bit;/* Save the dirty bitmap as our submission bitmap will be a subset of it. */ if (btrfs_is_subpage (fs_info, inode->vfs_inode.i_mapping)) {
@@ -1256,10 +1257,12 @@ static noinline_for_stack int writepage_ bio_ctrl->submit_bitmap =1 ; } -for_each_set_bit (bit, &bio_ctrl->submit_bitmap, blocks_per_folio) { -u64 start = page_start + (bit << fs_info->sectorsize_bits); +for_each_set_bitrange (start_bit, end_bit, &bio_ctrl->submit_bitmap, + blocks_per_folio) { +u64 start = page_start + (start_bit << fs_info->sectorsize_bits); +u32 len = (end_bit - start_bit) << fs_info->sectorsize_bits; -btrfs_folio_set_lock (fs_info, folio, start, fs_info->sectorsize); +btrfs_folio_set_lock (fs_info, folio, start, len); }/* Lock all (subpage) delalloc ranges inside the folio first. */
@@ -1376,10 +1379,13 @@ static noinline_for_stack int writepage_ fs_info->sectorsize_bits, blocks_per_folio); -for_each_set_bit (bit, &bio_ctrl->submit_bitmap, bitmap_size) -btrfs_mark_ordered_io_finished (inode, folio, - page_start + (bit << fs_info->sectorsize_bits), - fs_info->sectorsize, false); +for_each_set_bitrange (start_bit, end_bit, &bio_ctrl->submit_bitmap, + bitmap_size) { +u64 start = page_start + (start_bit << fs_info->sectorsize_bits); +u32 len = (end_bit - start_bit) << fs_info->sectorsize_bits; + +btrfs_mark_ordered_io_finished (inode, folio, start, len, false); + }return ret; } out:
@@ -1539,8 +1545,8 @@ static noinline_for_stack int extent_wrireturn 1 ; } -for (cur = start; cur < end; cur += fs_info->sectorsize) -set_bit ((cur - folio_start) >> fs_info->sectorsize_bits, &range_bitmap); +bitmap_set (&range_bitmap, (start -folio_pos (folio)) >> fs_info->sectorsize_bits, + len >> fs_info->sectorsize_bits);bitmap_and (&bio_ctrl->submit_bitmap, &bio_ctrl->submit_bitmap, &range_bitmap, blocks_per_folio);