6.18.40-rc1 review
Subsystems (13)
Greg Kroah-Hartman
maintainerPATCH 106/1611 pinctrl: sunxi: fix regulator leak in sunxi_pmx_request() error path
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Felix Gu <[email protected]>
[ Upstream commit 334f7bcbdc79dc8e5b938ac3372453a5368221cf ]
In the error path of sunxi_pmx_request(), the code calls regulator_put(s_reg->regulator) to release the regulator. However, s_reg->regulator is only assigned after a successful regulator_enable(). This causes a memory leak: the regulator obtained via regulator_get() is never properly released when regulator_enable() fails.
--- drivers/pinctrl/sunxi/pinctrl-sunxi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/sunxi/pinctrl-sunxi.c +1 -1
@@ -896,7 +896,7 @@ static int sunxi_pmx_request(struct pinctrl_dev *pctldev, unsigned offset)return 0 ; out: -regulator_put (s_reg->regulator); +regulator_put (reg);return ret; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 107/1611 dt-bindings: vendor-prefixes: Add Displaytech Ltd.
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Vasut <[email protected]>
[ Upstream commit 42112cff8cb78ff6120983ba71bd14d52ce9dccd ]
Add "displaytech" vendor prefix for Displaytech Ltd. .
--- Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/vendor-prefixes.yaml +2 -0
@@ -419,6 +419,8 @@ patternProperties: description: Diodes, Inc. "^dioo,.*": description: Dioo Microcircuit Co., Ltd + "^displaytech,.*": + description: Displaytech Ltd. "^djn,.*": description: Shenzhen DJN Optronics Technology Co., Ltd "^dlc,.*":
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 108/1611 drm/gpuvm: take refcount on DRM device
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alice Ryhl <[email protected]>
[ Upstream commit c2d72717e0a9dd01c6a1bac61a1462a8e04bd179 ]
Currently GPUVM relies on the owner implicitly holding a refcount to the drm device, and it does not implicitly take a refcount on the drm device. This design is error-prone, so take a refcount on the device.
--- drivers/gpu/drm/drm_gpuvm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_gpuvm.c +5 -1
@@ -25,6 +25,7 @@* */ +#include <drm/drm_drv.h> #include <drm/drm_gpuvm.h> #include <linux/export.h>
@@ -1089,6 +1090,7 @@ drm_gpuvm_init(struct drm_gpuvm *gpuvm, const char *name, gpuvm->drm = drm; gpuvm->r_obj = r_obj; +drm_dev_get (drm);drm_gem_object_get (r_obj);drm_gpuvm_warn_check_overflow (gpuvm, start_offset, range);
@@ -1130,13 +1132,15 @@ static void drm_gpuvm_free(struct kref *kref) { struct drm_gpuvm *gpuvm = container_of(kref, struct drm_gpuvm, kref); +struct drm_device *drm = gpuvm->drm;drm_gpuvm_fini (gpuvm); -if (drm_WARN_ON (gpuvm->drm, !gpuvm->ops->vm_free)) +if (drm_WARN_ON (drm, !gpuvm->ops->vm_free))return ; gpuvm->ops->vm_free (gpuvm); +drm_dev_put (drm); }/**
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 109/1611 drm/panel: Clean up S6E3HA2 config dependencies and fill help text
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Heidelberg <[email protected]>
[ Upstream commit 632a8aa96d0717aa92cb63e3939d09b896223b4c ]
As per the config name this Display IC features a DSI command-mode interface (or the command to switch to video mode is not known/documented) and does not use any of the video-mode helper utilities, hence should not select VIDEOMODE_HELPERS. In addition it uses devm_gpiod_get() and related functions from GPIOLIB.
--- drivers/gpu/drm/panel/Kconfig | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/gpu/drm/panel/Kconfig +8 -1
@@ -810,11 +810,18 @@ config DRM_PANEL_SAMSUNG_S6E3HA2 config DRM_PANEL_SAMSUNG_S6E3HA8 tristate "Samsung S6E3HA8 DSI video mode panel" + depends on GPIOLIB depends on OF depends on DRM_MIPI_DSI depends on BACKLIGHT_CLASS_DEVICE select DRM_DISPLAY_DSC_HELPER - select VIDEOMODE_HELPERS + help + Say Y or M here if you want to enable support for the + Samsung S6E3HA8 DDIC and connected MIPI DSI panel. + Currently supported panels: + + Samsung AMB577PX01 (found in the Samsung S9 smartphone) + config DRM_PANEL_SAMSUNG_S6E63J0X03 tristate "Samsung S6E63J0X03 DSI command mode panel"
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 110/1611 ARM: dts: rockchip: Add #{address,size}-cells to Chromium-based /firmware
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brian Norris <[email protected]>
[ Upstream commit 98461edf564a35ee00a97a64f5463eaece586546 ]
Chromium/Depthcharge bootloaders may dynamically add a few device nodes to a system's DTB under a /firmware node. A typical DT looks something like the following:
/ {
firmware {
ranges;
coreboot {
compatible = "coreboot";
reg = <...>;
...;
};
};
};Notably, the /firmware node has an empty 'ranges', but does not have address/size-cells.
Commit 6e5773d52f4a ("of/address: Fix WARN when attempting translating non-translatable addresses") started requiring #address-cells for a device's parent if we want to use the reg resource in a device node. This leads to errors like the following:
[ 7.763870] coreboot_table firmware:coreboot: probe with driver coreboot_table failed with error -22
Add appropriate #{address,size}-cells to work around the problem.
Note that Google has also patched the Depthcharge bootloader source to add {address,size}-cells [1], but bootloader updates are typically delivered only via Google OS updates. Not all users install Google software updates, and even if they do, Google may not produce updated binaries for all/older devices.
[1] https://lore.kernel.org/all/[email protected]/
https://crrev.com/c/6051580 ("coreboot: Insert #address-cells and #size-cells for firmware node")
[On RK288-based Chromebooks there is no real other way than to load the
DTB together with its kernel when running a mainline kernel and as the whole line is EOL, there also won't be any updates to the bootloader that could fix that issue there.]
--- arch/arm/boot/dts/rockchip/rk3288-veyron.dtsi | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm/boot/dts/rockchip/rk3288-veyron.dtsi +5 -0
@@ -18,6 +18,11 @@ chosen { stdout-path = "serial2:115200n8"; }; + firmware { + #address-cells = <1>; + #size-cells = <1>; + }; + /* * The default coreboot on veyron devices ignores memory@0 nodes * and would instead create another memory node.
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 111/1611 arm64: dts: rockchip: Add #{address,size}-cells to Chromium-based /firmware
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brian Norris <[email protected]>
[ Upstream commit 0b74f1a037672980c477bbe6b3848fb5341eb4f1 ]
Chromium/Depthcharge bootloaders may dynamically add a few device nodes to a system's DTB under a /firmware node. A typical DT looks something like the following:
## From a RK3399 Gru/Kevin Chromebook:
# find /sys/firmware/devicetree/base/firmware /sys/firmware/devicetree/base/firmware /sys/firmware/devicetree/base/firmware/coreboot /sys/firmware/devicetree/base/firmware/coreboot/ram-code /sys/firmware/devicetree/base/firmware/coreboot/compatible /sys/firmware/devicetree/base/firmware/coreboot/board-id /sys/firmware/devicetree/base/firmware/coreboot/reg /sys/firmware/devicetree/base/firmware/coreboot/name /sys/firmware/devicetree/base/firmware/chromeos /sys/firmware/devicetree/base/firmware/chromeos/readonly-firmware-version /sys/firmware/devicetree/base/firmware/chromeos/active-ec-firmware /sys/firmware/devicetree/base/firmware/chromeos/firmware-version /sys/firmware/devicetree/base/firmware/chromeos/nonvolatile-context-storage /sys/firmware/devicetree/base/firmware/chromeos/vboot-shared-data /sys/firmware/devicetree/base/firmware/chromeos/nonvolatile-context-size /sys/firmware/devicetree/base/firmware/chromeos/nonvolatile-context-offset /sys/firmware/devicetree/base/firmware/chromeos/hardware-id /sys/firmware/devicetree/base/firmware/chromeos/compatible /sys/firmware/devicetree/base/firmware/chromeos/firmware-type /sys/firmware/devicetree/base/firmware/chromeos/fmap-offset /sys/firmware/devicetree/base/firmware/chromeos/name /sys/firmware/devicetree/base/firmware/ranges /sys/firmware/devicetree/base/firmware/name
The /firmware node has an empty 'ranges', but does not have address/size-cells.
Commit 6e5773d52f4a ("of/address: Fix WARN when attempting translating non-translatable addresses") started requiring #address-cells for a device's parent if we want to use the reg resource in a device node. This leads to errors like the following:
[ 7.763870] coreboot_table firmware:coreboot: probe with driver coreboot_table failed with error -22
Add appropriate #{address,size}-cells to work around the problem.
Note that Google has also patched the Depthcharge bootloader source to add {address,size}-cells [1], but bootloader updates are typically delivered only via Google OS updates. Not all users install Google software updates, and even if they do, Google may not produce updated binaries for all/older devices.
[1] https://lore.kernel.org/all/[email protected]/
https://crrev.com/c/6051580 ("coreboot: Insert #address-cells and #size-cells for firmware node")
[On RK3399-based Chromebooks there is no real other way than to load the
DTB together with its kernel when running a mainline kernel and as the whole line is EOL, there also won't be any updates to the bootloader that could fix that issue there.]
--- arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi +5 -0
@@ -18,6 +18,11 @@ chosen { stdout-path = "serial2:115200n8"; }; + firmware { + #address-cells = <2>; + #size-cells = <2>; + }; + /* * Power Tree *
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 112/1611 arm64: dts: rockchip: fix rk809 interrupt pin on rk3566-roc-pc
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Weixin Guo <[email protected]>
[ Upstream commit 460bac478c5fe69054ffc60d607bba03bcaf909b ]
The RK809 PMIC interrupt pin on the Firefly ROC-RK3566-PC (Station M2) is physically connected to GPIO0_A3 (RK_PA3) according to the board's schematic.
Currently, the PMIC node incorrectly specifies RK_PA7 for the interrupt, which prevents the PMIC from correctly signaling interrupts. (Note that the pinctrl node 'pmic_int' correctly configures RK_PA3).
Fix this by updating the interrupts property to use RK_PA3.
--- arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts +1 -1
@@ -245,7 +245,7 @@ rk809: pmic@20 { compatible = "rockchip,rk809"; reg = <0x20>; interrupt-parent = <&gpio0>; - interrupts = <RK_PA7 IRQ_TYPE_LEVEL_LOW>; + interrupts = <RK_PA3 IRQ_TYPE_LEVEL_LOW>; clock-output-names = "rk808-clkout1", "rk808-clkout2"; assigned-clocks = <&cru I2S1_MCLKOUT_TX>; assigned-clock-parents = <&cru CLK_I2S1_8CH_TX>;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 113/1611 arm64: dts: imx8x-colibri: Correct SODIMM PAD settings
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peng Fan <[email protected]>
[ Upstream commit 0a03ee38a262cab0d9754e9947d565e089a9f7a5 ]
SION is BIT(30), not BIT(26). Correct it.
--- arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi +2 -2
@@ -604,12 +604,12 @@ pinctrl_adc0: adc0grp { */ pinctrl_atmel_adap: atmeladaptergrp { fsl,pins = <IMX8QXP_UART1_RX_LSIO_GPIO0_IO22 0x21>, /* SODIMM 30 */ - <IMX8QXP_UART1_TX_LSIO_GPIO0_IO21 0x4000021>; /* SODIMM 28 */ + <IMX8QXP_UART1_TX_LSIO_GPIO0_IO21 0x40000021>; /* SODIMM 28 */ }; /* Atmel MXT touchsceen + boards with built-in Capacitive Touch Connector */ pinctrl_atmel_conn: atmelconnectorgrp { - fsl,pins = <IMX8QXP_QSPI0B_DATA2_LSIO_GPIO3_IO20 0x4000021>, /* SODIMM 107 */ + fsl,pins = <IMX8QXP_QSPI0B_DATA2_LSIO_GPIO3_IO20 0x40000021>, /* SODIMM 107 */ <IMX8QXP_QSPI0B_SS1_B_LSIO_GPIO3_IO24 0x21>; /* SODIMM 106 */ };
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 114/1611 Revert "arm64: dts: imx8mm-kontron: Add support for reading SD_VSEL signal"
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peng Fan <[email protected]>
[ Upstream commit aa907ee010e396c0c0d31d60495ace6e531ceec9 ]
This reverts commit 8472751c4d96b558d60d0f6aede6b24b64bcb3c9.
The board uses SDHC VSELECT to automatically switch between 1.8v and 3.3v. It does not use GPIO to control the PMIC SD_VSEL signal. The original commit intends to read back SD_VSEL value from GPIO, but it is wrong. When MUX is configured as SDHC VSELECT, it is impossible to read back the value from GPIO controller. Setting SION could only enable the input path for the mux function. It could not redirect the input to GPIO.
And value "0x40000d0" is wrong, SION is BIT30, not BIT26.
--- arch/arm64/boot/dts/freescale/imx8mm-kontron-bl.dts | 10 +++------- .../arm64/boot/dts/freescale/imx8mm-kontron-osm-s.dtsi | 7 +++---- 2 files changed, 6 insertions(+), 11 deletions(-)
arch/arm64/boot/dts/freescale/imx8mm-kontron-bl.dts +3 -7
@@ -254,10 +254,6 @@ &pwm2 { status = "okay"; }; -®_nvcc_sd { - sd-vsel-gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; -}; - &uart1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart1>;
@@ -466,7 +462,7 @@ MX8MM_IOMUXC_SD2_DATA1_USDHC2_DATA1 0x1d0 MX8MM_IOMUXC_SD2_DATA2_USDHC2_DATA2 0x1d0 MX8MM_IOMUXC_SD2_DATA3_USDHC2_DATA3 0x1d0 MX8MM_IOMUXC_SD2_CD_B_GPIO2_IO12 0x19 - MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT 0x40000d0 + MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT 0xd0 >; };
@@ -479,7 +475,7 @@ MX8MM_IOMUXC_SD2_DATA1_USDHC2_DATA1 0x1d4 MX8MM_IOMUXC_SD2_DATA2_USDHC2_DATA2 0x1d4 MX8MM_IOMUXC_SD2_DATA3_USDHC2_DATA3 0x1d4 MX8MM_IOMUXC_SD2_CD_B_GPIO2_IO12 0x19 - MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT 0x40000d0 + MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT 0xd0 >; };
@@ -492,7 +488,7 @@ MX8MM_IOMUXC_SD2_DATA1_USDHC2_DATA1 0x1d6 MX8MM_IOMUXC_SD2_DATA2_USDHC2_DATA2 0x1d6 MX8MM_IOMUXC_SD2_DATA3_USDHC2_DATA3 0x1d6 MX8MM_IOMUXC_SD2_CD_B_GPIO2_IO12 0x19 - MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT 0x40000d0 + MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT 0xd0 >; }; };
arch/arm64/boot/dts/freescale/imx8mm-kontron-osm-s.dtsi +3 -4
@@ -342,7 +342,6 @@ reg_nvcc_sd: LDO5 { regulator-name = "NVCC_SD (LDO5)"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3300000>; - sd-vsel-gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; }; }; };
@@ -795,7 +794,7 @@ MX8MM_IOMUXC_SD2_DATA1_USDHC2_DATA1 0x1d0 /* SDIO_A_D1 */ MX8MM_IOMUXC_SD2_DATA2_USDHC2_DATA2 0x1d0 /* SDIO_A_D2 */ MX8MM_IOMUXC_SD2_DATA3_USDHC2_DATA3 0x1d0 /* SDIO_A_D3 */ MX8MM_IOMUXC_SD2_WP_USDHC2_WP 0x400000d6 /* SDIO_A_WP */ - MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT 0x40000090 + MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT 0x90 >; };
@@ -808,7 +807,7 @@ MX8MM_IOMUXC_SD2_DATA1_USDHC2_DATA1 0x1d4 /* SDIO_A_D1 */ MX8MM_IOMUXC_SD2_DATA2_USDHC2_DATA2 0x1d4 /* SDIO_A_D2 */ MX8MM_IOMUXC_SD2_DATA3_USDHC2_DATA3 0x1d4 /* SDIO_A_D3 */ MX8MM_IOMUXC_SD2_WP_USDHC2_WP 0x400000d6 /* SDIO_A_WP */ - MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT 0x40000090 + MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT 0x90 >; };
@@ -821,7 +820,7 @@ MX8MM_IOMUXC_SD2_DATA1_USDHC2_DATA1 0x1d6 /* SDIO_A_D1 */ MX8MM_IOMUXC_SD2_DATA2_USDHC2_DATA2 0x1d6 /* SDIO_A_D2 */ MX8MM_IOMUXC_SD2_DATA3_USDHC2_DATA3 0x1d6 /* SDIO_A_D3 */ MX8MM_IOMUXC_SD2_WP_USDHC2_WP 0x400000d6 /* SDIO_A_WP */ - MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT 0x40000090 + MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT 0x90 >; };
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 115/1611 Revert "arm64: dts: imx8mp-kontron: Add support for reading SD_VSEL signal"
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peng Fan <[email protected]>
[ Upstream commit 22465a195af370ed6311be3adee479fb7c683685 ]
This reverts commit 39e4189d9d63a0b6fc15458ce0136e99ecdfb1b8.
The board uses SDHC VSELECT to automatically switch between 1.8v and 3.3v. It does not use GPIO to control the PMIC SD_VSEL signal. The original commit intends to read back SD_VSEL value from GPIO, but it is wrong. When MUX is configured as SDHC VSELECT, it is impossible to read back the value from GPIO controller. Setting SION could only enable the input path for the mux function. It could not redirect the input to GPIO.
--- arch/arm64/boot/dts/freescale/imx8mp-kontron-osm-s.dtsi | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/freescale/imx8mp-kontron-osm-s.dtsi +3 -4
@@ -311,7 +311,6 @@ reg_nvcc_sd: LDO5 { regulator-name = "NVCC_SD (LDO5)"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3300000>; - sd-vsel-gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; }; }; };
@@ -815,7 +814,7 @@ MX8MP_IOMUXC_SD2_DATA0__USDHC2_DATA0 0x1d0 /* SDIO_A_D0 */ MX8MP_IOMUXC_SD2_DATA1__USDHC2_DATA1 0x1d0 /* SDIO_A_D1 */ MX8MP_IOMUXC_SD2_DATA2__USDHC2_DATA2 0x1d0 /* SDIO_A_D2 */ MX8MP_IOMUXC_SD2_DATA3__USDHC2_DATA3 0x1d0 /* SDIO_A_D3 */ - MX8MP_IOMUXC_GPIO1_IO04__USDHC2_VSELECT 0x400001d0 + MX8MP_IOMUXC_GPIO1_IO04__USDHC2_VSELECT 0x1d0 >; };
@@ -827,7 +826,7 @@ MX8MP_IOMUXC_SD2_DATA0__USDHC2_DATA0 0x1d4 /* SDIO_A_D0 */ MX8MP_IOMUXC_SD2_DATA1__USDHC2_DATA1 0x1d4 /* SDIO_A_D1 */ MX8MP_IOMUXC_SD2_DATA2__USDHC2_DATA2 0x1d4 /* SDIO_A_D2 */ MX8MP_IOMUXC_SD2_DATA3__USDHC2_DATA3 0x1d4 /* SDIO_A_D3 */ - MX8MP_IOMUXC_GPIO1_IO04__USDHC2_VSELECT 0x400001d0 + MX8MP_IOMUXC_GPIO1_IO04__USDHC2_VSELECT 0x1d0 >; };
@@ -839,7 +838,7 @@ MX8MP_IOMUXC_SD2_DATA0__USDHC2_DATA0 0x1d6 /* SDIO_A_D0 */ MX8MP_IOMUXC_SD2_DATA1__USDHC2_DATA1 0x1d6 /* SDIO_A_D1 */ MX8MP_IOMUXC_SD2_DATA2__USDHC2_DATA2 0x1d6 /* SDIO_A_D2 */ MX8MP_IOMUXC_SD2_DATA3__USDHC2_DATA3 0x1d6 /* SDIO_A_D3 */ - MX8MP_IOMUXC_GPIO1_IO04__USDHC2_VSELECT 0x400001d0 + MX8MP_IOMUXC_GPIO1_IO04__USDHC2_VSELECT 0x1d0 >; };
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 116/1611 vxlan: Fix potential null-ptr-deref in vxlan_gro_prepare_receive().
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit 30a45c0bffdd62350261e2f2689fdba426a33578 ]
udp_tunnel_sock_release() could set sk->sk_user_data to NULL while vxlan_gro_prepare_receive() is running.
Let's check if rcu_dereference_sk_user_data() is NULL after skb_gro_remcsum_init().
--- drivers/net/vxlan/vxlan_core.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/vxlan/vxlan_core.c +6 -2
@@ -658,14 +658,18 @@ static struct vxlanhdr *vxlan_gro_prepare_receive(struct sock *sk,struct sk_buff *skb, struct gro_remcsum *grc) { - struct sk_buff *p; struct vxlanhdr *vh, *vh2;unsigned int hlen, off_vx; -struct vxlan_sock *vs =rcu_dereference_sk_user_data (sk); +struct vxlan_sock *vs; +struct sk_buff *p;__be32 flags;skb_gro_remcsum_init (grc); + vs =rcu_dereference_sk_user_data (sk); +if (!vs) +return NULL ; + off_vx =skb_gro_offset (skb); hlen = off_vx +sizeof (*vh); vh =skb_gro_header (skb, hlen, off_vx);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 117/1611 drm: renesas: rz-du: mipi_dsi: Fix return path on error
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chris Brandt <[email protected]>
[ Upstream commit 79e1afecfe1afbfd06f63bf7bbe854a88155b7bd ]
In case of error, we should unwind correctly.
Switching to using dmam_ instead of dma_ and moving the code earlier fixes the issue.
--- drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c +5 -7
@@ -1002,6 +1002,11 @@ static int rzg2l_mipi_dsi_probe(struct platform_device *pdev)return dev_err_probe (dsi->dev,PTR_ERR (dsi->prstc),"failed to get prst\n" ); + dsi->dcs_buf_virt =dmam_alloc_coherent (dsi->dev,RZG2L_DCS_BUF_SIZE , + &dsi->dcs_buf_phys,GFP_KERNEL ); +if (!dsi->dcs_buf_virt) +return -ENOMEM ; +platform_set_drvdata (pdev, dsi);pm_runtime_enable (dsi->dev);
@@ -1034,11 +1039,6 @@ static int rzg2l_mipi_dsi_probe(struct platform_device *pdev)if (ret <0 ) goto err_pm_disable; - dsi->dcs_buf_virt =dma_alloc_coherent (dsi->host.dev,RZG2L_DCS_BUF_SIZE , - &dsi->dcs_buf_phys,GFP_KERNEL ); -if (!dsi->dcs_buf_virt) -return -ENOMEM ; -return 0 ; err_phy:
@@ -1053,8 +1053,6 @@ static void rzg2l_mipi_dsi_remove(struct platform_device *pdev) {struct rzg2l_mipi_dsi *dsi =platform_get_drvdata (pdev); -dma_free_coherent (dsi->host.dev,RZG2L_DCS_BUF_SIZE , dsi->dcs_buf_virt, - dsi->dcs_buf_phys);mipi_dsi_host_unregister (&dsi->host);pm_runtime_disable (&pdev->dev); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 118/1611 alarmtimer: Remove stale return description from alarm_handle_timer()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhan Xusheng <[email protected]>
[ Upstream commit ed3b3c4976686b63b28e44f9805a88abc20ff18a ]
alarm_handle_timer() was converted from returning enum alarmtimer_restart to void, but the kernel-doc "Return:" line was not removed. Remove the stale description.
--- kernel/time/alarmtimer.c | 2 -- 1 file changed, 2 deletions(-)
kernel/time/alarmtimer.c +0 -2
@@ -508,8 +508,6 @@ static enum alarmtimer_type clock2alarm(clockid_t clockid)* @now: time at the timer expiration * * Posix timer callback for expired alarm timers. -* -* Return: whether the timer is to be restarted */ static void alarm_handle_timer (struct alarm *alarm,ktime_t now) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 119/1611 OPP: Fix race between OPP addition and lookup
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Di Shen <[email protected]>
[ Upstream commit f5e1cc9a284bff2510981643a5bca4bc4c21b81a ]
A race exists between dev_pm_opp_add_dynamic() and dev_pm_opp_find_freq_exact():
CPU0 (add) CPU1 (lookup)
------------------------------- ------------------------------
_opp_add()
mutex_lock()
list_add(&new_opp->node, head)
mutex_unlock() _opp_table_find_key()
mutex_lock()
dev_pm_opp_get(opp)
kref_get()
mutex_unlock()
kref_init(&new_opp->kref)
dev_pm_opp_put()
kref_put_mutex()The newly added OPP is inserted into the list before its kref is initialized. A concurrent lookup can find this OPP and increment its reference count while it is still uninitialized, leading to refcount corruption and a potential premature free.
Fix this by initializing ->kref and ->opp_table before making the OPP visible via list_add(). This ensures any concurrent lookup observes a fully initialized object.
--- drivers/opp/core.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/opp/core.c +2 -3
@@ -2084,11 +2084,10 @@ int _opp_add(struct device *dev, struct dev_pm_opp *new_opp,return ret;list_add (&new_opp->node, head); + new_opp->opp_table = opp_table; +kref_init (&new_opp->kref); } - new_opp->opp_table = opp_table; -kref_init (&new_opp->kref); -opp_debug_create_one (new_opp, opp_table);if (!_opp_supported_by_regulators (new_opp, opp_table)) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 120/1611 crypto: ccp - Reverse the cleanup order in psp_dev_destroy()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tycho Andersen (AMD) <[email protected]>
[ Upstream commit 4a76a164ba1617f60d1c8a2fd754466c9d9e48e9 ]
Before SNP x86 shutdown [1], all HV_FIXED pages were always leaked on module unload. Now pages can be reclaimed if they are freed before SNP shutdown.
The SFS driver does sfs_dev_destroy() -> snp_free_hv_fixed_pages(), marking the command buffer as free. But this happens after sev_dev_destroy() in psp_dev_destroy(), so the pages are always leaked.
Rearrange psp_dev_destroy() to destroy things in the reverse order from psp_init(), so that any dependencies can be unwound accordingly. This lets SFS free the page and the subsequent SNP shutdown release it.
This was identified with use of Chris Mason's review-prompts:
https://github.com/masoncl/review-prompts
[1]: https://lore.kernel.org/all/[email protected]/
--- drivers/crypto/ccp/psp-dev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/crypto/ccp/psp-dev.c +4 -4
@@ -316,15 +316,15 @@ void psp_dev_destroy(struct sp_device *sp)if (!psp)return ; -sev_dev_destroy (psp); +dbc_dev_destroy (psp); -tee_dev_destroy (psp); +platform_access_dev_destroy (psp);sfs_dev_destroy (psp); -dbc_dev_destroy (psp); +tee_dev_destroy (psp); -platform_access_dev_destroy (psp); +sev_dev_destroy (psp);sp_free_psp_irq (sp, psp);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 121/1611 crypto: ccp - Fix snp_filter_reserved_mem_regions() off-by-one
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tycho Andersen (AMD) <[email protected]>
[ Upstream commit 1b864b6cb213bbd7b406e9b2e98c962077f300df ]
Sashiko notes:
Quoted 9 lines
regarding the bounds check in
snp_filter_reserved_mem_regions()called viawalk_iomem_res_desc(): does the check
if ((range_list->num_elements* 16 + 8) >PAGE_SIZE) allow an off-by-one heap buffer overflow?If
range_list->num_elementsis 255, 255 * 16 + 8 = 4088, which is <= 4096. Writingrange->base(8 bytes) fills 4088-4095, but writingrange->page_count(4 bytes) would write to 4096-4099, overflowing the kzalloc-allocatedPAGE_SIZEbuffer.
Fix this by accounting for the entry about to be written to, in addition to the entries that are already allocated.
--- drivers/crypto/ccp/sev-dev.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/crypto/ccp/sev-dev.c +4 -3
@@ -1331,10 +1331,11 @@ static int snp_filter_reserved_mem_regions(struct resource *rs, void *arg)size_t size;/* -* Ensure the list of HV_FIXED pages that will be passed to firmware -* do not exceed the page-sized argument buffer. +* Ensure the list of HV_FIXED pages passed to the firmware including +* the one about to be written to do not exceed the page-sized argument +* buffer. */ -if ((range_list->num_elements *sizeof (struct sev_data_range ) + +if (((range_list->num_elements +1 ) *sizeof (struct sev_data_range ) +sizeof (struct sev_data_range_list )) >PAGE_SIZE )return -E2BIG ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 122/1611 crypto: atmel-sha204a - fix blocking and non-blocking rng logic
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lothar Rubusch <[email protected]>
[ Upstream commit 319400fc5ee15db5793aa45f854968141326effc ]
The blocking and non-blocking paths were failing to provide valid entropy due to improper buffer management. Reading the buffer starting from byte 1, only fetch the 32 bytes of random data from the return message.
Tested on an Atmel SHA204A device.
Before (here for blocking), tests showed repeatedly reading reduced bytes.
$ head -c 32 /dev/hwrng | hexdump -C 00000000 02 28 85 b3 47 40 f2 ee 00 00 00 00 00 00 00 00 |.(..G@..........| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 00000020
After, the result will be similar to the following:
$ head -c 32 /dev/hwrng | hexdump -C 00000000 5a fc 3f 13 14 68 fe 06 68 0a bd 04 83 6e 09 69 |Z.?..h..h....n.i| 00000010 75 ff cf 87 10 84 3b c9 c1 df ae eb 45 53 4c c3 |u.....;.....ESL.| 00000020
--- drivers/crypto/atmel-sha204a.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/crypto/atmel-sha204a.c +4 -4
@@ -54,8 +54,8 @@ static int atmel_sha204a_rng_read_nonblocking(struct hwrng *rng, void *data,if (rng->priv) { work_data = (struct atmel_i2c_work_data *)rng->priv; - max =min (sizeof (work_data->cmd.data), max); -memcpy (data, &work_data->cmd.data, max); + max =min (RANDOM_RSP_SIZE -CMD_OVERHEAD_SIZE , max); +memcpy (data, &work_data->cmd.data[RSP_DATA_IDX ], max); rng->priv =0 ; }else { work_data =kmalloc (sizeof (*work_data),GFP_ATOMIC );
@@ -93,8 +93,8 @@ static int atmel_sha204a_rng_read(struct hwrng *rng, void *data, size_t max,if (ret)return ret; - max =min (sizeof (cmd.data), max); -memcpy (data, cmd.data, max); + max =min (RANDOM_RSP_SIZE -CMD_OVERHEAD_SIZE , max); +memcpy (data, &cmd.data[RSP_DATA_IDX ], max);return max; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 123/1611 crypto: ecrdsa - fix unknown OID check in ecrdsa_param_curve
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thorsten Blum <[email protected]>
[ Upstream commit 2d7b2cfc59998baf5e8622a24dc28f69a5212e06 ]
The ->curve_oid check in ecrdsa_param_curve() rejects the valid enum value 0 (OID_id_dsa_with_sha1), but look_up_OID() returns OID__NR on lookup failure. Compare ->curve_oid with OID__NR instead to ensure that only unknown OIDs return -EINVAL.
--- crypto/ecrdsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
crypto/ecrdsa.c +1 -1
@@ -145,7 +145,7 @@ int ecrdsa_param_curve(void *context, size_t hdrlen, unsigned char tag,struct ecrdsa_ctx *ctx = context; ctx->curve_oid =look_up_OID (value, vlen); -if (!ctx->curve_oid) +if (ctx->curve_oid ==OID__NR )return -EINVAL ; ctx->curve =get_curve_by_oid (ctx->curve_oid);return 0 ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 124/1611 crypto: asymmetric_keys - fix OOB read in pefile_digest_pe_contents
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Weiming Shi <[email protected]>
[ Upstream commit f7dd32c5179d7755de18e21d5674b08f9e5cb180 ]
pefile_digest_pe_contents() computes the trailing-data hash length as pelen - (hashed_bytes + certs_size). A crafted PE can make the addition exceed pelen, causing the unsigned subtraction to underflow to ~4 GiB. This is passed to crypto_shash_update() which reads out of bounds and panics on unmapped vmalloc guard pages.
BUG: unable to handle page fault for address: ffffc900038d8000 Oops: Oops: 0000 [#1] SMP KASAN NOPTI RIP: 0010:sha256_blocks_generic (lib/crypto/sha256.c:152) Call Trace: <TASK> __sha256_update (lib/crypto/sha256.c:208) crypto_sha256_update (crypto/sha256.c:142) verify_pefile_signature (crypto/asymmetric_keys/verify_pefile.c:436) kexec_kernel_verify_pe_sig (kernel/kexec_file.c:151) __do_sys_kexec_file_load (kernel/kexec_file.c:406) do_syscall_64 (arch/x86/entry/syscall_64.c:94) entry_SYSCALL_64_after_hwframe (arch/x86/entry/entry_64.S:121) </TASK> Kernel panic - not syncing: Fatal exception
Validate that the addition does not overflow and the result does not exceed pelen before the subtraction. Return -ELIBBAD on failure.
--- crypto/asymmetric_keys/verify_pefile.c | 2 ++ 1 file changed, 2 insertions(+)
crypto/asymmetric_keys/verify_pefile.c +2 -0
@@ -305,6 +305,8 @@ static int pefile_digest_pe_contents(const void *pebuf, unsigned int pelen,if (pelen > hashed_bytes) { tmp = hashed_bytes + ctx->certs_size; +if (tmp <= hashed_bytes || pelen < tmp) +return -ELIBBAD ; ret =crypto_shash_update (desc, pebuf + hashed_bytes, pelen - tmp);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 125/1611 ARM: multi_v7_defconfig: Correct QCOM_RPMH and QCOM_RPMHPD
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 02802b40c31d2f2cfc94716189cfaf610930c589 ]
QCOM_RPMH and QCOM_RPMHPD can be build only as modules when QCOM_COMMAND_DB is module itself.
--- arch/arm/configs/multi_v7_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/configs/multi_v7_defconfig +2 -2
@@ -1117,7 +1117,7 @@ CONFIG_QCOM_COMMAND_DB=m CONFIG_QCOM_GSBI=y CONFIG_QCOM_OCMEM=m CONFIG_QCOM_RMTFS_MEM=m -CONFIG_QCOM_RPMH=y +CONFIG_QCOM_RPMH=m CONFIG_QCOM_SMEM=y CONFIG_QCOM_SMD_RPM=y CONFIG_QCOM_SMP2P=y
@@ -1135,7 +1135,7 @@ CONFIG_KEYSTONE_NAVIGATOR_QMSS=y CONFIG_KEYSTONE_NAVIGATOR_DMA=y CONFIG_RASPBERRYPI_POWER=y CONFIG_QCOM_CPR=y -CONFIG_QCOM_RPMHPD=y +CONFIG_QCOM_RPMHPD=m CONFIG_QCOM_RPMPD=y CONFIG_ROCKCHIP_PM_DOMAINS=y CONFIG_TI_SCI_PM_DOMAINS=y
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 126/1611 dlm: fix add msg handle in send_queue ordered
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Aring <[email protected]>
[ Upstream commit d2248cb70c070f8f04762872772e155b59016f17 ]
In a benchmark scenario triggering a lot of requests that triggers a lot of DLM messages on the network it can be that the mh->seq is not ordered according the oldest seq number. This ordering is required by dlm_receive_ack as "before(mh->seq, seq)" will stop to check for older sequence numbers that are ordered in the tail of "node->send_queue".
The side effects of not having it correct ordered regarding "before(mh->seq, seq)" are refcounting issues and use-after free.
I only was able to reproduce this issue in a experimental DLM branch and a user space DLM benchmark that uses io_uring. After changing this I don't experienced any refcounting with the sending buffer issues anymore.
--- fs/dlm/midcomms.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/dlm/midcomms.c +2 -2
@@ -968,10 +968,10 @@ static void midcomms_new_msg_cb(void *data)atomic_inc (&mh->node->send_queue_cnt);spin_lock_bh (&mh->node->send_queue_lock); +/* need to be locked with list_add_tail_rcu() because list is ordered */ + mh->seq =atomic_fetch_inc (&mh->node->seq_send);list_add_tail_rcu (&mh->list, &mh->node->send_queue);spin_unlock_bh (&mh->node->send_queue_lock); - - mh->seq =atomic_fetch_inc (&mh->node->seq_send); } static struct dlm_msg *dlm_midcomms_get_msg_3_2(struct dlm_mhandle *mh, int nodeid,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 127/1611 nilfs2: fix backing_dev_info reference leak
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shuangpeng Bai <[email protected]>
[ Upstream commit 665f192a2a11384cb7dc1be5f87d16438522a4ed ]
setup_bdev_super() already initializes sb->s_bdev and takes a reference on the block device backing_dev_info when assigning sb->s_bdi.
nilfs_fill_super() takes another reference to the same backing_dev_info and stores it in sb->s_bdi again. The extra reference is not paired with a matching bdi_put(), since generic_shutdown_super() releases sb->s_bdi only once.
Drop the redundant bdi_get() in nilfs_fill_super(). The single reference taken by setup_bdev_super() is enough and is released during superblock shutdown.
--- fs/nilfs2/super.c | 2 -- 1 file changed, 2 deletions(-)
fs/nilfs2/super.c +0 -2
@@ -1070,8 +1070,6 @@ nilfs_fill_super(struct super_block *sb, struct fs_context *fc) sb->s_time_gran =1 ; sb->s_max_links =NILFS_LINK_MAX ; - sb->s_bdi =bdi_get (sb->s_bdev->bd_disk->bdi); - err =load_nilfs (nilfs, sb);if (err) goto failed_nilfs;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 128/1611 media: qcom: camss: vfe: fix PIX subdev naming on VFE lite
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wenmeng Liu <[email protected]>
[ Upstream commit c97e797a64cdfe4acecff831b4285418d2815893 ]
VFE lite hardware does not provide a functional PIX path, but after the per sub-device type resource changes the PIX subdev name is still assigned unconditionally.
Only assign the PIX subdev name on non-lite VFE variants to avoid exposing a misleading device name.
--- drivers/media/platform/qcom/camss/camss-vfe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/qcom/camss/camss-vfe.c +1 -1
@@ -2038,7 +2038,7 @@ int msm_vfe_register_entities(struct vfe_device *vfe,v4l2_subdev_init (sd, &vfe_v4l2_ops); sd->internal_ops = &vfe_v4l2_internal_ops; sd->flags |=V4L2_SUBDEV_FL_HAS_DEVNODE ; -if (i ==VFE_LINE_PIX ) +if (i ==VFE_LINE_PIX && vfe->res->is_lite == false)snprintf (sd->name,ARRAY_SIZE (sd->name),"%s%d_%s" ,MSM_VFE_NAME , vfe->id,"pix" );else
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 129/1611 media: iris: scale MMCX power domain on SM8250
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit 4170e2f25ce40b69f3827fcdabf395380095e136 ]
On SM8250 most of the video clocks are powered by the MMCX domain, while the PLL is powered on by the MX domain. Extend the driver to support scaling both power domains, while keeping compatibility with the existing DTs, which define only the MX domain.
--- drivers/media/platform/qcom/iris/iris_platform_sm8250.c | 2 +- drivers/media/platform/qcom/iris/iris_probe.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-)
drivers/media/platform/qcom/iris/iris_platform_sm8250.c +1 -1
@@ -265,7 +265,7 @@ static const struct bw_info sm8250_bw_table_dec[] = {static const char *const sm8250_pmdomain_table[] = {"venus" ,"vcodec0" }; -static const char *const sm8250_opp_pd_table[] = {"mx" }; +static const char *const sm8250_opp_pd_table[] = {"mx" ,"mmcx" };static const struct platform_clk_data sm8250_clk_table[] = { {IRIS_AXI_CLK ,"iface" },
drivers/media/platform/qcom/iris/iris_probe.c +7 -0
@@ -61,6 +61,13 @@ static int iris_init_power_domains(struct iris_core *core)return ret; ret =devm_pm_domain_attach_list (core->dev, &iris_opp_pd_data, &core->opp_pmdomain_tbl); +/* backwards compatibility for incomplete ABI SM8250 */ +if (ret == -ENODEV && +of_device_is_compatible (core->dev->of_node,"qcom,sm8250-venus" )) { + iris_opp_pd_data.num_pd_names--; + ret =devm_pm_domain_attach_list (core->dev, &iris_opp_pd_data, + &core->opp_pmdomain_tbl); + }if (ret <0 )return ret;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 130/1611 media: venus: scale MMCX power domain on SM8250
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit f45fd3dbb5f6d60a8b31d5cc4affaf1ef40163b3 ]
On SM8250 most of the video clocks are powered by the MMCX domain, while the PLL is powered on by the MX domain. Extend the driver to support scaling both power domains, while keeping compatibility with the existing DTs, which define only the MX domain.
--- drivers/media/platform/qcom/venus/core.c | 7 ++++++- drivers/media/platform/qcom/venus/core.h | 1 + drivers/media/platform/qcom/venus/pm_helpers.c | 8 +++++++- 3 files changed, 14 insertions(+), 2 deletions(-)
drivers/media/platform/qcom/venus/core.c +6 -1
@@ -882,6 +882,7 @@ static const struct venus_resources sdm845_res_v2 = { .vcodec_pmdomains = (const char *[]) { "venus", "vcodec0", "vcodec1" }, .vcodec_pmdomains_num = 3, .opp_pmdomain = (const char *[]) { "cx" }, + .opp_pmdomain_num = 1, .vcodec_num = 2, .max_load = 3110400, /* 4096x2160@90 */ .hfi_version = HFI_VERSION_4XX,
@@ -933,6 +934,7 @@ static const struct venus_resources sc7180_res = { .vcodec_pmdomains = (const char *[]) { "venus", "vcodec0" }, .vcodec_pmdomains_num = 2, .opp_pmdomain = (const char *[]) { "cx" }, + .opp_pmdomain_num = 1, .vcodec_num = 1, .hfi_version = HFI_VERSION_4XX, .vpu_version = VPU_VERSION_AR50,
@@ -991,7 +993,8 @@ static const struct venus_resources sm8250_res = { .vcodec_clks_num = 1, .vcodec_pmdomains = (const char *[]) { "venus", "vcodec0" }, .vcodec_pmdomains_num = 2, - .opp_pmdomain = (const char *[]) { "mx" }, + .opp_pmdomain = (const char *[]) { "mx", "mmcx" }, + .opp_pmdomain_num = 2, .vcodec_num = 1, .max_load = 7833600, .hfi_version = HFI_VERSION_6XX,
@@ -1053,6 +1056,7 @@ static const struct venus_resources sc7280_res = { .vcodec_pmdomains = (const char *[]) { "venus", "vcodec0" }, .vcodec_pmdomains_num = 2, .opp_pmdomain = (const char *[]) { "cx" }, + .opp_pmdomain_num = 1, .vcodec_num = 1, .hfi_version = HFI_VERSION_6XX, .vpu_version = VPU_VERSION_IRIS2_1,
@@ -1100,6 +1104,7 @@ static const struct venus_resources qcm2290_res = { .vcodec_pmdomains = (const char *[]) { "venus", "vcodec0" }, .vcodec_pmdomains_num = 2, .opp_pmdomain = (const char *[]) { "cx" }, + .opp_pmdomain_num = 1, .vcodec_num = 1, .hfi_version = HFI_VERSION_4XX, .vpu_version = VPU_VERSION_AR50_LITE,
drivers/media/platform/qcom/venus/core.h +1 -0
@@ -83,6 +83,7 @@ struct venus_resources {const char **vcodec_pmdomains;unsigned int vcodec_pmdomains_num;const char **opp_pmdomain; +unsigned int opp_pmdomain_num;unsigned int vcodec_num;const char *const resets[VIDC_RESETS_NUM_MAX ];unsigned int resets_num;
drivers/media/platform/qcom/venus/pm_helpers.c +7 -1
@@ -887,7 +887,7 @@ static int vcodec_domains_get(struct venus_core *core) };struct dev_pm_domain_attach_data opp_pd_data = { .pd_names = res->opp_pmdomain, - .num_pd_names =1 , + .num_pd_names = res->opp_pmdomain_num, .pd_flags =PD_FLAG_DEV_LINK_ON |PD_FLAG_REQUIRED_OPP , };
@@ -904,6 +904,12 @@ static int vcodec_domains_get(struct venus_core *core)/* Attach the power domain for setting performance state */ ret =devm_pm_domain_attach_list (dev, &opp_pd_data, &core->opp_pmdomain); +/* backwards compatibility for incomplete ABI SM8250 */ +if (ret == -ENODEV && +of_device_is_compatible (dev->of_node,"qcom,sm8250-venus" )) { + opp_pd_data.num_pd_names--; + ret =devm_pm_domain_attach_list (dev, &opp_pd_data, &core->opp_pmdomain); + }if (ret <0 )return ret;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 131/1611 iommu/amd: Fix a stale comment about which legacy mode is user visible
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Christopherson <[email protected]>
[ Upstream commit 4bf53c2d0c08bbdaa32f2114281f1ddab61902bf ]
Update a stale comment about which of the legacy modes is visible to the user, i.e. can be forced via amd_iommu_intr=legacy.
--- drivers/iommu/amd/amd_iommu_types.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/iommu/amd/amd_iommu_types.h +6 -5
@@ -987,12 +987,13 @@ static inline int get_hpet_devid(int id) }enum amd_iommu_intr_mode_type { -AMD_IOMMU_GUEST_IR_LEGACY , - -/* This mode is not visible to users. It is used when -* we cannot fully enable vAPIC and fallback to only support -* legacy interrupt remapping via 128-bit IRTE. +/* +* The legacy format mode is not visible to users to prevent the user +* from crashing x2APIC systems, which for all intents and purposes +* require 128-bit IRTEs. The legacy format will be forced as needed +* when hardware doesn't support 128-bit IRTEs. */ +AMD_IOMMU_GUEST_IR_LEGACY ,AMD_IOMMU_GUEST_IR_LEGACY_GA ,AMD_IOMMU_GUEST_IR_VAPIC , };
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 132/1611 soc: mediatek: mtk-mmsys: Restore MT8167 routing masks lost during merge
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luca Leonardo Scorcia <[email protected]>
[ Upstream commit 7d462de9f65b002b439b1b168bf3b5579b0de48b ]
The original patch that was sent to the mailing lists included the values for the route masks, but they got lost during merge: add back the full register masks where missing.
--- drivers/soc/mediatek/mt8167-mmsys.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/soc/mediatek/mt8167-mmsys.h +8 -3
@@ -10,24 +10,29 @@#define MT8167_DISP_REG_CONFIG_DISP_RDMA0_SOUT_SEL_IN 0x06c#define MT8167_DITHER_MOUT_EN_RDMA0 0x1 +#define MT8167_DITHER_MOUT_EN_MASK 0x7 +#define MT8167_RDMA0_SOUT_DSI0 0x2 +#define MT8167_RDMA0_SOUT_MASK 0x3 +#define MT8167_DSI0_SEL_IN_RDMA0 0x1 +#define MT8167_DSI0_SEL_IN_MASK 0x3static const struct mtk_mmsys_routes mt8167_mmsys_routing_table[] = {MMSYS_ROUTE (OVL0 ,COLOR0 ,MT8167_DISP_REG_CONFIG_DISP_OVL0_MOUT_EN ,OVL0_MOUT_EN_COLOR0 ,OVL0_MOUT_EN_COLOR0 ),MMSYS_ROUTE (DITHER0 ,RDMA0 , -MT8167_DISP_REG_CONFIG_DISP_DITHER_MOUT_EN ,MT8167_DITHER_MOUT_EN_RDMA0 , +MT8167_DISP_REG_CONFIG_DISP_DITHER_MOUT_EN ,MT8167_DITHER_MOUT_EN_MASK ,MT8167_DITHER_MOUT_EN_RDMA0 ),MMSYS_ROUTE (OVL0 ,COLOR0 ,MT8167_DISP_REG_CONFIG_DISP_COLOR0_SEL_IN ,COLOR0_SEL_IN_OVL0 ,COLOR0_SEL_IN_OVL0 ),MMSYS_ROUTE (RDMA0 ,DSI0 , -MT8167_DISP_REG_CONFIG_DISP_DSI0_SEL_IN ,MT8167_DSI0_SEL_IN_RDMA0 , +MT8167_DISP_REG_CONFIG_DISP_DSI0_SEL_IN ,MT8167_DSI0_SEL_IN_MASK ,MT8167_DSI0_SEL_IN_RDMA0 ),MMSYS_ROUTE (RDMA0 ,DSI0 , -MT8167_DISP_REG_CONFIG_DISP_RDMA0_SOUT_SEL_IN ,MT8167_RDMA0_SOUT_DSI0 , +MT8167_DISP_REG_CONFIG_DISP_RDMA0_SOUT_SEL_IN ,MT8167_RDMA0_SOUT_MASK ,MT8167_RDMA0_SOUT_DSI0 ), };
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 133/1611 bpf: fix crash in bpf_[set|remove]_dentry_xattr for negative dentries
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matt Bobrowski <[email protected]>
[ Upstream commit 07410646f6ff1d23222f105ccab778957d401bbe ]
bpf_set_dentry_xattr and bpf_remove_dentry_xattr BPF kfuncs attempt to lock the inode of the supplied dentry without checking if it is NULL. If a negative dentry is passed (e.g. from security_inode_create), d_inode(dentry) returns NULL, and inode_lock(inode) will cause a NULL pointer dereference.
Trivially fix this by adding a NULL check for inode before attempting to lock it, returning -EINVAL if it is NULL.
Additionally, drop WARN_ON(!inode) in bpf_xattr_read_permission() and bpf_xattr_write_permission(). These warnings could be triggered by passing a negative dentry to bpf_get_dentry_xattr() or the _locked variants of the xattr kfuncs, potentially causing a Denial of Service on systems with panic_on_warn enabled. Instead, simply return -EINVAL.
--- fs/bpf_fs_kfuncs.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
fs/bpf_fs_kfuncs.c +8 -2
@@ -103,7 +103,7 @@ static bool match_security_bpf_prefix(const char *name__str)static int bpf_xattr_read_permission (const char *name,struct inode *inode) { -if (WARN_ON (!inode)) +if (!inode)return -EINVAL ;/* Allow reading xattr with user. and security.bpf. prefix */
@@ -173,7 +173,7 @@ __bpf_kfunc_end_defs();static int bpf_xattr_write_permission (const char *name,struct inode *inode) { -if (WARN_ON (!inode)) +if (!inode)return -EINVAL ;/* Only allow setting and removing security.bpf. xattrs */
@@ -292,6 +292,9 @@ __bpf_kfunc int bpf_set_dentry_xattr(struct dentry *dentry, const char *name__ststruct inode *inode =d_inode (dentry);int ret; +if (!inode) +return -EINVAL ; +inode_lock (inode); ret =bpf_set_dentry_xattr_locked (dentry, name__str, value_p, flags);inode_unlock (inode);
@@ -317,6 +320,9 @@ __bpf_kfunc int bpf_remove_dentry_xattr(struct dentry *dentry, const char *name_struct inode *inode =d_inode (dentry);int ret; +if (!inode) +return -EINVAL ; +inode_lock (inode); ret =bpf_remove_dentry_xattr_locked (dentry, name__str);inode_unlock (inode);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 134/1611 uaccess: fix ignored_trailing logic in copy_struct_to_user()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefan Metzmacher <[email protected]>
[ Upstream commit 4911de3145a797389577abfdf9a5185d36cc18d7 ]
Currently all callers pass ignored_trailing=NULL, but I have code that will make use of.
Now it actually behaves like documented:
* If @usize < @ksize, then the kernel is trying to pass userspace a newer struct than it supports. Thus we only copy the interoperable portions (@usize) and ignore the rest (but @ignored_trailing is set to %true if any of the trailing (@ksize - @usize) bytes are non-zero).
--- include/linux/uaccess.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/uaccess.h +1 -1
@@ -499,7 +499,7 @@ copy_struct_to_user(void __user *dst, size_t usize, const void *src,return -EFAULT ; }if (ignored_trailing) - *ignored_trailing = ksize < usize && + *ignored_trailing = usize < ksize &&memchr_inv (src + size,0 , rest) !=NULL ;/* Copy the interoperable parts of the struct. */ if (copy_to_user (dst, src, size))
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 135/1611 arm64: dts: mediatek: mt8192-asurada: Move PCIe DMA bounce buffer to host
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chen-Yu Tsai <[email protected]>
[ Upstream commit 533275a4b5240a2bf2c592bd4536560388306d26 ]
The DMA bounce buffer is attached to the PCIe host controller, i.e. all PCIe DMA transfers should use it.
Move it from the PCIe (WiFi) device node down to the PCIe host controller node.
--- arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi +1 -1
@@ -526,6 +526,7 @@ flash@0 { &pcie { pinctrl-names = "default"; pinctrl-0 = <&pcie_pins>; + memory-region = <&wifi_restricted_dma_region>; pcie0: pcie@0,0 { device_type = "pci";
@@ -540,7 +541,6 @@ pcie0: pcie@0,0 { wifi: wifi@0,0 { reg = <0x10000 0 0 0 0x100000>, <0x10000 0 0x100000 0 0x100000>; - memory-region = <&wifi_restricted_dma_region>; }; }; };
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 136/1611 rust: alloc: fix `Vec::extend_with` SAFETY comment
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hsiu Che Yu <[email protected]>
[ Upstream commit f497aae6ded43f91b1dbf29a35d7062823635640 ]
Fix an incorrect operator in the SAFETY comment, changing < to <=, since Vec::reserve guarantees capacity for exactly n additional elements, so the equal case should be included.
--- rust/kernel/alloc/kvec.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
rust/kernel/alloc/kvec.rs +1 -1
@@ -754,7 +754,7 @@ impl<T: Clone, A: Allocator> Vec<T, A> { spare[n -1 ].write (value);// SAFETY: -// - `self.len() + n < self.capacity()` due to the call to reserve above, +// - `self.len() + n <= self.capacity()` due to the call to reserve above, // - the loop and the line above initialized the next `n` elements. unsafe { self.inc_len (n) };
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 137/1611 clk: scmi: Fix clock rate rounding
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cristian Marussi <[email protected]>
[ Upstream commit d0c81a38d06d446d341532700b3a4a43d3b00eb1 ]
While the do_div() helper used for rounding expects its divisor argument to be a 32bits quantity, the currently provided divisor parameter is a 64bit value that, as a consequence, is silently truncated and a possible source of bugs.
Fix by using the proper div64_ul helper.
--- drivers/clk/clk-scmi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/clk-scmi.c +2 -2
@@ -10,9 +10,9 @@#include <linux/device.h> #include <linux/err.h> #include <linux/of.h> +#include <linux/math64.h> #include <linux/module.h> #include <linux/scmi_protocol.h> -#include <asm/div64.h> #define NOT_ATOMIC false#define ATOMIC true
@@ -83,7 +83,7 @@ static int scmi_clk_determine_rate(struct clk_hw *hw, ftmp = req->rate - fmin; ftmp += clk->info->range.step_size -1 ;/* to round up */ -do_div (ftmp, clk->info->range.step_size); + ftmp =div64_ul (ftmp, clk->info->range.step_size); req->rate = ftmp * clk->info->range.step_size + fmin;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 138/1611 arm64: dts: qcom: kodiak: Fix ICE reg size
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuldeep Singh <[email protected]>
[ Upstream commit fa9c7403af64d3e56a6c20dedc60e0a55b527509 ]
The ICE register region on Kodiak is currently defined as 0x8000 bytes. According to the hardware specification, the correct register size is 0x18000.
Update the ICE node reg property to match the hardware.
--- arch/arm64/boot/dts/qcom/sc7280.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sc7280.dtsi +1 -1
@@ -2573,7 +2573,7 @@ ufs_mem_phy: phy@1d87000 { ice: crypto@1d88000 { compatible = "qcom,sc7280-inline-crypto-engine", "qcom,inline-crypto-engine"; - reg = <0 0x01d88000 0 0x8000>; + reg = <0 0x01d88000 0 0x18000>; clocks = <&gcc GCC_UFS_PHY_ICE_CORE_CLK>; };
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 139/1611 arm64: dts: qcom: sm8450: Fix ICE reg size
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuldeep Singh <[email protected]>
[ Upstream commit 7fb3d0512dacc0d09217eb45057357f00298203d ]
The ICE register region size was originally described incorrectly when the ICE hardware was first introduced. The same value was later carried over unchanged when the ICE node was split out from the UFS node into its own DT entry.
Correct the register size to match the hardware specification.
--- arch/arm64/boot/dts/qcom/sm8450.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sm8450.dtsi +1 -1
@@ -5348,7 +5348,7 @@ ufs_mem_phy: phy@1d87000 { ice: crypto@1d88000 { compatible = "qcom,sm8450-inline-crypto-engine", "qcom,inline-crypto-engine"; - reg = <0 0x01d88000 0 0x8000>; + reg = <0 0x01d88000 0 0x18000>; clocks = <&gcc GCC_UFS_PHY_ICE_CORE_CLK>; };
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 140/1611 drm/hisilicon/hibmc: add updating link cap in DP detect()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lin He <[email protected]>
[ Upstream commit 7d380ef98dd469747b6df43fb0243301b0caaacf ]
In the past, the link cap is updated in link training at encoder enable stage, but the hibmc_dp_mode_valid() is called before it, which will use DP link's rate and lanes. So add the hibmc_dp_update_caps() in hibmc_dp_update_caps() to avoid some potential risks.
--- drivers/gpu/drm/hisilicon/hibmc/dp/dp_comm.h | 1 + drivers/gpu/drm/hisilicon/hibmc/dp/dp_link.c | 2 +- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/hisilicon/hibmc/dp/dp_comm.h +1 -0
@@ -69,5 +69,6 @@ int hibmc_dp_link_training(struct hibmc_dp_dev *dp);int hibmc_dp_serdes_init (struct hibmc_dp_dev *dp);int hibmc_dp_serdes_rate_switch (u8 rate,struct hibmc_dp_dev *dp);int hibmc_dp_serdes_set_tx_cfg (struct hibmc_dp_dev *dp,u8 train_set[HIBMC_DP_LANE_NUM_MAX ]); +void hibmc_dp_update_caps (struct hibmc_dp_dev *dp);#endif
drivers/gpu/drm/hisilicon/hibmc/dp/dp_link.c +1 -1
@@ -325,7 +325,7 @@ static int hibmc_dp_link_downgrade_training_eq(struct hibmc_dp_dev *dp)return hibmc_dp_link_reduce_rate (dp); } -static void hibmc_dp_update_caps (struct hibmc_dp_dev *dp) +void hibmc_dp_update_caps (struct hibmc_dp_dev *dp) { dp->link.cap.link_rate = dp->dpcd[DP_MAX_LINK_RATE ];if (dp->link.cap.link_rate >DP_LINK_BW_8_1 || !dp->link.cap.link_rate)
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c +2 -0
@@ -41,6 +41,8 @@ static bool hibmc_dp_get_dpcd(struct hibmc_dp_dev *dp_dev)if (ret)return false; +hibmc_dp_update_caps (dp_dev); + dp_dev->is_branch =drm_dp_is_branch (dp_dev->dpcd); ret =drm_dp_read_desc (dp_dev->aux, &dp_dev->desc, dp_dev->is_branch);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 141/1611 drm/hisilicon/hibmc: fix no showing when no connectors connected
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lin He <[email protected]>
[ Upstream commit 4110e29a7c384f1ff21d6b187b6a1772f6e17b23 ]
Our chip support KVM over IP feature, so hibmc driver need to support displaying without any connectors plugged in. If no connectors are connected, the vdac connector status should be set to 'connected' to ensure proper KVM display functionality. Additionally, for previous-generation products that may lack hardware link support and thus cannot detect the monitor, the same approach should be applied to ensure VGA display functionality.
* Add phys_state in the struct of dp and vdac to check physical outputs.
* The 'epoch_counter' of the vdac connector is incremented when the physical status changes.
For get_modes: using BMC modes for connector if no display is attached to phys VGA cable, otherwise use EDID modes by drm_connector_helper_get_modes, because KVM doesn't provide EDID reads.
The polling mechanism for the KMS helper is enabled.
--- drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h | 1 + .../gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c | 33 ++++++++---- .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 3 ++ .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 1 + .../gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 53 +++++++++++++------ 5 files changed, 64 insertions(+), 27 deletions(-)
drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h +1 -0
@@ -55,6 +55,7 @@ struct hibmc_dp {struct drm_dp_aux aux;struct hibmc_dp_cbar_cfg cfg;u32 irq_status; +int phys_status; };int hibmc_dp_hw_init (struct hibmc_dp *dp);
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c +23 -10
@@ -61,27 +61,38 @@ static int hibmc_dp_detect(struct drm_connector *connector, {struct hibmc_dp *dp =to_hibmc_dp (connector);struct hibmc_dp_dev *dp_dev = dp->dp_dev; -int ret; +int ret = connector_status_disconnected;if (dp->irq_status) { -if (dp_dev->hpd_status !=HIBMC_HPD_IN ) -return connector_status_disconnected; +if (dp_dev->hpd_status !=HIBMC_HPD_IN ) { + ret = connector_status_disconnected; + goto exit; + } } -if (!hibmc_dp_get_dpcd (dp_dev)) -return connector_status_disconnected; +if (!hibmc_dp_get_dpcd (dp_dev)) { + ret = connector_status_disconnected; + goto exit; + } -if (!dp_dev->is_branch) -return connector_status_connected; +if (!dp_dev->is_branch) { + ret = connector_status_connected; + goto exit; + }if (drm_dp_read_sink_count_cap (connector, dp_dev->dpcd, &dp_dev->desc) && dp_dev->downstream_ports[0 ] &DP_DS_PORT_HPD ) { ret =drm_dp_read_sink_count (dp_dev->aux); -if (ret >0 ) -return connector_status_connected; +if (ret >0 ) { + ret = connector_status_connected; + goto exit; + } } -return connector_status_disconnected; +exit: + dp->phys_status = ret; + +return ret; } static int hibmc_dp_mode_valid(struct drm_connector *connector,
@@ -243,5 +254,7 @@ int hibmc_dp_init(struct hibmc_drm_private *priv) connector->polled =DRM_CONNECTOR_POLL_HPD ; + dp->phys_status = connector_status_disconnected; +return 0 ; }
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +3 -0
@@ -24,6 +24,7 @@#include <drm/drm_managed.h> #include <drm/drm_module.h> #include <drm/drm_vblank.h> +#include <drm/drm_probe_helper.h> #include "hibmc_drm_drv.h" #include "hibmc_drm_regs.h"
@@ -355,6 +356,8 @@ static int hibmc_load(struct drm_device *dev)/* reset all the states of crtc/plane/encoder/connector */ drm_mode_config_reset (dev); +drmm_kms_helper_poll_init (dev); +return 0 ; err:
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h +1 -0
@@ -31,6 +31,7 @@ struct hibmc_vdac {struct drm_connector connector;struct i2c_adapter adapter;struct i2c_algo_bit_data bit_data; +int phys_status; };struct hibmc_drm_private {
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c +36 -17
80 lines not on this page · raw message
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 142/1611 drm/hisilicon/hibmc: move display contrl config to hibmc_probe()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lin He <[email protected]>
[ Upstream commit de2a56c71f9b223922ea8fe0192d3c1fa2954608 ]
If there's no VGA output, this encoder modeset won't be called, which will cause displaying data from GPU being cut off. It's actually a common display config for DP and VGA, so move the vdac encoder modeset to driver load stage.
Removed invalid bit configurations from hibmc_display_ctrl
--- .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 11 ++++++++++ .../gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 22 ------------------- 2 files changed, 11 insertions(+), 22 deletions(-)
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +11 -0
@@ -215,6 +215,15 @@ void hibmc_set_current_gate(struct hibmc_drm_private *priv, unsigned int gate)writel (gate, mmio + gate_reg); } +static void hibmc_display_ctrl (struct hibmc_drm_private *priv) +{ +u32 reg; + + reg =readl (priv->mmio +HIBMC_DISPLAY_CONTROL_HISILE ); + reg |=HIBMC_DISPLAY_CONTROL_PANELDATE (1 ); +writel (reg, priv->mmio +HIBMC_DISPLAY_CONTROL_HISILE ); +} +static void hibmc_hw_config (struct hibmc_drm_private *priv) {u32 reg;
@@ -246,6 +255,8 @@ static void hibmc_hw_config(struct hibmc_drm_private *priv) reg |=HIBMC_MSCCTL_LOCALMEM_RESET (1 );writel (reg, priv->mmio +HIBMC_MISC_CTRL ); + +hibmc_display_ctrl (priv); }static int hibmc_hw_map (struct hibmc_drm_private *priv)
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c +0 -22
@@ -88,26 +88,6 @@ static const struct drm_connector_funcs hibmc_connector_funcs = { .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, }; -static void hibmc_encoder_mode_set (struct drm_encoder *encoder, -struct drm_display_mode *mode, -struct drm_display_mode *adj_mode) -{ -u32 reg; -struct drm_device *dev = encoder->dev; -struct hibmc_drm_private *priv =to_hibmc_drm_private (dev); - - reg =readl (priv->mmio +HIBMC_DISPLAY_CONTROL_HISILE ); - reg |=HIBMC_DISPLAY_CONTROL_FPVDDEN (1 ); - reg |=HIBMC_DISPLAY_CONTROL_PANELDATE (1 ); - reg |=HIBMC_DISPLAY_CONTROL_FPEN (1 ); - reg |=HIBMC_DISPLAY_CONTROL_VBIASEN (1 ); -writel (reg, priv->mmio +HIBMC_DISPLAY_CONTROL_HISILE ); -} - -static const struct drm_encoder_helper_funcs hibmc_encoder_helper_funcs = { - .mode_set = hibmc_encoder_mode_set, -}; -int hibmc_vdac_init (struct hibmc_drm_private *priv) {struct drm_device *dev = &priv->dev;
@@ -130,8 +110,6 @@ int hibmc_vdac_init(struct hibmc_drm_private *priv) goto err; } -drm_encoder_helper_add (encoder, &hibmc_encoder_helper_funcs); - ret = drm_connector_init_with_ddc(dev, connector, &hibmc_connector_funcs, DRM_MODE_CONNECTOR_VGA,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 143/1611 drm/hisilicon/hibmc: use clock to look up the PLL value
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lin He <[email protected]>
[ Upstream commit 99ef3a4f1c1813cabd50bb3e8522e85e00838bb2 ]
In the past, we use width and height to look up our PLL value. But actually the actual clock check is also necessnary. There are some resolutions that width and height same, but its clock different. Add the clock check when using pll_table to determine the PLL value.
--- .../gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 80 +++++++++++-------- 1 file changed, 45 insertions(+), 35 deletions(-)
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c +45 -35
@@ -32,26 +32,43 @@ struct hibmc_display_panel_pll {struct hibmc_dislay_pll_config {u64 hdisplay;u64 vdisplay; +int clock;u32 pll1_config_value;u32 pll2_config_value; };static const struct hibmc_dislay_pll_config hibmc_pll_table[] = { - {640 ,480 ,CRT_PLL1_HS_25MHZ ,CRT_PLL2_HS_25MHZ }, - {800 ,600 ,CRT_PLL1_HS_40MHZ ,CRT_PLL2_HS_40MHZ }, - {1024 ,768 ,CRT_PLL1_HS_65MHZ ,CRT_PLL2_HS_65MHZ }, - {1152 ,864 ,CRT_PLL1_HS_80MHZ_1152 ,CRT_PLL2_HS_80MHZ }, - {1280 ,768 ,CRT_PLL1_HS_80MHZ ,CRT_PLL2_HS_80MHZ }, - {1280 ,720 ,CRT_PLL1_HS_74MHZ ,CRT_PLL2_HS_74MHZ }, - {1280 ,960 ,CRT_PLL1_HS_108MHZ ,CRT_PLL2_HS_108MHZ }, - {1280 ,1024 ,CRT_PLL1_HS_108MHZ ,CRT_PLL2_HS_108MHZ }, - {1440 ,900 ,CRT_PLL1_HS_106MHZ ,CRT_PLL2_HS_106MHZ }, - {1600 ,900 ,CRT_PLL1_HS_108MHZ ,CRT_PLL2_HS_108MHZ }, - {1600 ,1200 ,CRT_PLL1_HS_162MHZ ,CRT_PLL2_HS_162MHZ }, - {1920 ,1080 ,CRT_PLL1_HS_148MHZ ,CRT_PLL2_HS_148MHZ }, - {1920 ,1200 ,CRT_PLL1_HS_193MHZ ,CRT_PLL2_HS_193MHZ }, + {640 ,480 ,25000 ,CRT_PLL1_HS_25MHZ ,CRT_PLL2_HS_25MHZ }, + {800 ,600 ,40000 ,CRT_PLL1_HS_40MHZ ,CRT_PLL2_HS_40MHZ }, + {1024 ,768 ,65000 ,CRT_PLL1_HS_65MHZ ,CRT_PLL2_HS_65MHZ }, + {1152 ,864 ,78750 ,CRT_PLL1_HS_80MHZ_1152 ,CRT_PLL2_HS_80MHZ }, + {1280 ,768 ,80000 ,CRT_PLL1_HS_80MHZ ,CRT_PLL2_HS_80MHZ }, + {1280 ,720 ,74375 ,CRT_PLL1_HS_74MHZ ,CRT_PLL2_HS_74MHZ }, + {1280 ,960 ,108000 ,CRT_PLL1_HS_108MHZ ,CRT_PLL2_HS_108MHZ }, + {1280 ,1024 ,108000 ,CRT_PLL1_HS_108MHZ ,CRT_PLL2_HS_108MHZ }, + {1440 ,900 ,105952 ,CRT_PLL1_HS_106MHZ ,CRT_PLL2_HS_106MHZ }, + {1600 ,900 ,108000 ,CRT_PLL1_HS_108MHZ ,CRT_PLL2_HS_108MHZ }, + {1600 ,1200 ,162500 ,CRT_PLL1_HS_162MHZ ,CRT_PLL2_HS_162MHZ }, + {1920 ,1080 ,148750 ,CRT_PLL1_HS_148MHZ ,CRT_PLL2_HS_148MHZ }, + {1920 ,1200 ,193750 ,CRT_PLL1_HS_193MHZ ,CRT_PLL2_HS_193MHZ }, }; +static int hibmc_get_best_clock_idx (const struct drm_display_mode *mode) +{ +int i, diff; + +for (i =0 ; i <ARRAY_SIZE (hibmc_pll_table); i++) { +if (hibmc_pll_table[i].hdisplay == mode->hdisplay && + hibmc_pll_table[i].vdisplay == mode->vdisplay) { + diff =abs (mode->clock - hibmc_pll_table[i].clock); +if (diff < mode->clock /100 )/* tolerance 1/100 */ +return i; + } + } + +return -MODE_CLOCK_RANGE ; +} +static int hibmc_plane_atomic_check (struct drm_plane *plane,struct drm_atomic_state *state) {
@@ -214,19 +231,15 @@ static enum drm_mode_status hibmc_crtc_mode_valid(struct drm_crtc *crtc, const struct drm_display_mode *mode) { - size_t i = 0; int vrefresh = drm_mode_vrefresh(mode);if (vrefresh <59 || vrefresh >61 )return MODE_NOCLOCK ; -for (i =0 ; i <ARRAY_SIZE (hibmc_pll_table); i++) { -if (hibmc_pll_table[i].hdisplay == mode->hdisplay && - hibmc_pll_table[i].vdisplay == mode->vdisplay) -return MODE_OK ; - } +if (hibmc_get_best_clock_idx (mode) >=0 ) +return MODE_OK ; -return MODE_BAD ; +return MODE_CLOCK_RANGE ; }static u32 format_pll_reg (void )
@@ -281,23 +294,20 @@ static void set_vclock_hisilicon(struct drm_device *dev, u64 pll)writel (val, priv->mmio +CRT_PLL1_HS ); } -static void get_pll_config (u64 x,u64 y,u32 *pll1,u32 *pll2) +static void get_pll_config (struct drm_display_mode *mode,u32 *pll1,u32 *pll2) { -size_t i; -size_t count =ARRAY_SIZE (hibmc_pll_table); - -for (i =0 ; i < count; i++) { -if (hibmc_pll_table[i].hdisplay == x && - hibmc_pll_table[i].vdisplay == y) { - *pll1 = hibmc_pll_table[i].pll1_config_value; - *pll2 = hibmc_pll_table[i].pll2_config_value; -return ; - } +int idx; + + idx =hibmc_get_best_clock_idx (mode); +if (idx <0 ) { +/* if found none, we use default value */ + *pll1 =CRT_PLL1_HS_25MHZ ; + *pll2 =CRT_PLL2_HS_25MHZ ; +return ; } -/* if found none, we use default value */ - *pll1 =CRT_PLL1_HS_25MHZ ; - *pll2 =CRT_PLL2_HS_25MHZ ; + *pll1 = hibmc_pll_table[idx].pll1_config_value; + *pll2 = hibmc_pll_table[idx].pll2_config_value; }/*
@@ -319,7 +329,7 @@ static u32 display_ctrl_adjust(struct drm_device *dev, x = mode->hdisplay; y = mode->vdisplay; -get_pll_config (x, y, &pll1, &pll2); +get_pll_config (mode, &pll1, &pll2);writel (pll2, priv->mmio +CRT_PLL2_HS );set_vclock_hisilicon (dev, pll1);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 144/1611 evm: terminate and bound the evm_xattrs read buffer
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pengpeng Hou <[email protected]>
[ Upstream commit 11143a19f5b8dc8f414deab87571134f9f447313 ]
evm_read_xattrs() allocates size + 1 bytes, fills them from the list of enabled xattrs, and then passes strlen(temp) to simple_read_from_buffer(). When no configured xattrs are enabled, the fill loop stores nothing and temp[0] remains uninitialized, so strlen() reads beyond initialized memory.
Explicitly terminate the buffer after allocation, use snprintf() for each formatted line, and pass the accumulated length, without risk of truncation, to simple_read_from_buffer().
--- security/integrity/evm/evm_secfs.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
security/integrity/evm/evm_secfs.c +11 -5
@@ -127,8 +127,8 @@ static ssize_t evm_read_xattrs(struct file *filp, char __user *buf, size_t count, loff_t *ppos) { char *temp; -int offset =0 ; -ssize_t rc, size =0 ; +size_t offset =0 , size =0 ; +ssize_t rc;struct xattr_list *xattr;if (*ppos !=0 )
@@ -151,16 +151,22 @@ static ssize_t evm_read_xattrs(struct file *filp, char __user *buf,return -ENOMEM ; } + temp[size] ='\0' ; + +/* +* No truncation possible: size is computed over the same enabled +* xattrs under xattr_list_mutex, so offset never exceeds size. +*/ list_for_each_entry (xattr, &evm_config_xattrnames, list) {if (!xattr->enabled)continue ; -sprintf (temp + offset,"%s\n" , xattr->name); - offset +=strlen (xattr->name) +1 ; + offset +=snprintf (temp + offset, size +1 - offset,"%s\n" , + xattr->name); }mutex_unlock (&xattr_list_mutex); - rc =simple_read_from_buffer (buf, count, ppos, temp,strlen (temp)); + rc =simple_read_from_buffer (buf, count, ppos, temp, offset);kfree (temp);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 145/1611 thermal: hwmon: Fix critical temperature attribute removal
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rafael J. Wysocki <[email protected]>
[ Upstream commit c2114dbda05354dbcf4dfbb30a2c623e8611c43a ]
Since the return value of thermal_zone_crit_temp_valid() depends on the behavior of the thermal zone .get_crit_temp() callback which may change over time in theory, thermal_remove_hwmon_sysfs() may attempt to remove a critical temperature attribute that has not been created, passing a pointer to an uninitialized attribute structure to device_remove_file().
To avoid that, set a flag in struct thermal_hwmon_temp after creating a critical temperature attribute and use the value of that flag to decide whether or not the attribute needs to be removed.
--- drivers/thermal/thermal_hwmon.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/thermal/thermal_hwmon.c +4 -1
@@ -40,6 +40,7 @@ struct thermal_hwmon_temp {struct thermal_zone_device *tz;struct thermal_hwmon_attr temp_input;/* hwmon sys attr */ struct thermal_hwmon_attr temp_crit;/* hwmon sys attr */ +bool temp_crit_present; };static LIST_HEAD (thermal_hwmon_list);
@@ -191,6 +192,8 @@ int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz) &temp->temp_crit.attr);if (result) goto unregister_input; + + temp->temp_crit_present = true; }mutex_lock (&thermal_hwmon_list_lock);
@@ -235,7 +238,7 @@ void thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz) }device_remove_file (hwmon->device, &temp->temp_input.attr); -if (thermal_zone_crit_temp_valid (tz)) +if (temp->temp_crit_present)device_remove_file (hwmon->device, &temp->temp_crit.attr);mutex_lock (&thermal_hwmon_list_lock);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 146/1611 clk: scpi: Unregister child clock providers on remove
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stepan Ionichev <[email protected]>
[ Upstream commit b79d9b5747d961516c35ef4d5e91efa579fd3e9a ]
SCPI clock providers are registered for each child node in scpi_clk_add(), but scpi_clocks_remove() unregisters the parent node on each iteration.
of_clk_del_provider() matches providers by the node used at registration time, so passing the parent node leaves the child providers registered. This leaks the provider allocations and the node references held by the clock provider core.
Pass the child node to of_clk_del_provider() so the remove path matches the probe path.
(sudeep.holla: Updated commit title and message a bit)
--- drivers/clk/clk-scpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/clk-scpi.c +1 -1
@@ -258,7 +258,7 @@ static void scpi_clocks_remove(struct platform_device *pdev) }for_each_available_child_of_node (np, child) -of_clk_del_provider (np); +of_clk_del_provider (child); }static int scpi_clocks_probe (struct platform_device *pdev)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 147/1611 net/sched: sch_hfsc: annotate data-races in hfsc_dump_class_stats()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit e300c7d470ad2726d6abf7d11b31b5d9912d9cf0 ]
hfsc_dump_class_stats() runs without qdisc spinlock being held.
Add READ_ONCE()/WRITE_ONCE() annotations around:
- cl->level
- cl->cl_vtperiod
- cl->cl_total
- cl->cl_cumul
--- net/sched/sch_hfsc.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
net/sched/sch_hfsc.c +11 -11
@@ -715,7 +715,7 @@ init_vf(struct hfsc_class *cl, unsigned int len)rtsc_min (&cl->cl_virtual, &cl->cl_fsc, cl->cl_vt, cl->cl_total); cl->cl_vtadj =0 ; - cl->cl_vtperiod++;/* increment vt period */ +WRITE_ONCE (cl->cl_vtperiod, cl->cl_vtperiod +1 );/* increment vt period */ cl->cl_parentperiod = cl->cl_parent->cl_vtperiod;if (cl->cl_parent->cl_nactive ==0 ) cl->cl_parentperiod++;
@@ -757,7 +757,7 @@ update_vf(struct hfsc_class *cl, unsigned int len, u64 cur_time) go_passive =1 ;for (; cl->cl_parent !=NULL ; cl = cl->cl_parent) { - cl->cl_total += len; +WRITE_ONCE (cl->cl_total, cl->cl_total + len);if (!(cl->cl_flags &HFSC_FSC ) || cl->cl_nactive ==0 )continue ;
@@ -847,7 +847,7 @@ hfsc_adjust_levels(struct hfsc_class *cl)if (p->level >= level) level = p->level +1 ; } - cl->level = level; +WRITE_ONCE (cl->level, level); }while ((cl = cl->cl_parent) !=NULL ); }
@@ -1338,10 +1338,10 @@ hfsc_dump_class_stats(struct Qdisc *sch, unsigned long arg,__u32 qlen;qdisc_qstats_qlen_backlog (cl->qdisc, &qlen, &cl->qstats.backlog); - xstats.level = cl->level; - xstats.period = cl->cl_vtperiod; - xstats.work = cl->cl_total; - xstats.rtwork = cl->cl_cumul; + xstats.level =READ_ONCE (cl->level); + xstats.period =READ_ONCE (cl->cl_vtperiod); + xstats.work =READ_ONCE (cl->cl_total); + xstats.rtwork =READ_ONCE (cl->cl_cumul); if (gnet_stats_copy_basic(d, NULL, &cl->bstats, true) < 0 || gnet_stats_copy_rate_est(d, &cl->rate_est) < 0 ||
@@ -1452,15 +1452,15 @@ hfsc_change_qdisc(struct Qdisc *sch, struct nlattr *opt,static void hfsc_reset_class (struct hfsc_class *cl) { - cl->cl_total =0 ; - cl->cl_cumul =0 ; +WRITE_ONCE (cl->cl_total,0 ); +WRITE_ONCE (cl->cl_cumul,0 ); cl->cl_d =0 ; cl->cl_e =0 ; cl->cl_vt =0 ; cl->cl_vtadj =0 ; cl->cl_cvtmin =0 ; cl->cl_cvtoff =0 ; - cl->cl_vtperiod =0 ; +WRITE_ONCE (cl->cl_vtperiod,0 ); cl->cl_parentperiod =0 ; cl->cl_f =0 ; cl->cl_myf =0 ;
@@ -1626,7 +1626,7 @@ hfsc_dequeue(struct Qdisc *sch)bstats_update (&cl->bstats, skb);update_vf (cl,qdisc_pkt_len (skb), cur_time);if (realtime) - cl->cl_cumul +=qdisc_pkt_len (skb); +WRITE_ONCE (cl->cl_cumul, cl->cl_cumul +qdisc_pkt_len (skb));if (cl->cl_flags &HFSC_RSC ) {if (cl->qdisc->q.qlen !=0 ) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 148/1611 scsi: hisi_sas: Add slave_destroy interface for v3 hw
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yihang Li <[email protected]>
[ Upstream commit 67b85a88265df19f049241d8c00571a5408f4eeb ]
WARNING is triggered when executing link reset of remote PHY and rmmod SAS driver simultaneously. Following is the WARNING log:
WARNING: CPU: 61 PID: 21818 at drivers/base/core.c:1347 __device_links_no_driver+0xb4/0xc0 Call trace: __device_links_no_driver+0xb4/0xc0 device_links_driver_cleanup+0xb0/0xfc __device_release_driver+0x198/0x23c device_release_driver+0x38/0x50 bus_remove_device+0x130/0x140 device_del+0x184/0x434 __scsi_remove_device+0x118/0x150 scsi_remove_target+0x1bc/0x240 sas_rphy_remove+0x90/0x94 sas_rphy_delete+0x24/0x3c sas_destruct_devices+0x64/0xa0 [libsas] sas_revalidate_domain+0xe4/0x150 [libsas] process_one_work+0x1e0/0x46c worker_thread+0x15c/0x464 kthread+0x160/0x170 ret_from_fork+0x10/0x20 ---[ end trace 71e059eb58f85d4a ]---
During SAS phy up, link->status is set to DL_STATE_AVAILABLE in device_links_driver_bound, then this setting influences __device_links_no_driver() before driver rmmod and caused WARNING.
Add the slave_destroy interface to make sure link is removed after flush workque.
--- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +11 -1
@@ -2977,7 +2977,7 @@ static int sdev_configure_v3_hw(struct scsi_device *sdev,return 0 ;if (!device_link_add (&sdev->sdev_gendev, dev, -DL_FLAG_PM_RUNTIME |DL_FLAG_RPM_ACTIVE )) { +DL_FLAG_STATELESS |DL_FLAG_PM_RUNTIME |DL_FLAG_RPM_ACTIVE )) {if (pm_runtime_enabled (dev)) {dev_info (dev,"add device link failed, disable runtime PM for the host\n" );pm_runtime_disable (dev);
@@ -2987,6 +2987,15 @@ static int sdev_configure_v3_hw(struct scsi_device *sdev,return 0 ; } +static void hisi_sas_sdev_destroy (struct scsi_device *sdev) +{ +struct Scsi_Host *shost =dev_to_shost (&sdev->sdev_gendev); +struct hisi_hba *hisi_hba =shost_priv (shost); +struct device *dev = hisi_hba->dev; + +device_link_remove (&sdev->sdev_gendev, dev); +} +static struct attribute *host_v3_hw_attrs[] = { &dev_attr_phy_event_threshold.attr, &dev_attr_intr_conv_v3_hw.attr,
@@ -3401,6 +3410,7 @@ static const struct scsi_host_template sht_v3_hw = { .sg_tablesize = HISI_SAS_SGE_PAGE_CNT, .sg_prot_tablesize = HISI_SAS_SGE_PAGE_CNT, .sdev_init = hisi_sas_sdev_init, + .sdev_destroy = hisi_sas_sdev_destroy, .shost_groups = host_v3_hw_groups, .sdev_groups = sdev_groups_v3_hw, .tag_alloc_policy_rr = true,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 149/1611 crypto: ccp - Treat zero-length cert chain as query for blob lengths
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Christopherson <[email protected]>
[ Upstream commit ef8c9dacda2871accd64e3eda951fef6b788b1ea ]
When handling a PDH export, treat a zero-length userspace cert chain buffer as a request to query the length of the relevant blobs. Failure to account for the zero-length buffer trips a BUG_ON() when running with CONFIG_DEBUG_VIRTUAL=y due to trying to get the physical address of the ZERO_SIZE_PTR (returned by kzalloc() on the bogus allocation).
kernel BUG at arch/x86/mm/physaddr.c:28 !
Oops: invalid opcode: 0000 [#1] SMP KASAN NOPTI
CPU: 30 UID: 0 PID: 28580 Comm: syz.2.18 Kdump: loaded
Tainted: G W 6.18.16-smp-DEV #1 NONE
Tainted: [W]=WARN
Hardware name: Google, Inc. Arcadia_IT_80/Arcadia_IT_80, BIOS 12.62.0-0 11/19/2025
RIP: 0010:__phys_addr+0x16a/0x180 arch/x86/mm/physaddr.c:28
RSP: 0018:ffffc9008329fc80 EFLAGS: 00010293
RAX: ffffffff8179110a RBX: 0000778000000010 RCX: ffff8884e6992600
RDX: 0000000000000000 RSI: 0000000080000010 RDI: 0000778000000010
RBP: ffffc9008329fdf0 R08: 0000000000000dc0 R09: 00000000ffffffff
R10: dffffc0000000000 R11: fffffbfff126d297 R12: dffffc0000000000
R13: 1ffff92010653fc8 R14: 0000000080000010 R15: dffffc0000000000
FS: 0000555556bec9c0(0000) GS:ffff88aa4ce1c000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007fd3159e7000 CR3: 00000004fbc44000 CR4: 0000000000350ef0
Call Trace:
<TASK>
[<ffffffff853d3869>] sev_ioctl_do_pdh_export+0x559/0x7a0 drivers/crypto/ccp/sev-dev.c:2308
[<ffffffff853d1fdd>] sev_ioctl+0x2cd/0x480 drivers/crypto/ccp/sev-dev.c:2556
[<ffffffff82549ebc>] vfs_ioctl fs/ioctl.c:52 [inline]
[<ffffffff82549ebc>] __do_sys_ioctl fs/ioctl.c:598 [inline]
[<ffffffff82549ebc>] __se_sys_ioctl+0xfc/0x170 fs/ioctl.c:584
[<ffffffff8630115f>] do_syscall_x64 arch/x86/entry/syscall_64.c:64 [inline]
[<ffffffff8630115f>] do_syscall_64+0x9f/0xf40 arch/x86/entry/syscall_64.c:98
[<ffffffff81000136>] entry_SYSCALL_64_after_hwframe+0x76/0x7e
RIP: 0033:0x7fd3158eac39
</TASK>Thankfully, the bug is benign outside of CONFIG_DEBUG_VIRTUAL=y as getting the physical address is just arithmetic, and the PSP errors out before trying to write to the garbage address (which it must, otherwise querying the blob lengths would clobber memory at pfn=0).
--- drivers/crypto/ccp/sev-dev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/crypto/ccp/sev-dev.c +2 -1
@@ -2258,7 +2258,8 @@ static int sev_ioctl_do_pdh_export(struct sev_issue_cmd *argp, bool writable)/* Userspace wants to query the certificate length. */ if (!input.pdh_cert_address || !input.pdh_cert_len || - !input.cert_chain_address) + !input.cert_chain_address || + !input.cert_chain_len) goto cmd;/* Allocate a physically contiguous buffer to store the PDH blob. */
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 150/1611 spi: hisi-kunpeng: Use dev_err_probe() for host registration failure
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qiang Ma <[email protected]>
[ Upstream commit 59b991990a04b1d1ce95373983b7c8b65bdf7acc ]
When the SPI core registers the Kunpeng controller it may need to acquire chip-select GPIO descriptors. If the GPIO provider has not probed yet, spi_register_controller() returns -EPROBE_DEFER.
On a Kunpeng system this currently prints an alarming error even though the next deferred-probe retry succeeds:
hisi-kunpeng-spi HISI03E1:00: failed to register spi host, ret=-517 hisi-kunpeng-spi HISI03E1:00: hw version:0x30 max-freq:12500 kHz
Use dev_err_probe() so that -EPROBE_DEFER is reported through the deferred probe mechanism instead of as a hard error, while preserving normal error reporting for real registration failures.
--- drivers/spi/spi-hisi-kunpeng.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/spi/spi-hisi-kunpeng.c +2 -4
@@ -518,10 +518,8 @@ static int hisi_spi_probe(struct platform_device *pdev) } ret =spi_register_controller (host); -if (ret) { -dev_err (dev,"failed to register spi host, ret=%d\n" , ret); -return ret; - } +if (ret) +return dev_err_probe (dev, ret,"failed to register spi host\n" );if (hisi_spi_debugfs_init (hs))dev_info (dev,"failed to create debugfs dir\n" );
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 151/1611 net/sched: sch_htb: do not change sch->flags in htb_dump()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 9b949fa69129e4b694ed11ee3be6d6edd4a9b8f4 ]
htb_dump() runs without holding qdisc spinlock.
It is illegal to touch sch->flags with non locked RMW, as concurrent readers might see intermediate wrong values.
Set TCQ_F_OFFLOADED in control path (htb_init()) instead.
--- net/sched/sch_htb.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
net/sched/sch_htb.c +1 -5
@@ -1148,6 +1148,7 @@ static int htb_init(struct Qdisc *sch, struct nlattr *opt,* parts (especially calling ndo_setup_tc) on errors. */ q->offload = true; + sch->flags |=TCQ_F_OFFLOADED ;return 0 ; }
@@ -1208,11 +1209,6 @@ static int htb_dump(struct Qdisc *sch, struct sk_buff *skb)struct nlattr *nest;struct tc_htb_glob gopt; -if (q->offload) - sch->flags |=TCQ_F_OFFLOADED ; -else - sch->flags &= ~TCQ_F_OFFLOADED ; - sch->qstats.overlimits = q->overlimits;/* Its safe to not acquire qdisc lock. As we hold RTNL, * no change can happen on the qdisc parameters.
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 152/1611 net/sched: sch_htb: annotate data-races (I)
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit e54c33503bf7cebb1c1790251ce90f1252678081 ]
htb_dump() runs without holding qdisc spinlock.
Add missing READ_ONCE()/WRITE_ONCE() annotations around q->overlimits and q->direct_pkts.
--- net/sched/sch_htb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/sched/sch_htb.c +4 -4
@@ -568,7 +568,7 @@ htb_change_class_mode(struct htb_sched *q, struct htb_class *cl, s64 *diff)if (new_mode ==HTB_CANT_SEND ) { cl->overlimits++; - q->overlimits++; +WRITE_ONCE (q->overlimits, q->overlimits +1 ); }if (cl->prio_activity) {/* not necessary: speed optimization */
@@ -628,7 +628,7 @@ static int htb_enqueue(struct sk_buff *skb, struct Qdisc *sch,/* enqueue to helper queue */ if (q->direct_queue.qlen < q->direct_qlen) {__qdisc_enqueue_tail (skb, &q->direct_queue); - q->direct_pkts++; +WRITE_ONCE (q->direct_pkts, q->direct_pkts +1 ); }else {return qdisc_drop (skb, sch, to_free); }
@@ -1209,12 +1209,12 @@ static int htb_dump(struct Qdisc *sch, struct sk_buff *skb)struct nlattr *nest;struct tc_htb_glob gopt; - sch->qstats.overlimits = q->overlimits; + sch->qstats.overlimits =READ_ONCE (q->overlimits);/* Its safe to not acquire qdisc lock. As we hold RTNL, * no change can happen on the qdisc parameters. */ - gopt.direct_pkts = q->direct_pkts; + gopt.direct_pkts =READ_ONCE (q->direct_pkts); gopt.version =HTB_VER ; gopt.rate2quantum = q->rate2quantum; gopt.defcls = q->defcls;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 153/1611 ipv6: addrconf: bail out of dad_failure when state is no longer POSTDAD
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Linmao Li <[email protected]>
[ Upstream commit 627ac78f2741e2ebd2225e2e953b6964a8a9182f ]
addrconf_dad_failure() transitions ifp->state from DAD to POSTDAD via addrconf_dad_end(), which drops ifp->lock on return. The lock is re-acquired after net_info_ratelimited(). A concurrent ipv6_del_addr() can take the lock in that window, set ifp->state to DEAD and run list_del_rcu(&ifp->if_list).
addrconf_dad_failure() then overwrites DEAD with ERRDAD at errdad:
and schedules a new dad_work. The work calls ipv6_del_addr() again, hitting the already-poisoned list entry:
general protection fault: 0000 [#1] SMP NOPTI CPU: 4 PID: 217 Comm: kworker/4:1 Workqueue: ipv6_addrconf addrconf_dad_work RIP: 0010:ipv6_del_addr+0xe9/0x280 RAX: dead000000000122 Call Trace: addrconf_dad_stop+0x113/0x140 addrconf_dad_work+0x28c/0x430 process_one_work+0x1eb/0x3b0 worker_thread+0x4d/0x400 kthread+0x104/0x140 ret_from_fork+0x35/0x40
Fold the addrconf_dad_end() logic into addrconf_dad_failure() under a single ifp->lock critical section. The STABLE_PRIVACY branch temporarily drops ifp->lock around address regeneration, so atlock_errdad: verify the state is still POSTDAD before transitioning to ERRDAD; bail out otherwise to avoid overwriting a state set by another path while the lock was released.
--- net/ipv6/addrconf.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
net/ipv6/addrconf.c +10 -3
@@ -2168,16 +2168,18 @@ void addrconf_dad_failure(struct sk_buff *skb, struct inet6_ifaddr *ifp)struct net *net =dev_net (idev->dev);int max_addresses; -if (addrconf_dad_end (ifp)) { +spin_lock_bh (&ifp->lock); + +if (ifp->state !=INET6_IFADDR_STATE_DAD ) { +spin_unlock_bh (&ifp->lock);in6_ifa_put (ifp);return ; } + ifp->state =INET6_IFADDR_STATE_POSTDAD ;net_info_ratelimited ("%s: IPv6 duplicate address %pI6c used by %pM detected!\n" , ifp->idev->dev->name, &ifp->addr,eth_hdr (skb)->h_source); -spin_lock_bh (&ifp->lock); -if (ifp->flags &IFA_F_STABLE_PRIVACY ) {struct in6_addr new_addr;struct inet6_ifaddr *ifp2;
@@ -2225,6 +2227,11 @@ void addrconf_dad_failure(struct sk_buff *skb, struct inet6_ifaddr *ifp)in6_ifa_put (ifp2); lock_errdad:spin_lock_bh (&ifp->lock); +if (ifp->state !=INET6_IFADDR_STATE_POSTDAD ) { +spin_unlock_bh (&ifp->lock); +in6_ifa_put (ifp); +return ; + } } errdad:
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 154/1611 IB/mlx5: Fix transport-domain rollback and initialize lb mutex earlier
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Prathamesh Deshpande <[email protected]>
[ Upstream commit e79389115b9d27287ff6230a9750675106ed7668 ]
mlx5_ib_alloc_transport_domain() allocates a transport domain and then may fail in mlx5_ib_enable_lb(). In that case, the allocated TD is leaked.
Fix this by deallocating the TD when mlx5_ib_enable_lb() returns an error. Also return 0 explicitly in the no-loopback-capability success branch, and move dev->lb.mutex initialization to mlx5_ib_stage_init_init().
--- drivers/infiniband/hw/mlx5/main.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/infiniband/hw/mlx5/main.c +8 -7
@@ -1941,9 +1941,13 @@ static int mlx5_ib_alloc_transport_domain(struct mlx5_ib_dev *dev, u32 *tdn,if ((MLX5_CAP_GEN (dev->mdev, port_type) !=MLX5_CAP_PORT_TYPE_ETH ) || (!MLX5_CAP_GEN (dev->mdev, disable_local_lb_uc) && !MLX5_CAP_GEN (dev->mdev, disable_local_lb_mc))) -return err; +return 0 ; + + err =mlx5_ib_enable_lb (dev, true, false); +if (err) +mlx5_cmd_dealloc_transport_domain (dev->mdev, *tdn, uid); -return mlx5_ib_enable_lb (dev, true, false); +return err; } static void mlx5_ib_dealloc_transport_domain(struct mlx5_ib_dev *dev, u32 tdn,
@@ -4246,6 +4250,8 @@ static int mlx5_ib_stage_init_init(struct mlx5_ib_dev *dev) dev->port[i].roce.last_port_state =IB_PORT_DOWN ; } +mutex_init (&dev->lb.mutex); + err =mlx5r_cmd_query_special_mkeys (dev);if (err)return err;
@@ -4506,11 +4512,6 @@ static int mlx5_ib_stage_caps_init(struct mlx5_ib_dev *dev)if (err)return err; -if ((MLX5_CAP_GEN (dev->mdev, port_type) ==MLX5_CAP_PORT_TYPE_ETH ) && - (MLX5_CAP_GEN (dev->mdev, disable_local_lb_uc) || -MLX5_CAP_GEN (dev->mdev, disable_local_lb_mc))) -mutex_init (&dev->lb.mutex); -if (MLX5_CAP_GEN_64 (dev->mdev, general_obj_types) &MLX5_GENERAL_OBJ_TYPES_CAP_VIRTIO_NET_Q ) { err =mlx5_ib_init_var_table (dev);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 155/1611 RDMA/hns: Fix arithmetic overflow in calc_hem_config()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Chesnokov <[email protected]>
[ Upstream commit a38e4410af9ad8b7ad2217254da06cd4dc21f0ed ]
If bt_num is 3 or 2, then the expressions like l0_idx * chunk_ba_num + l1_idx are computed in 32-bit arithmetic before being assigned to a u64 index field, which can lead to overflow.
Cast the first operand to u64 to ensure the arithmetic is performed in 64-bit.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/infiniband/hw/hns/hns_roce_hem.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/infiniband/hw/hns/hns_roce_hem.c +4 -4
@@ -314,14 +314,14 @@ static int calc_hem_config(struct hns_roce_dev *hr_dev, bt_num =hns_roce_get_bt_num (table->type, mhop->hop_num);switch (bt_num) {case 3 : - index->l1 = l0_idx * chunk_ba_num + l1_idx; + index->l1 = (u64 )l0_idx * chunk_ba_num + l1_idx; index->l0 = l0_idx; - index->buf = l0_idx * chunk_ba_num * chunk_ba_num + - l1_idx * chunk_ba_num + l2_idx; + index->buf = (u64 )l0_idx * chunk_ba_num * chunk_ba_num + + (u64 )l1_idx * chunk_ba_num + l2_idx;break ;case 2 : index->l0 = l0_idx; - index->buf = l0_idx * chunk_ba_num + l1_idx; + index->buf = (u64 )l0_idx * chunk_ba_num + l1_idx;break ;case 1 : index->buf = l0_idx;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 156/1611 RDMA/mlx5: Fix UMR XLT cleanup on ODP populate failure
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Prathamesh Deshpande <[email protected]>
[ Upstream commit 1eae35b37923cb71b0cb5136d00671440d488b9f ]
mlx5r_umr_update_xlt() allocates and DMA maps an XLT buffer with mlx5r_umr_create_xlt(). The buffer is released by the common cleanup path through mlx5r_umr_unmap_free_xlt().
After mlx5_odp_populate_xlt() became fallible, its error path returned directly and skipped that cleanup. This leaks the XLT DMA mapping and buffer. If the emergency XLT page was used, it also leaves xlt_emergency_page_mutex locked.
Break out of the loop so execution falls through the existing cleanup path.
--- drivers/infiniband/hw/mlx5/umr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/mlx5/umr.c +1 -1
@@ -915,7 +915,7 @@ int mlx5r_umr_update_xlt(struct mlx5_ib_mr *mr, u64 idx, int npages,*/ err =mlx5_odp_populate_xlt (xlt, idx, npages, mr, flags);if (err) -return err; +break ;dma_sync_single_for_device (ddev, sg.addr, sg.length,DMA_TO_DEVICE ); sg.length =ALIGN (size_to_map,MLX5_UMR_FLEX_ALIGNMENT );
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 157/1611 RDMA/mlx5: Fix devx subscribe-event unwind NULL dereference
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Prathamesh Deshpande <[email protected]>
[ Upstream commit 43f8f7946814c8e5f464518246fdbc69b6e32326 ]
MLX5_IB_METHOD_DEVX_SUBSCRIBE_EVENT() links event_sub into sub_list before initializing the fields used by the shared error path.
If eventfd_ctx_fdget() then fails, the unwind path dereferences event_sub->ev_file in uverbs_uobject_put() and calls subscribe_event_xa_dealloc() with an unset xa_key_level1.
subscribe_event_xa_alloc() creates the XA entry exactly once for a given key_level1, on the first occurrence of that key. The unwind path must therefore call subscribe_event_xa_dealloc() exactly once for it as well.
Enforce that by adding devx_key_in_sub_list() and calling subscribe_event_xa_dealloc() only when the last matching pending entry is being cleaned up.
--- drivers/infiniband/hw/mlx5/devx.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-)
drivers/infiniband/hw/mlx5/devx.c +23 -7
@@ -1899,6 +1899,17 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_ASYNC_QUERY)(return err; } +static bool devx_key_in_sub_list (struct list_head *list,u32 key_level1) +{ +struct devx_event_subscription *s; + +list_for_each_entry (s, list, event_list) +if (s->xa_key_level1 == key_level1) +return true; + +return false; +} + static void subscribe_event_xa_dealloc(struct mlx5_devx_event_table *devx_event_table, u32 key_level1,
@@ -2146,10 +2157,17 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_SUBSCRIBE_EVENT)( event_sub =kzalloc (sizeof (*event_sub),GFP_KERNEL );if (!event_sub) { +if (!devx_key_in_sub_list (&sub_list, key_level1)) +subscribe_event_xa_dealloc (devx_event_table, + key_level1, + obj, + obj_id); err = -ENOMEM ; goto err; } + event_sub->ev_file = ev_file; + event_sub->xa_key_level1 = key_level1;list_add_tail (&event_sub->event_list, &sub_list);uverbs_uobject_get (&ev_file->uobj);if (use_eventfd) {
@@ -2164,9 +2182,6 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_SUBSCRIBE_EVENT)( } event_sub->cookie = cookie; - event_sub->ev_file = ev_file; -/* May be needed upon cleanup the devx object/subscription */ - event_sub->xa_key_level1 = key_level1; event_sub->xa_key_level2 = obj_id;INIT_LIST_HEAD (&event_sub->obj_list); }
@@ -2211,10 +2226,11 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_SUBSCRIBE_EVENT)(list_for_each_entry_safe (event_sub, tmp_sub, &sub_list, event_list) {list_del (&event_sub->event_list); -subscribe_event_xa_dealloc (devx_event_table, - event_sub->xa_key_level1, - obj, - obj_id); +if (!devx_key_in_sub_list (&sub_list, event_sub->xa_key_level1)) +subscribe_event_xa_dealloc (devx_event_table, + event_sub->xa_key_level1, + obj, + obj_id);if (event_sub->eventfd)eventfd_ctx_put (event_sub->eventfd);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 158/1611 RDMA/srpt: fix integer overflow in immediate data length check
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sara Venkatesh <[email protected]>
[ Upstream commit eb4ecdf631fe00e8020bf461503cb9b7017ed796 ]
imm_buf->len is a user-controlled uint32_t received from the network. Adding it to imm_data_offset without overflow checking allows a malicious initiator to send len=0xFFFFFFFF, causing req_size to wrap around to a small value, bypassing the bounds check, and subsequently passing a ~4GB length to sg_init_one().
Use check_add_overflow() to detect wrapping before the comparison.
--- drivers/infiniband/ulp/srpt/ib_srpt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/infiniband/ulp/srpt/ib_srpt.c +3 -2
@@ -1129,9 +1129,10 @@ static int srpt_get_desc_tbl(struct srpt_recv_ioctx *recv_ioctx,struct srp_imm_buf *imm_buf =srpt_get_desc_buf (srp_cmd);void *data = (void *)srp_cmd + imm_data_offset;uint32_t len =be32_to_cpu (imm_buf->len); -uint32_t req_size = imm_data_offset + len; +uint32_t req_size; -if (req_size > srp_max_req_size) { +if (check_add_overflow ((uint32_t )imm_data_offset, len, &req_size) || + req_size > srp_max_req_size) {pr_err ("Immediate data (length %d + %d) exceeds request size %d\n" , imm_data_offset, len, srp_max_req_size);return -EINVAL ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 159/1611 RDMA/hns: Initialize seqfile before creating file
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Junxian Huang <[email protected]>
[ Upstream commit b4070770506ff516e21b4923afdaf7eb5da0e150 ]
The debugfs file was created before seq->read and seq->data were set, leaving a small window where userspace could access an uninitialized seqfile.
Move debugfs_create_file() after the assignments to avoid this issue. Also, inline the original init_debugfs_seqfile() since it is not a really necessary helper.
--- drivers/infiniband/hw/hns/hns_roce_debugfs.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-)
drivers/infiniband/hw/hns/hns_roce_debugfs.c +5 -14
@@ -26,17 +26,6 @@ static const struct file_operations hns_debugfs_seqfile_fops = { .llseek = seq_lseek }; -static void init_debugfs_seqfile (struct hns_debugfs_seqfile *seq, -const char *name,struct dentry *parent, -int (*read_fn)(struct seq_file *,void *), -void *data) -{ -debugfs_create_file (name,0400 , parent, seq, &hns_debugfs_seqfile_fops); - - seq->read = read_fn; - seq->data = data; -} -static const char *const sw_stat_info[] = { [HNS_ROCE_DFX_AEQE_CNT ] ="aeqe" , [HNS_ROCE_DFX_CEQE_CNT ] ="ceqe" ,
@@ -76,10 +65,12 @@ static void create_sw_stat_debugfs(struct hns_roce_dev *hr_dev, {struct hns_sw_stat_debugfs *dbgfs = &hr_dev->dbgfs.sw_stat_root; - dbgfs->root =debugfs_create_dir ("sw_stat" , parent); + dbgfs->sw_stat.read = sw_stat_debugfs_show; + dbgfs->sw_stat.data = hr_dev; -init_debugfs_seqfile (&dbgfs->sw_stat,"sw_stat" , dbgfs->root, - sw_stat_debugfs_show, hr_dev); + dbgfs->root =debugfs_create_dir ("sw_stat" , parent); +debugfs_create_file ("sw_stat" ,0400 , dbgfs->root, &dbgfs->sw_stat, + &hns_debugfs_seqfile_fops); }/* debugfs for device */
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 160/1611 drm/syncobj: Fix memory leak in drm_syncobj_find_fence()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Liviu Dudau <[email protected]>
[ Upstream commit e5b93bd6fdb92aa5e4689715d7e8487d9ce66a38 ]
Commit 18226ba52159 ("drm/syncobj: reject invalid flags in drm_syncobj_find_fence") forgot to take into account the fact that drm_syncobj_find() takes a reference to syncobj and returns early without dropping the reference, leading to memory leaks.
Reported by: Sam Spencer <[email protected]>
--- drivers/gpu/drm/drm_syncobj.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/gpu/drm/drm_syncobj.c +6 -4
@@ -442,13 +442,15 @@ int drm_syncobj_find_fence(struct drm_file *file_private,u64 timeout =nsecs_to_jiffies64 (DRM_SYNCOBJ_WAIT_FOR_SUBMIT_TIMEOUT );int ret; -if (flags & ~DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT ) -return -EINVAL ; -if (!syncobj)return -ENOENT ; -/* Waiting for userspace with locks help is illegal cause that can +if (flags & ~DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT ) { + ret = -EINVAL ; + goto out; + } + +/* Waiting for userspace with locks held is illegal cause that can * trivial deadlock with page faults for example. Make lockdep complain * about it early on. */
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 161/1611 selftests/bpf: Reject unsupported -k option in vmtest.sh
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Roman Kvasnytskyi <[email protected]>
[ Upstream commit 6df582112aa9ac9d190169abdb0e42e496659ec9 ]
vmtest.sh does not document a -k option and does not handle it in the getopts case statement. However, the getopts optstring includes k, which causes the script to accept -k silently instead of reporting it as an invalid option.
Remove k from the optstring so unsupported options are rejected through the existing invalid-option path.
--- tools/testing/selftests/bpf/vmtest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/vmtest.sh +1 -1
@@ -382,7 +382,7 @@ main() local exit_command="poweroff -f" local debug_shell="no" - while getopts ':hskl:id:j:' opt; do + while getopts ':hsl:id:j:' opt; do case ${opt} in l) LOCAL_ROOTFS_IMAGE="$OPTARG"
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 162/1611 selftests/bpf: Fix test for refinement of single-value tnum
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Chaignon <[email protected]>
[ Upstream commit 523d2f42b406f5be2989f436b03eacebf3679835 ]
This patch fixes the "bounds refinement with single-value tnum on umin" verifier selftest. This selftest was introduced in commit e6ad477d1bf8 ("selftests/bpf: Test refinement of single-value tnum") to cover the logic from __update_reg64_bounds(), introduced in commit efc11a667878 ("bpf: Improve bounds when tnum has a single possible value"). However, the test still passes if that last commit is reverted.
The test is supposed to cover the case when the tnum and u64 range (or cnum64 now) overlap in a single value. __update_reg64_bounds() detects that case and refines the bounds to a known constant. However, the constants for the test were poorly chosen and the bounds get refined to a known constant even without __update_reg64_bounds(). The code is as follows:
0: call bpf_get_prandom_u32#7 ; R0=scalar() 1: r0 |= 224 ; R0=scalar(umin=umin32=224,var_off=(0xe0; 0xffffffffffffff1f)) 2: r0 &= 240 ; R0=scalar(smin=umin=smin32=umin32=224,smax=umax=smax32=umax32=240,var_off=(0xe0; 0x10)) 3: if r0 == 0xf0 goto pc+2 ; R0=224
After instruction 3, we have u64=[0xe0; 0xef] and tnum=(0xe0; 0x10). __reg_bound_offset() is able to deduce a new tnum from the u64, tnum=(0xe0; 0x0f), which combined with the existing tnum gives us a
constant: 0xe0 or 224.
We can easily fix this by choosing different starting bounds. If we make it u64=[0xe1; 0xf0], then __reg_bound_offset() doesn't have any impact.
--- .../testing/selftests/bpf/progs/verifier_bounds.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
tools/testing/selftests/bpf/progs/verifier_bounds.c +7 -7
@@ -1742,26 +1742,26 @@ __naked void bounds_refinement_tnum_umax(void *ctx)/* This test covers the bounds deduction when the u64 range and the tnum * overlap only at umin. After instruction 3, the ranges look as follows: * -* 0 umin=0xe00 umax=0xeff U64_MAX +* 0 umin=0xe1 umax=0xf0 U64_MAX * | [xxxxxxxxxxxxxx] | * |----------------------------|------------------------------| * | x x | tnum values * -* The verifier can therefore deduce that the R0=0xe0=224. +* The verifier can therefore deduce that the R0=0xe1=225. */ SEC("socket") __description("bounds refinement with single-value tnum on umin") -__msg("3: (15) if r0 == 0xf0 {{.*}} R0=224") +__msg("3: (15) if r0 == 0xf1 {{.*}} R0=225") __success __log_level(2)__flag (BPF_F_TEST_REG_INVARIANTS) __naked void bounds_refinement_tnum_umin(void *ctx) { asmvolatile (" \ call %[bpf_get_prandom_u32]; \ -r0 |= 0xe0; \ -r0 &= 0xf0; \ -if r0 == 0xf0 goto +2; \ -if r0 == 0xe0 goto +1; \ +r0 |= 0xe1; \ +r0 &= 0xf1; \ +if r0 == 0xf1 goto +2; \ +if r0 == 0xe1 goto +1; \ r10 = 0; \ exit; \ " :
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 163/1611 iommu/arm-smmu-qcom: Fix fastrpc compatible string in ACTLR client match table
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bibek Kumar Patro <[email protected]>
[ Upstream commit a6e1618a65d453d4e739e5898c662ccb1e3de6c0 ]
The qcom_smmu_actlr_client_of_match table contained "qcom,fastrpc" as the compatible string for applying ACTLR prefetch settings to FastRPC devices. However, "qcom,fastrpc" is the compatible string for the parent rpmsg channel node, which is not an IOMMU client — it carries no "iommus" property in the device tree and is never attached to an SMMU context bank.
The actual IOMMU clients are the compute context bank (CB) child nodes, which use the compatible string "qcom,fastrpc-compute-cb". These nodes carry the "iommus" property and are probed by fastrpc_cb_driver via fastrpc_cb_probe(), which sets up the DMA mask and IOMMU mappings for each FastRPC session. The device tree structure is:
fastrpc {
compatible = "qcom,fastrpc"; /* rpmsg channel, no iommus */
...
compute-cb@3 {
compatible = "qcom,fastrpc-compute-cb";
iommus = <&apps_smmu 0x1823 0x0>; /* actual IOMMU client */
};
};Since qcom_smmu_set_actlr_dev() calls of_match_device() against the device being attached to the SMMU context bank, the "qcom,fastrpc" entry was never matching any device. As a result, the ACTLR prefetch settings (PREFETCH_DEEP | CPRE | CMTLB) were silently never applied for FastRPC compute context banks.
Fix this by replacing "qcom,fastrpc" with "qcom,fastrpc-compute-cb" in the match table so that the ACTLR settings are correctly applied to the compute CB devices that are the true IOMMU clients.
--- drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +1 -1
@@ -39,7 +39,7 @@ static const struct of_device_id qcom_smmu_actlr_client_of_match[] = { .data = (const void *) (PREFETCH_DEEP | CPRE | CMTLB) }, { .compatible = "qcom,adreno-smmu", .data = (const void *) (PREFETCH_DEEP | CPRE | CMTLB) }, - { .compatible = "qcom,fastrpc", + { .compatible = "qcom,fastrpc-compute-cb", .data = (const void *) (PREFETCH_DEEP | CPRE | CMTLB) }, { .compatible = "qcom,sc7280-mdss", .data = (const void *) (PREFETCH_SHALLOW | CPRE | CMTLB) },
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 164/1611 selftests/mm: Fix resv_sz when parsing arm64 signal frame
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kevin Brodsky <[email protected]>
[ Upstream commit c364aa56d6738c8759e88941d7a45a1d6b4c52d0 ]
get_header() wants the size of the reserved area in struct sigcontext, but instead we pass it the size of the entire struct. This could in theory result in an out-of-bounds read (if the signal frame is malformed).
Fix this using one of the existing macros from tools/testing/selftests/arm64/signal/testcases/testcases.h.
This issue was reported by Sashiko on a patch that copied this portion of the code.
--- tools/testing/selftests/mm/pkey-arm64.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/testing/selftests/mm/pkey-arm64.h +2 -1
@@ -130,9 +130,10 @@ static inline u64 get_pkey_bits(u64 reg, int pkey)static inline void aarch64_write_signal_pkey (ucontext_t *uctxt,u64 pkey) {struct _aarch64_ctx *ctx =GET_UC_RESV_HEAD (uctxt); +size_t resv_size =GET_UCP_RESV_SIZE (uctxt);struct poe_context *poe_ctx = (struct poe_context *)get_header (ctx,POE_MAGIC , -sizeof (uctxt->uc_mcontext),NULL ); + resv_size,NULL );if (poe_ctx) poe_ctx->por_el0 = pkey; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 165/1611 firmware: arm_ffa: Honor partition info descriptor size
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jamie Nguyen <[email protected]>
[ Upstream commit 01b9cae706161a39452a2cce0f281d4369344c51 ]
FFA_PARTITION_INFO_GET_REGS reports the size of each partition information descriptor in x2[63:48]. However, __ffa_partition_info_get_regs() walks the returned register payload with a hardcoded 24-byte stride (regs += 3), even though the size is already read into buf_sz.
That works for the FF-A v1.1/v1.2 24-byte descriptor layout, where each descriptor consumes three registers. Newer FF-A revisions can extend the descriptor while keeping the existing fields at the front. For example, a 48-byte descriptor consumes six registers, so advancing by only three registers desynchronises the parser and can make it read subsequent entries from the middle of a descriptor.
Use the advertised descriptor size to derive the register stride. Validate that the size is register-aligned, large enough for the fields parsed by the driver, and that the requested number of descriptors fits in the returned x3..x17 register window. The driver still copies only the fields it understands, but now skips over any trailing descriptor fields correctly.
(sudeep.holla: Minor rewordng of the commit message and subject)
--- drivers/firmware/arm_ffa/driver.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-)
drivers/firmware/arm_ffa/driver.c +16 -11
@@ -320,11 +320,9 @@ __ffa_partition_info_get(u32 uuid0, u32 uuid1, u32 uuid2, u32 uuid3,#define PART_INFO_EXEC_CXT_MASK GENMASK(31, 16)#define PART_INFO_PROPS_MASK GENMASK(63, 32)#define FFA_PART_INFO_GET_REGS_FIRST_REG 3 -#define FFA_PART_INFO_GET_REGS_REGS_PER_DESC 3 -#define FFA_PART_INFO_GET_REGS_MAX_DESC \ - (((sizeof(ffa_value_t) / sizeof_field(ffa_value_t, a0)) - \ - FFA_PART_INFO_GET_REGS_FIRST_REG) / \ - FFA_PART_INFO_GET_REGS_REGS_PER_DESC) +#define FFA_PART_INFO_GET_REGS_MIN_REGS_PER_DESC 3 +#define FFA_PART_INFO_GET_REGS_NUM_REGS \ + (sizeof(ffa_value_t) / sizeof_field(ffa_value_t, a0))#define PART_INFO_ID (x) ((u16)(FIELD_GET(PART_INFO_ID_MASK, (x))))#define PART_INFO_EXEC_CXT (x) ((u16)(FIELD_GET(PART_INFO_EXEC_CXT_MASK, (x))))#define PART_INFO_PROPERTIES (x) ((u32)(FIELD_GET(PART_INFO_PROPS_MASK, (x))))
@@ -338,7 +336,7 @@ __ffa_partition_info_get_regs(u32 uuid0, u32 uuid1, u32 uuid2, u32 uuid3, do { __le64 *regs; - int idx, nr_desc, buf_idx; + int idx, nr_desc, buf_idx, regs_per_desc, max_desc; invoke_ffa_fn((ffa_value_t){ .a0 = FFA_PARTITION_INFO_GET_REGS,
@@ -361,8 +359,18 @@ __ffa_partition_info_get_regs(u32 uuid0, u32 uuid1, u32 uuid2, u32 uuid3,if (cur_idx < start_idx || cur_idx >= count)return -EINVAL ; + buf_sz =PARTITION_INFO_SZ (partition_info.a2); +if (buf_sz %sizeof (*regs)) +return -EINVAL ; + + regs_per_desc = buf_sz /sizeof (*regs); +if (regs_per_desc <FFA_PART_INFO_GET_REGS_MIN_REGS_PER_DESC ) +return -EINVAL ; + nr_desc = cur_idx - start_idx +1 ; -if (nr_desc >FFA_PART_INFO_GET_REGS_MAX_DESC ) + max_desc = (FFA_PART_INFO_GET_REGS_NUM_REGS - +FFA_PART_INFO_GET_REGS_FIRST_REG ) / regs_per_desc; +if (nr_desc > max_desc)return -EINVAL ; buf_idx = buf - buffer;
@@ -370,9 +378,6 @@ __ffa_partition_info_get_regs(u32 uuid0, u32 uuid1, u32 uuid2, u32 uuid3,return -EINVAL ; tag =UUID_INFO_TAG (partition_info.a2); - buf_sz =PARTITION_INFO_SZ (partition_info.a2); -if (buf_sz >sizeof (*buffer)) - buf_sz =sizeof (*buffer); regs = (void *)&partition_info.a3;for (idx =0 ; idx < nr_desc; idx++, buf++) {
@@ -391,7 +396,7 @@ __ffa_partition_info_get_regs(u32 uuid0, u32 uuid1, u32 uuid2, u32 uuid3, buf->exec_ctxt =PART_INFO_EXEC_CXT (val); buf->properties =PART_INFO_PROPERTIES (val);uuid_copy (&buf->uuid, &uuid_regs.uuid); - regs +=3 ; + regs += regs_per_desc; } start_idx = cur_idx +1 ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 166/1611 arm64: dts: imx8dxl-evk: Remove unnecessary PCIe EP properties
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sherry Sun <[email protected]>
[ Upstream commit 538525f34158deb21b782164bde23ec07a353e4a ]
For PCIe endpoint mode, only M.2 power supply needs to be ensured. On imx8dxl-evk, the M.2 power is always on and cannot be controlled, while reg_pcieb only controls the M.2 W_DISABLE1# signal. Remove the unnecessary vpcie-supply property from pcie0_ep node.
Also remove reset-gpio as PCIe endpoint mode doesn't require reset control.
--- arch/arm64/boot/dts/freescale/imx8dxl-evk.dts | 2 -- 1 file changed, 2 deletions(-)
arch/arm64/boot/dts/freescale/imx8dxl-evk.dts +0 -2
@@ -681,8 +681,6 @@ &pcie0_ep { phy-names = "pcie-phy"; pinctrl-0 = <&pinctrl_pcieb>; pinctrl-names = "default"; - reset-gpio = <&lsio_gpio4 0 GPIO_ACTIVE_LOW>; - vpcie-supply = <®_pcieb>; status = "disabled"; };
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 167/1611 arm64: dts: imx8qxp-mek: Remove unnecessary PCIe EP vpcie-supply
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sherry Sun <[email protected]>
[ Upstream commit b5ba136d535f1060322af31c0cf74d85ea19892d ]
For PCIe endpoint mode, only M.2 power supply needs to be ensured. On imx8qxp-mek, the M.2 power is always on and cannot be controlled, while reg_pcieb only controls the M.2 W_DISABLE1# signal. Remove the unnecessary vpcie-supply property from pcie0_ep node.
--- arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 1 - 1 file changed, 1 deletion(-)
arch/arm64/boot/dts/freescale/imx8qxp-mek.dts +0 -1
@@ -647,7 +647,6 @@ &pcie0_ep { phy-names = "pcie-phy"; pinctrl-0 = <&pinctrl_pcieb>; pinctrl-names = "default"; - vpcie-supply = <®_pcieb>; status = "disabled"; };
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 168/1611 arm64: dts: imx95-19x19-evk: Fix PCIe EP vpcie-supply
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sherry Sun <[email protected]>
[ Upstream commit 596d0f9f4fefffbf783ab26cfa90cf50f5dd6bb0 ]
The vpcie-supply property should reference the regulator that controls the actual M.2 power supply, not the W_DISABLE1# signal.
On imx95-19x19-evk:
- reg_pcie0 controls M.2 W_DISABLE1# signal
- reg_m2_pwr controls the actual M.2 power supply
Fix the vpcie-supply to use reg_m2_pwr for proper power control in PCIe endpoint mode.
--- arch/arm64/boot/dts/freescale/imx95-19x19-evk.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/freescale/imx95-19x19-evk.dts +1 -1
@@ -548,7 +548,7 @@ &pcie0 { &pcie0_ep { pinctrl-0 = <&pinctrl_pcie0>; pinctrl-names = "default"; - vpcie-supply = <®_pcie0>; + vpcie-supply = <®_m2_pwr>; status = "disabled"; };
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 169/1611 media: atomisp: Fix memory leak in atomisp_fixed_pattern_table()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zilin Guan <[email protected]>
[ Upstream commit 4e8156bd9517fa18c3613ea39c222c7035f0221e ]
atomisp_v4l2_framebuffer_to_css_frame() allocates memory for temporary variable raw_black_frame, which must be released via ia_css_frame_free() before the function returns. However, if sh_css_set_black_frame() fails, the function returns immediately without performing this cleanup, leading to a memory leak.
Fix this by assigning the return value of sh_css_set_black_frame() to ret. This ensures that the error code is propagated while allowing the execution to fall through to the ia_css_frame_free() cleanup call.
The bug was originally detected on v6.13-rc1 using an experimental static analysis tool we are developing, and we have verified that the issue persists in the latest mainline kernel. The tool is based on the LLVM framework and is specifically designed to detect memory management issues. It is currently under active development and not yet publicly available.
We performed build testing on x86_64 with allyesconfig. Since triggering this error path in atomisp requires specific Intel Atom ISP hardware and firmware, we were unable to perform runtime testing and instead verified the fix according to the code logic.
--- drivers/staging/media/atomisp/pci/atomisp_cmd.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/staging/media/atomisp/pci/atomisp_cmd.c +2 -4
@@ -3367,10 +3367,8 @@ int atomisp_fixed_pattern_table(struct atomisp_sub_device *asd,if (ret)return ret; -if (sh_css_set_black_frame (asd->stream_env[ATOMISP_INPUT_STREAM_GENERAL ].stream, - raw_black_frame) !=0 ) -return -ENOMEM ; - + ret =sh_css_set_black_frame (asd->stream_env[ATOMISP_INPUT_STREAM_GENERAL ].stream, + raw_black_frame);ia_css_frame_free (raw_black_frame);return ret; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 170/1611 media: atomisp: gc2235: fix UAF and memory leak
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yuho Choi <[email protected]>
[ Upstream commit 628f763aee0047ff44974388d6f70f75a763026b ]
gc2235_probe() handles its error paths incorrectly.
If media_entity_pads_init() fails, gc2235_remove() is called, which tears down the subdev and frees dev, but then still falls through to atomisp_register_i2c_module(). This results in use-after-free.
If atomisp_register_i2c_module() fails, the media entity and control handler are left initialized and dev is leaked.
gc2235_remove() unconditionally calls media_entity_cleanup() and v4l2_ctrl_handler_free(), but these are not initialized at every error path in gc2235_probe().
Replace gc2235_remove() calls in the probe error paths with explicit unwind labels that free only the resources initialized at each point of failure, in reverse order of initialization.
--- .../media/atomisp/i2c/atomisp-gc2235.c | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-)
drivers/staging/media/atomisp/i2c/atomisp-gc2235.c +18 -11
@@ -809,7 +809,7 @@ static int gc2235_probe(struct i2c_client *client) ret =gc2235_s_config (&dev->sd, client->irq, gcpdev);if (ret) - goto out_free; + goto err_unregister_subdev; dev->sd.flags |=V4L2_SUBDEV_FL_HAS_DEVNODE ; dev->pad.flags =MEDIA_PAD_FL_SOURCE ;
@@ -818,18 +818,16 @@ static int gc2235_probe(struct i2c_client *client) ret =v4l2_ctrl_handler_init (&dev->ctrl_handler,ARRAY_SIZE (gc2235_controls)); -if (ret) { -gc2235_remove (client); -return ret; - } +if (ret) + goto err_csi_cfg;for (i =0 ; i <ARRAY_SIZE (gc2235_controls); i++)v4l2_ctrl_new_custom (&dev->ctrl_handler, &gc2235_controls[i],NULL );if (dev->ctrl_handler.error) { -gc2235_remove (client); -return dev->ctrl_handler.error; + ret = dev->ctrl_handler.error; + goto err_ctrl_handler; }/* Use same lock for controls as for everything else. */
@@ -838,14 +836,23 @@ static int gc2235_probe(struct i2c_client *client) ret =media_entity_pads_init (&dev->sd.entity,1 , &dev->pad);if (ret) -gc2235_remove (client); + goto err_ctrl_handler; + + ret =atomisp_register_i2c_module (&dev->sd, gcpdev); +if (ret) + goto err_media_cleanup; -return atomisp_register_i2c_module (&dev->sd, gcpdev); +return 0 ; -out_free: +err_media_cleanup: +media_entity_cleanup (&dev->sd.entity); +err_ctrl_handler: +v4l2_ctrl_handler_free (&dev->ctrl_handler); +err_csi_cfg: + dev->platform_data->csi_cfg (&dev->sd,0 ); +err_unregister_subdev:v4l2_device_unregister_subdev (&dev->sd);kfree (dev); -return ret; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 171/1611 staging: media: atomisp: fix loop shadowing in ia_css_stream_destroy()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jose A. Perez de Azpillaga <[email protected]>
[ Upstream commit 9087395a383212ab1beaefcbe3b57ed131c7823d ]
The nested loop inside the IS_ISP2401 block incorrectly uses the same variable 'i' as the outer loop. This shadows the outer loop variable and causes premature termination or skipped array elements.
Change the inner loop to use a new variable 'j' to prevent this.
--- drivers/staging/media/atomisp/pci/sh_css.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/media/atomisp/pci/sh_css.c +4 -4
@@ -8198,7 +8198,7 @@ ia_css_stream_create(const struct ia_css_stream_config *stream_config,int ia_css_stream_destroy (struct ia_css_stream *stream) { -int i; +int i, j;int err =0 ;IA_CSS_ENTER_PRIVATE ("stream = %p" , stream);
@@ -8229,10 +8229,10 @@ ia_css_stream_destroy(struct ia_css_stream *stream) sp_pipeline_input_terminal = &sh_css_sp_group.pipe_io[sp_thread_id].input; -for (i =0 ; i <IA_CSS_STREAM_MAX_ISYS_STREAM_PER_CH ; i++) { +for (j =0 ; j <IA_CSS_STREAM_MAX_ISYS_STREAM_PER_CH ; j++) {ia_css_isys_stream_h isys_stream = - &sp_pipeline_input_terminal->context.virtual_input_system_stream[i]; -if (stream->config.isys_config[i].valid && isys_stream->valid) + &sp_pipeline_input_terminal->context.virtual_input_system_stream[j]; +if (stream->config.isys_config[j].valid && isys_stream->valid)ia_css_isys_stream_destroy (isys_stream); } }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 172/1611 riscv: dts: spacemit: set console baud rate on Milk-V Jupiter
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aurelien Jarno <[email protected]>
[ Upstream commit 4f97acb4f744f516bbe976da8282c0fe213216ff ]
Because the default console's baud rate is not set, defconfig kernels do not have any serial output on this platform. Set the baud rate to 115200, matching what is used by U-Boot etc on this platform.
See-also: 24c12ca43b12c ("dts: spacemit: set console baud rate on bpif3")
--- arch/riscv/boot/dts/spacemit/k1-milkv-jupiter.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/riscv/boot/dts/spacemit/k1-milkv-jupiter.dts +1 -1
@@ -18,7 +18,7 @@ aliases { }; chosen { - stdout-path = "serial0"; + stdout-path = "serial0:115200n8"; }; };
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 173/1611 firmware: smccc: Fix Arm SMCCC SOC_ID name call
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andre Przywara <[email protected]>
[ Upstream commit 70492cfce2a4d41e87bf46989028a90f4bc6b38f ]
Commit 5f9c23abc477 ("firmware: smccc: Support optional Arm SMCCC SOC_ID name") introduced the SOC_ID name string call, which reports a human readable string describing the SoC, as returned by firmware.
The SMCCC spec v1.6 describes this feature as AArch64 only, since we rely on 8 characters to be transmitted per register. Consequently the SMCCC call must use the AArch64 calling convention, which requires bit 30 of the FID to be set. The spec is a bit confusing here, since it mentions that in the parameter description ("2: SoC name (optionally implemented for SMC64 calls, ..."), but still prints the FID explicitly as 0x80000002.
But as this FID is using the SMC32 calling convention (correct for the other two calls), it will not match what any SMCCC conformant firmware is expecting, so any call would return NOT_SUPPORTED.
Add a 64-bit version of the ARCH_SOC_ID FID macro, and use that for the SoC name version of the call to fix the issue.
--- drivers/firmware/smccc/soc_id.c | 2 +- include/linux/arm-smccc.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-)
drivers/firmware/smccc/soc_id.c +1 -1
@@ -60,7 +60,7 @@ static char __init *smccc_soc_name_init(void)* to the ARM_SMCCC_ARCH_SOC_ID function. Fetch it if * available. */ - args.a0 =ARM_SMCCC_ARCH_SOC_ID ; + args.a0 =ARM_SMCCC_ARCH_SOC_ID64 ; args.a1 =2 ;/* SOC_ID name */ arm_smccc_1_2_invoke (&args, &res);
include/linux/arm-smccc.h +5 -0
@@ -90,6 +90,11 @@ ARM_SMCCC_SMC_32, \ 0, 2) +#define ARM_SMCCC_ARCH_SOC_ID64 \ + ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \ + ARM_SMCCC_SMC_64, \ + 0, 2) +#define ARM_SMCCC_ARCH_WORKAROUND_1 \ ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \ ARM_SMCCC_SMC_32, \
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 174/1611 firmware: arm_scmi: Read sensor config as 32-bit value
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sudeep Holla <[email protected]>
[ Upstream commit f6fe7c3c007df18afd289ff2d98c692fae9ab085 ]
The SENSOR_CONFIG_GET response contains a 32-bit sensor_config field, and the xfer is initialized with a 4-byte RX buffer. Reading it with get_unaligned_le64() can consume bytes past the returned payload.
Use get_unaligned_le32() to match the protocol layout and the allocated response size.
--- drivers/firmware/arm_scmi/sensors.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/firmware/arm_scmi/sensors.c +1 -1
@@ -795,7 +795,7 @@ static int scmi_sensor_config_get(const struct scmi_protocol_handle *ph,if (!ret) {struct scmi_sensor_info *s = si->sensors + sensor_id; - *sensor_config =get_unaligned_le64 (t->rx.buf); + *sensor_config =get_unaligned_le32 (t->rx.buf); s->sensor_config = *sensor_config; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 175/1611 sysfs: clamp show() return value in sysfs_kf_read()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
[ Upstream commit 454257f6d124a92342dcbb7710c03dd6ef96c731 ]
sysfs_kf_seq_show() defends against buggy show() callbacks that return larger than PAGE_SIZE by clamping the value and printing a warning. sysfs_kf_read(), the prealloc variant, has no such defense.
The only current in-tree user of __ATTR_PREALLOC is drivers/md/md.c, whose show() callbacks are well-behaved, so this is hardening against future drivers doing foolish things and out-of-tree code doing even more foolish things.
--- fs/sysfs/file.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/sysfs/file.c +4 -0
@@ -120,6 +120,10 @@ static ssize_t sysfs_kf_read(struct kernfs_open_file *of, char *buf, len = ops->show (kobj, of->kn->priv, buf);if (len <0 )return len; +if (len >= (ssize_t )PAGE_SIZE ) { +printk ("fill_read_buffer: %pS returned bad count\n" , ops->show); + len =PAGE_SIZE -1 ; + }if (pos) {if (len <= pos)return 0 ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 176/1611 bitops: use common function parameter names
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Randy Dunlap <[email protected]>
[ Upstream commit 8a51b2e874f47a6094353b59ecae421f0968fe3a ]
Fix the function prototypes to use the common parameter name 'addr' instead of 'p' (common to arch-specific implementations of these functions).
This avoids the kernel-doc warnings:
Warning: include/asm-generic/bitops/lock.h:19 function parameter 'p'
not described in 'arch_test_and_set_bit_lock'
Warning: include/asm-generic/bitops/lock.h:41 function parameter 'p'
not described in 'arch_clear_bit_unlock'
Warning: include/asm-generic/bitops/lock.h:59 function parameter 'p'
not described in 'arch___clear_bit_unlock'
--- include/asm-generic/bitops/lock.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
include/asm-generic/bitops/lock.h +11 -11
@@ -16,16 +16,16 @@* It can be used to implement bit locks. */ static __always_inline int -arch_test_and_set_bit_lock (unsigned int nr,volatile unsigned long *p) +arch_test_and_set_bit_lock (unsigned int nr,volatile unsigned long *addr) {long old;unsigned long mask =BIT_MASK (nr); - p +=BIT_WORD (nr); -if (READ_ONCE (*p) & mask) + addr +=BIT_WORD (nr); +if (READ_ONCE (*addr) & mask)return 1 ; - old =raw_atomic_long_fetch_or_acquire (mask, (atomic_long_t *)p); + old =raw_atomic_long_fetch_or_acquire (mask, (atomic_long_t *)addr);return !!(old & mask); }
@@ -38,10 +38,10 @@ arch_test_and_set_bit_lock(unsigned int nr, volatile unsigned long *p)* This operation is atomic and provides release barrier semantics. */ static __always_inline void -arch_clear_bit_unlock (unsigned int nr,volatile unsigned long *p) +arch_clear_bit_unlock (unsigned int nr,volatile unsigned long *addr) { - p +=BIT_WORD (nr); -raw_atomic_long_fetch_andnot_release (BIT_MASK (nr), (atomic_long_t *)p); + addr +=BIT_WORD (nr); +raw_atomic_long_fetch_andnot_release (BIT_MASK (nr), (atomic_long_t *)addr); }/**
@@ -56,14 +56,14 @@ arch_clear_bit_unlock(unsigned int nr, volatile unsigned long *p)* See for example x86's implementation. */ static inline void -arch___clear_bit_unlock (unsigned int nr,volatile unsigned long *p) +arch___clear_bit_unlock (unsigned int nr,volatile unsigned long *addr) {unsigned long old; - p +=BIT_WORD (nr); - old =READ_ONCE (*p); + addr +=BIT_WORD (nr); + old =READ_ONCE (*addr); old &= ~BIT_MASK (nr); -raw_atomic_long_set_release ((atomic_long_t *)p, old); +raw_atomic_long_set_release ((atomic_long_t *)addr, old); }#ifndef arch_xor_unlock_is_negative_byte
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 177/1611 regulator: dt-bindings: mt6359: Drop regulator-name pattern restrictions
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chen-Yu Tsai <[email protected]>
[ Upstream commit cdc517688ffa2c30a64a20b558a9ecbf046c70f1 ]
The name of the regulator should match what the board design specifies for the power rail. There should be no limitations on what the name can be, and they definitely don't always follow the PMIC's own names.
Drop the restrictions on regulator-name.
--- .../bindings/regulator/mt6359-regulator.yaml | 43 ------------------- 1 file changed, 43 deletions(-)
Documentation/devicetree/bindings/regulator/mt6359-regulator.yaml +0 -43
@@ -18,84 +18,41 @@ patternProperties: "^buck_v(s1|gpu11|modem|pu|core|s2|pa|proc2|proc1|core_sshub)$": type: object $ref: regulator.yaml# - - properties: - regulator-name: - pattern: "^v(s1|gpu11|modem|pu|core|s2|pa|proc2|proc1|core_sshub)$" - unevaluatedProperties: false "^ldo_v(ibr|rf12|usb|camio|efuse|xo22)$": type: object $ref: regulator.yaml# - - properties: - regulator-name: - pattern: "^v(ibr|rf12|usb|camio|efuse|xo22)$" - unevaluatedProperties: false "^ldo_v(rfck|emc|a12|a09|ufs|bbck)$": type: object $ref: regulator.yaml# - - properties: - regulator-name: - pattern: "^v(rfck|emc|a12|a09|ufs|bbck)$" - unevaluatedProperties: false "^ldo_vcn(18|13|33_1_bt|13_1_wifi|33_2_bt|33_2_wifi)$": type: object $ref: regulator.yaml# - - properties: - regulator-name: - pattern: "^vcn(18|13|33_1_bt|13_1_wifi|33_2_bt|33_2_wifi)$" - unevaluatedProperties: false "^ldo_vsram_(proc2|others|md|proc1|others_sshub)$": type: object $ref: regulator.yaml# - - properties: - regulator-name: - pattern: "^vsram_(proc2|others|md|proc1|others_sshub)$" - unevaluatedProperties: false "^ldo_v(fe|bif|io)28$": type: object $ref: regulator.yaml# - - properties: - regulator-name: - pattern: "^v(fe|bif|io)28$" - unevaluatedProperties: false "^ldo_v(aud|io|aux|rf|m)18$": type: object $ref: regulator.yaml# - - properties: - regulator-name: - pattern: "^v(aud|io|aux|rf|m)18$" - unevaluatedProperties: false "^ldo_vsim[12]$": type: object $ref: regulator.yaml# - - properties: - regulator-name: - pattern: "^vsim[12]$" - - required: - - regulator-name - unevaluatedProperties: false additionalProperties: false
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 178/1611 tools/nolibc: getopt: Fix potential out of bounds access
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Palmer <[email protected]>
[ Upstream commit 136ca91411b0b637e862eb7b1cce2a56853edd17 ]
Running clang-tidy on a program that uses getopt() from nolibc this warning appears:
getopt.h:80:6: warning: Out of bound access to memory after the end of the string literal [clang-analyzer-security.ArrayBound]
80 | if (optstring[i] == ':') {
This looks like a very unlikely case that an argument inside of argv is being changed between getopt() calls.
Adding a check for d becoming 0 in the guard after the loop stops getopt() getting far enough to access beyond the end of the array and seems to correct the issue.
--- tools/include/nolibc/getopt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/include/nolibc/getopt.h +1 -1
@@ -71,7 +71,7 @@ int getopt(int argc, char * const argv[], const char *optstring) d = optstring[i++]; }while (d && d != c); -if (d != c || c ==':' ) { +if (!d || d != c || c ==':' ) { optopt = c;if (optstring[0 ] !=':' && opterr)fprintf (stderr,"%s: unrecognized option: %c\n" , argv[0 ], *optchar);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 179/1611 nilfs2: Fix return in nilfs_mkdir
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hongling Zeng <[email protected]>
[ Upstream commit e5925f33e4fa9ee313d481557607adce8e30ed2e ]
Return NULL instead of passing zero to ERR_PTR.
Fixes smatch warning:
- fs/nilfs2/namei.c:261 nilfs_mkdir() warn: passing zero to 'ERR_PTR'
--- fs/nilfs2/namei.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nilfs2/namei.c +1 -1
@@ -258,7 +258,7 @@ static struct dentry *nilfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,else nilfs_transaction_abort (dir->i_sb); -return ERR_PTR (err); +return err ?ERR_PTR (err) :NULL ; out_fail:drop_nlink (inode);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 180/1611 net/sched: sch_drr: annotate data-races around cl->deficit
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit c67b104fd7982162885c5e43057ca761006748e2 ]
drr_dump_class_stats() runs without qdisc spinlock held.
Add missing READ_ONCE()/WRITE_ONCE() annotations around cl->deficit.
--- net/sched/sch_drr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/sched/sch_drr.c +4 -4
@@ -270,7 +270,7 @@ static int drr_dump_class_stats(struct Qdisc *sch, unsigned long arg,memset (&xstats,0 ,sizeof (xstats));if (qlen) - xstats.deficit = cl->deficit; + xstats.deficit =READ_ONCE (cl->deficit); if (gnet_stats_copy_basic(d, NULL, &cl->bstats, true) < 0 || gnet_stats_copy_rate_est(d, &cl->rate_est) < 0 ||
@@ -362,7 +362,7 @@ static int drr_enqueue(struct sk_buff *skb, struct Qdisc *sch,if (!cl_is_active (cl)) {list_add_tail (&cl->alist, &q->active); - cl->deficit = cl->quantum; +WRITE_ONCE (cl->deficit, cl->quantum); } sch->qstats.backlog += len;
@@ -389,7 +389,7 @@ static struct sk_buff *drr_dequeue(struct Qdisc *sch) len =qdisc_pkt_len (skb);if (len <= cl->deficit) { - cl->deficit -= len; +WRITE_ONCE (cl->deficit, cl->deficit - len); skb =qdisc_dequeue_peeked (cl->qdisc);if (unlikely (skb ==NULL )) goto out;
@@ -403,7 +403,7 @@ static struct sk_buff *drr_dequeue(struct Qdisc *sch)return skb; } - cl->deficit += cl->quantum; +WRITE_ONCE (cl->deficit, cl->deficit + cl->quantum);list_move_tail (&cl->alist, &q->active); } out:
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 181/1611 media: rockchip: rga: fix too small buffer size
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sven Püschel <[email protected]>
[ Upstream commit 65017e26c065d1240b0512c15867ef1128034fd8 ]
Fix the command buffer size being only a quarter of the actual size. The RGA_CMDBUF_SIZE macro was potentially intended to specify the length of the cmdbuf u32 array pointer. But as it's used to specify the size of the allocation, which is counted in bytes. Therefore adjust the macro size to bytes as it better matches the variable name and adjust it's users accordingly.
As the command buffer is relatively small, it probably didn't caused an issue due to being smaller than a single page.
--- drivers/media/platform/rockchip/rga/rga-hw.c | 2 +- drivers/media/platform/rockchip/rga/rga-hw.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/media/platform/rockchip/rga/rga-hw.c +1 -1
@@ -414,7 +414,7 @@ static void rga_cmd_set(struct rga_ctx *ctx, {struct rockchip_rga *rga = ctx->rga; -memset (rga->cmdbuf_virt,0 ,RGA_CMDBUF_SIZE *4 ); +memset (rga->cmdbuf_virt,0 ,RGA_CMDBUF_SIZE );rga_cmd_set_src_addr (ctx, src->dma_desc_pa);/*
drivers/media/platform/rockchip/rga/rga-hw.h +1 -1
@@ -6,7 +6,7 @@#ifndef __RGA_HW_H__#define __RGA_HW_H__ -#define RGA_CMDBUF_SIZE 0x20 +#define RGA_CMDBUF_SIZE 0x80/* Hardware limits */ #define MAX_WIDTH 8192
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 182/1611 firmware: arm_scmi: Fix OOB in scmi_power_name_get()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geert Uytterhoeven <[email protected]>
[ Upstream commit f9ef3f66f4b18078e464b7606f9497e4dbeb9905 ]
scmi_power_name_get() does not validate the domain number passed by the external caller, which may lead to an out-of-bounds access.
Fix this by returning "unknown" for invalid domains, like scmi_reset_name_get() does.
--- drivers/firmware/arm_scmi/power.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/firmware/arm_scmi/power.c +5 -1
@@ -205,8 +205,12 @@ scmi_power_name_get(const struct scmi_protocol_handle *ph, u32 domain) {struct scmi_power_info *pi = ph->get_priv (ph); -struct power_dom_info *dom = pi->dom_info + domain; +struct power_dom_info *dom; + +if (domain >= pi->num_domains) +return "unknown" ; + dom = pi->dom_info + domain;return dom->name; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 183/1611 arm64: dts: qcom: lemans: Add power-domain and iface clk for ice node
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Harshal Dev <[email protected]>
[ Upstream commit 04566e287b35fde9fd129db5fdf6a96e336af55c ]
Qualcomm in-line crypto engine (ICE) platform driver specifies and votes for its own resources. Before accessing ICE hardware during probe, to avoid potential unclocked register access issues (when clk_ignore_unused is not passed on the kernel command line), in addition to the 'core' clock the 'iface' clock should also be turned on by the driver. This can only be done if the UFS_PHY_GDSC power domain is enabled. Specify both the UFS_PHY_GDSC power domain and the 'iface' clock in the ICE node for lemans.
--- arch/arm64/boot/dts/qcom/lemans.dtsi | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/lemans.dtsi +5 -1
@@ -2753,7 +2753,11 @@ ice: crypto@1d88000 { compatible = "qcom,sa8775p-inline-crypto-engine", "qcom,inline-crypto-engine"; reg = <0x0 0x01d88000 0x0 0x18000>; - clocks = <&gcc GCC_UFS_PHY_ICE_CORE_CLK>; + clocks = <&gcc GCC_UFS_PHY_ICE_CORE_CLK>, + <&gcc GCC_UFS_PHY_AHB_CLK>; + clock-names = "core", + "iface"; + power-domains = <&gcc UFS_PHY_GDSC>; }; cryptobam: dma-controller@1dc4000 {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 184/1611 arm64: dts: qcom: monaco: Add power-domain and iface clk for ice node
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Harshal Dev <[email protected]>
[ Upstream commit 68d5d9701a7ab1b1f9c76feaa3a24ca716f03f0b ]
Qualcomm in-line crypto engine (ICE) platform driver specifies and votes for its own resources. Before accessing ICE hardware during probe, to avoid potential unclocked register access issues (when clk_ignore_unused is not passed on the kernel command line), in addition to the 'core' clock the 'iface' clock should also be turned on by the driver. This can only be done if the GCC_UFS_PHY_GDSC power domain is enabled. Specify both the GCC_UFS_PHY_GDSC power domain and the 'iface' clock in the ICE node for monaco.
--- arch/arm64/boot/dts/qcom/qcs8300.dtsi | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/qcs8300.dtsi +5 -1
@@ -2351,7 +2351,11 @@ ice: crypto@1d88000 { compatible = "qcom,qcs8300-inline-crypto-engine", "qcom,inline-crypto-engine"; reg = <0x0 0x01d88000 0x0 0x18000>; - clocks = <&gcc GCC_UFS_PHY_ICE_CORE_CLK>; + clocks = <&gcc GCC_UFS_PHY_ICE_CORE_CLK>, + <&gcc GCC_UFS_PHY_AHB_CLK>; + clock-names = "core", + "iface"; + power-domains = <&gcc GCC_UFS_PHY_GDSC>; }; tcsr_mutex: hwlock@1f40000 {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 185/1611 arm64: dts: qcom: sc7180: Add power-domain and iface clk for ice node
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Harshal Dev <[email protected]>
[ Upstream commit 7cd7271ac525e4eadd22734f418219f247638f43 ]
Qualcomm in-line crypto engine (ICE) platform driver specifies and votes for its own resources. Before accessing ICE hardware during probe, to avoid potential unclocked register access issues (when clk_ignore_unused is not passed on the kernel command line), in addition to the 'core' clock the 'iface' clock should also be turned on by the driver. This can only be done if the UFS_PHY_GDSC power domain is enabled. Specify both the UFS_PHY_GDSC power domain and the 'iface' clock in the ICE node for sc7180.
--- arch/arm64/boot/dts/qcom/sc7180.dtsi | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sc7180.dtsi +5 -1
@@ -1599,7 +1599,11 @@ ice: crypto@1d90000 { compatible = "qcom,sc7180-inline-crypto-engine", "qcom,inline-crypto-engine"; reg = <0 0x01d90000 0 0x8000>; - clocks = <&gcc GCC_UFS_PHY_ICE_CORE_CLK>; + clocks = <&gcc GCC_UFS_PHY_ICE_CORE_CLK>, + <&gcc GCC_UFS_PHY_AHB_CLK>; + clock-names = "core", + "iface"; + power-domains = <&gcc UFS_PHY_GDSC>; }; ipa: ipa@1e40000 {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 186/1611 arm64: dts: qcom: kodiak: Add power-domain and iface clk for ice node
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Harshal Dev <[email protected]>
[ Upstream commit cca53c338ad87edc4b46d2d82730fd8ca01a164f ]
Qualcomm in-line crypto engine (ICE) platform driver specifies and votes for its own resources. Before accessing ICE hardware during probe, to avoid potential unclocked register access issues (when clk_ignore_unused is not passed on the kernel command line), in addition to the 'core' clock the 'iface' clock should also be turned on by the driver. This can only be done if the GCC_UFS_PHY_GDSC power domain is enabled. Specify both the GCC_UFS_PHY_GDSC power domain and the 'iface' clock in the ICE node for kodiak.
--- arch/arm64/boot/dts/qcom/sc7280.dtsi | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sc7280.dtsi +5 -1
@@ -2574,7 +2574,11 @@ ice: crypto@1d88000 { compatible = "qcom,sc7280-inline-crypto-engine", "qcom,inline-crypto-engine"; reg = <0 0x01d88000 0 0x18000>; - clocks = <&gcc GCC_UFS_PHY_ICE_CORE_CLK>; + clocks = <&gcc GCC_UFS_PHY_ICE_CORE_CLK>, + <&gcc GCC_UFS_PHY_AHB_CLK>; + clock-names = "core", + "iface"; + power-domains = <&gcc GCC_UFS_PHY_GDSC>; }; cryptobam: dma-controller@1dc4000 {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 187/1611 arm64: dts: qcom: sm8450: Add power-domain and iface clk for ice node
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Harshal Dev <[email protected]>
[ Upstream commit 3a5cb1ccbfb3141862b28f24cd5050083233aae7 ]
Qualcomm in-line crypto engine (ICE) platform driver specifies and votes for its own resources. Before accessing ICE hardware during probe, to avoid potential unclocked register access issues (when clk_ignore_unused is not passed on the kernel command line), in addition to the 'core' clock the 'iface' clock should also be turned on by the driver. This can only be done if the UFS_PHY_GDSC power domain is enabled. Specify both the UFS_PHY_GDSC power domain and the 'iface' clock in the ICE node for sm8450.
--- arch/arm64/boot/dts/qcom/sm8450.dtsi | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sm8450.dtsi +5 -1
@@ -5349,7 +5349,11 @@ ice: crypto@1d88000 { compatible = "qcom,sm8450-inline-crypto-engine", "qcom,inline-crypto-engine"; reg = <0 0x01d88000 0 0x18000>; - clocks = <&gcc GCC_UFS_PHY_ICE_CORE_CLK>; + clocks = <&gcc GCC_UFS_PHY_ICE_CORE_CLK>, + <&gcc GCC_UFS_PHY_AHB_CLK>; + clock-names = "core", + "iface"; + power-domains = <&gcc UFS_PHY_GDSC>; }; cryptobam: dma-controller@1dc4000 {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 188/1611 arm64: dts: qcom: sm8550: Add power-domain and iface clk for ice node
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Harshal Dev <[email protected]>
[ Upstream commit 52696dbbe7bbe0c8fc8c17133ffb5133b8cf37a6 ]
Qualcomm in-line crypto engine (ICE) platform driver specifies and votes for its own resources. Before accessing ICE hardware during probe, to avoid potential unclocked register access issues (when clk_ignore_unused is not passed on the kernel command line), in addition to the 'core' clock the 'iface' clock should also be turned on by the driver. This can only be done if the UFS_PHY_GDSC power domain is enabled. Specify both the UFS_PHY_GDSC power domain and the 'iface' clock in the ICE node for sm8550.
--- arch/arm64/boot/dts/qcom/sm8550.dtsi | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sm8550.dtsi +5 -1
@@ -2414,7 +2414,11 @@ ice: crypto@1d88000 { "qcom,inline-crypto-engine"; reg = <0 0x01d88000 0 0x18000>; - clocks = <&gcc GCC_UFS_PHY_ICE_CORE_CLK>; + clocks = <&gcc GCC_UFS_PHY_ICE_CORE_CLK>, + <&gcc GCC_UFS_PHY_AHB_CLK>; + clock-names = "core", + "iface"; + power-domains = <&gcc UFS_PHY_GDSC>; }; tcsr_mutex: hwlock@1f40000 {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 189/1611 arm64: dts: qcom: sm8650: Add power-domain and iface clk for ice node
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Harshal Dev <[email protected]>
[ Upstream commit c62b084d5d1564f808408a2f7d4c514e57cd4106 ]
Qualcomm in-line crypto engine (ICE) platform driver specifies and votes for its own resources. Before accessing ICE hardware during probe, to avoid potential unclocked register access issues (when clk_ignore_unused is not passed on the kernel command line), in addition to the 'core' clock the 'iface' clock should also be turned on by the driver. This can only be done if the UFS_PHY_GDSC power domain is enabled. Specify both the UFS_PHY_GDSC power domain and the 'iface' clock in the ICE node for sm8650.
--- arch/arm64/boot/dts/qcom/sm8650.dtsi | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sm8650.dtsi +5 -1
@@ -4046,7 +4046,11 @@ ice: crypto@1d88000 { "qcom,inline-crypto-engine"; reg = <0 0x01d88000 0 0x18000>; - clocks = <&gcc GCC_UFS_PHY_ICE_CORE_CLK>; + clocks = <&gcc GCC_UFS_PHY_ICE_CORE_CLK>, + <&gcc GCC_UFS_PHY_AHB_CLK>; + clock-names = "core", + "iface"; + power-domains = <&gcc UFS_PHY_GDSC>; }; cryptobam: dma-controller@1dc4000 {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 190/1611 arm64: dts: qcom: sm8750: Add power-domain and iface clk for ice node
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Harshal Dev <[email protected]>
[ Upstream commit 081ac792f0ea6d27a4b130c70cfd7544efee8137 ]
Qualcomm in-line crypto engine (ICE) platform driver specifies and votes for its own resources. Before accessing ICE hardware during probe, to avoid potential unclocked register access issues (when clk_ignore_unused is not passed on the kernel command line), in addition to the 'core' clock the 'iface' clock should also be turned on by the driver. This can only be done if the GCC_UFS_PHY_GDSC power domain is enabled. Specify both the GCC_UFS_PHY_GDSC power domain and the 'iface' clock in the ICE node for sm8750.
--- arch/arm64/boot/dts/qcom/sm8750.dtsi | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sm8750.dtsi +5 -1
@@ -2057,7 +2057,11 @@ ice: crypto@1d88000 { "qcom,inline-crypto-engine"; reg = <0x0 0x01d88000 0x0 0x18000>; - clocks = <&gcc GCC_UFS_PHY_ICE_CORE_CLK>; + clocks = <&gcc GCC_UFS_PHY_ICE_CORE_CLK>, + <&gcc GCC_UFS_PHY_AHB_CLK>; + clock-names = "core", + "iface"; + power-domains = <&gcc GCC_UFS_PHY_GDSC>; }; cryptobam: dma-controller@1dc4000 {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 191/1611 tracing: Bound synthetic-field strings with seq_buf
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pengpeng Hou <[email protected]>
[ Upstream commit f07883450eb14d1cf020b55d9f3a7ec5683bcd26 ]
The synthetic field helpers build a prefixed synthetic variable name and a generated hist command in fixed MAX_FILTER_STR_VAL buffers. The current code appends those strings with raw strcat(), so long key lists, field names, or saved filters can run past the end of the staging buffers.
Build both strings with seq_buf and propagate -E2BIG if either the synthetic variable name or the generated command exceeds MAX_FILTER_STR_VAL. This keeps the existing tracing-side limit while using the helper intended for bounded command construction.
--- kernel/trace/trace_events_hist.c | 41 ++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 12 deletions(-)
kernel/trace/trace_events_hist.c +29 -12
@@ -8,6 +8,7 @@#include <linux/module.h> #include <linux/kallsyms.h> #include <linux/security.h> +#include <linux/seq_buf.h> #include <linux/mutex.h> #include <linux/slab.h> #include <linux/stacktrace.h>
@@ -2957,13 +2958,22 @@ find_synthetic_field_var(struct hist_trigger_data *target_hist_data, {struct hist_field *event_var;char *synthetic_name; +struct seq_buf s; synthetic_name =kzalloc (MAX_FILTER_STR_VAL ,GFP_KERNEL );if (!synthetic_name)return ERR_PTR (-ENOMEM ); -strcpy (synthetic_name,"synthetic_" ); -strcat (synthetic_name, field_name); +seq_buf_init (&s, synthetic_name,MAX_FILTER_STR_VAL ); +seq_buf_printf (&s,"synthetic_%s" , field_name); + +/* Terminate synthetic_name with a NUL. */ +seq_buf_str (&s); + +if (seq_buf_has_overflowed (&s)) { +kfree (synthetic_name); +return ERR_PTR (-E2BIG ); + } event_var =find_event_var (target_hist_data, system, event_name, synthetic_name);
@@ -3009,6 +3019,7 @@ create_field_var_hist(struct hist_trigger_data *target_hist_data,struct hist_field *key_field;struct hist_field *event_var;char *saved_filter; +struct seq_buf s;char *cmd;int ret;
@@ -3053,28 +3064,34 @@ create_field_var_hist(struct hist_trigger_data *target_hist_data,return ERR_PTR (-ENOMEM ); } +seq_buf_init (&s, cmd,MAX_FILTER_STR_VAL ); +/* Use the same keys as the compatible histogram */ -strcat (cmd,"keys=" ); +seq_buf_puts (&s,"keys=" );for_each_hist_key_field (i, hist_data) { key_field = hist_data->fields[i];if (!first) -strcat (cmd,"," ); -strcat (cmd, key_field->field->name); +seq_buf_putc (&s,',' ); +seq_buf_puts (&s, key_field->field->name); first = false; }/* Create the synthetic field variable specification */ -strcat (cmd,":synthetic_" ); -strcat (cmd, field_name); -strcat (cmd,"=" ); -strcat (cmd, field_name); +seq_buf_printf (&s,":synthetic_%s=%s" , field_name, field_name);/* Use the same filter as the compatible histogram */ saved_filter =find_trigger_filter (hist_data, file); -if (saved_filter) { -strcat (cmd," if " ); -strcat (cmd, saved_filter); +if (saved_filter) +seq_buf_printf (&s," if %s" , saved_filter); + +/* Terminate cmd with a NUL. */ +seq_buf_str (&s); + +if (seq_buf_has_overflowed (&s)) { +kfree (cmd); +kfree (var_hist); +return ERR_PTR (-E2BIG ); } var_hist->cmd =kstrdup (cmd,GFP_KERNEL );
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 192/1611 arm64: dts: qcom: lemans: Add eDP ref clock for eDP PHYs
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ritesh Kumar <[email protected]>
[ Upstream commit 4bd073e00fd79c0aead74ad64ade48c904221245 ]
The eDP PHY nodes on lemans were missing the reference clock voting. This initially went unnoticed because the clock was implicitly enabled by the UFS PHY driver, and the eDP PHY happened to rely on that.
After commit 77d2fa54a945 ("scsi: ufs: qcom : Refactor phy_power_on/off calls"), the UFS driver no longer keeps the reference clock enabled. As a result, the eDP PHY fails to power on.
To fix this, add eDP reference clock for eDP PHYs on lemans chipset ensuring reference clock is enabled.
--- arch/arm64/boot/dts/qcom/lemans.dtsi | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/qcom/lemans.dtsi +8 -4
@@ -5039,9 +5039,11 @@ mdss0_dp0_phy: phy@aec2a00 { <0x0 0x0aec2000 0x0 0x1c8>; clocks = <&dispcc0 MDSS_DISP_CC_MDSS_DPTX0_AUX_CLK>, - <&dispcc0 MDSS_DISP_CC_MDSS_AHB_CLK>; + <&dispcc0 MDSS_DISP_CC_MDSS_AHB_CLK>, + <&gcc GCC_EDP_REF_CLKREF_EN>; clock-names = "aux", - "cfg_ahb"; + "cfg_ahb", + "ref"; #clock-cells = <1>; #phy-cells = <0>;
@@ -5058,9 +5060,11 @@ mdss0_dp1_phy: phy@aec5a00 { <0x0 0x0aec5000 0x0 0x1c8>; clocks = <&dispcc0 MDSS_DISP_CC_MDSS_DPTX1_AUX_CLK>, - <&dispcc0 MDSS_DISP_CC_MDSS_AHB_CLK>; + <&dispcc0 MDSS_DISP_CC_MDSS_AHB_CLK>, + <&gcc GCC_EDP_REF_CLKREF_EN>; clock-names = "aux", - "cfg_ahb"; + "cfg_ahb", + "ref"; #clock-cells = <1>; #phy-cells = <0>;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 193/1611 writeback: drop now-unnecessary rcu_barrier() in cgroup_writeback_umount()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baokun Li <[email protected]>
[ Upstream commit e90a6d668e26e00a72df2d09c173b563468f09c9 ]
Commit e1b849cfa6b6 ("writeback: Avoid contention on wb->list_lock when switching inodes") replaced the queue_rcu_work() based scheduling of inode wb switches with a plain queue_work(). Since then no switcher goes through call_rcu(), so rcu_barrier() in cgroup_writeback_umount() has no callbacks of its own to wait for. It still drains unrelated call_rcu() callbacks from other subsystems on busy systems, which incidentally slows umount down; drop it.
--- fs/fs-writeback.c | 5 ----- 1 file changed, 5 deletions(-)
fs/fs-writeback.c +0 -5
@@ -1237,11 +1237,6 @@ void cgroup_writeback_umount(struct super_block *sb)* will then drain it. */ synchronize_rcu (); -/* -* Use rcu_barrier() to wait for all pending callbacks to -* ensure that all in-flight wb switches are in the workqueue. -*/ -rcu_barrier ();flush_workqueue (isw_wq); } }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 194/1611 kernfs: fix suspicious RCU usage in kernfs_put()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Conor Kotwasinski <[email protected]>
[ Upstream commit 0fdde3f2aeadcf8d090ee3edee0aad73fb91f690 ]
Commit 741c10b096bc ("kernfs: Use RCU to access kernfs_node::name.") converted the WARN_ONCE() in kernfs_put() to read kn->name and parent->name via rcu_dereference(), but kernfs_put() has callers that hold neither kernfs_rwsem nor the RCU read lock. The inode eviction path driven by memory reclaim is one such case:
kernfs_put+0x53/0x60 fs/kernfs/dir.c:602 evict+0x3c2/0xad0 fs/inode.c:846 iput_final fs/inode.c:1966 [inline] iput.part.0+0x605/0xf50 fs/inode.c:2015 iput+0x35/0x40 fs/inode.c:1981 dentry_unlink_inode+0x2a1/0x490 fs/dcache.c:467 __dentry_kill+0x1d0/0x600 fs/dcache.c:670 shrink_dentry_list+0x180/0x5e0 fs/dcache.c:1174 prune_dcache_sb+0xea/0x150 fs/dcache.c:1256 super_cache_scan+0x328/0x550 fs/super.c:223 ... kswapd+0x556/0xba0 mm/vmscan.c:7343
lockdep complains with "suspicious RCU usage" whenever the WARN fires from such a context.
Wrap the rcu_dereference() calls in an RCU read-side critical section. Gate on the active-ref check so the lock is only taken when the WARN is about to fire.
Note that this does not address the underlying imbalance in kn->active that triggers the WARN.
--- fs/kernfs/dir.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
fs/kernfs/dir.c +7 -4
@@ -576,10 +576,13 @@ void kernfs_put(struct kernfs_node *kn)*/ parent =kernfs_parent (kn); -WARN_ONCE (atomic_read (&kn->active) !=KN_DEACTIVATED_BIAS , -"kernfs_put: %s/%s: released with incorrect active_ref %d\n" , - parent ?rcu_dereference (parent->name) :"" , -rcu_dereference (kn->name),atomic_read (&kn->active)); +if (atomic_read (&kn->active) !=KN_DEACTIVATED_BIAS ) { +guard (rcu)(); +WARN_ONCE (1 , +"kernfs_put: %s/%s: released with incorrect active_ref %d\n" , + parent ?rcu_dereference (parent->name) :"" , +rcu_dereference (kn->name),atomic_read (&kn->active)); + }if (kernfs_type (kn) ==KERNFS_LINK )kernfs_put (kn->symlink.target_kn);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 195/1611 device property: fix fwnode reference leak in fwnode_graph_get_endpoint_by_id()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stepan Ionichev <[email protected]>
[ Upstream commit 9582485a65eacfd7245ec7f0a9d7e2c34749d669 ]
When called with FWNODE_GRAPH_ENDPOINT_NEXT, the function walks every endpoint under the requested port and, for any endpoint whose ID is greater than or equal to the requested one, may store a fwnode reference in best_ep via fwnode_handle_get(). If a later iteration finds an exact-ID match, the function returns that endpoint directly without dropping the reference held by best_ep, leaking it.
Drop the saved candidate before returning the exact-match endpoint.
This affects callers that use FWNODE_GRAPH_ENDPOINT_NEXT to ask for the next endpoint with ID >= the requested one (used by a number of media drivers, e.g. imx7/8, sun6i CSI, omap3isp, xilinx-csi2, stm32-csi). Each leak retains a fwnode reference until reboot/unbind.
--- drivers/base/property.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/base/property.c +3 -1
@@ -1267,8 +1267,10 @@ fwnode_graph_get_endpoint_by_id(const struct fwnode_handle *fwnode,if (fwnode_ep.port != port)continue ; -if (fwnode_ep.id == endpoint) +if (fwnode_ep.id == endpoint) { +fwnode_handle_put (best_ep);return ep; + }if (!endpoint_next)continue ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 196/1611 driver core: Use mod_delayed_work to prevent lost deferred probe work
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhang Yuwei <[email protected]>
[ Upstream commit 1137838865bfc9a7cd5869c1dc5c22aa45ec12c8 ]
The deferred_probe_timeout_work may be permanently and unexpectedly canceled when deferred_probe_extend_timeout() executes concurrently. Starting with deferred_probe_timeout_work pending, the problem can occur after the following sequence:
CPU0 CPU1deferred_probe_extend_timeout
-> cancel_delayed_work() => true
deferred_probe_extend_timeout
-> cancel_delayed_work()
-> __cancel_work()
-> try_grab_pending()
-> schedule_delayed_work()
-> queue_delayed_work_on()(Since the pending bit is grabbed,
it just returns without queuing)
-> set_work_pool_and_clear_pending()
(This __cancel_work() returns false and
the work will never be queued again)
The root cause is that the WORK_STRUCT_PENDING_BIT of the work_struct is set temporarily in __cancel_work() (via try_grab_pending()). This transient state prevents the work_struct from being successfully queued by another CPU.
To fix this, replace the original non-atomic cancel and schedule mechanism with mod_delayed_work(). This ensures the modification is handled atomically and guarantees that the work is not lost.
--- drivers/base/dd.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/base/dd.c +2 -4
@@ -327,12 +327,10 @@ void deferred_probe_extend_timeout(void)* If the work hasn't been queued yet or if the work expired, don't * start a new one. */ -if (cancel_delayed_work (&deferred_probe_timeout_work)) { -schedule_delayed_work (&deferred_probe_timeout_work, - driver_deferred_probe_timeout *HZ ); +if (mod_delayed_work (system_wq, &deferred_probe_timeout_work, + driver_deferred_probe_timeout))pr_debug ("Extended deferred probe timeout by %d secs\n" , driver_deferred_probe_timeout); - } }/**
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 197/1611 Revert "treewide: Fix probing of devices in DT overlays"
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Saravana Kannan <[email protected]>
[ Upstream commit aaf08c52df9a19148731d4a3cfd85d98455db901 ]
This reverts commit 1a50d9403fb90cbe4dea0ec9fd0351d2ecbd8924.
While the commit fixed fw_devlink overlay handling for one case, it broke it for another case. So revert it and redo the fix in a separate patch.
[Herve: Fix conflicts due to f72e77c33e4b ("device property: Make modifications of fwnode "flags" thread safe")]
--- drivers/bus/imx-weim.c | 6 ------ drivers/i2c/i2c-core-of.c | 5 ----- drivers/of/dynamic.c | 1 - drivers/of/platform.c | 5 ----- drivers/spi/spi.c | 5 ----- 5 files changed, 22 deletions(-)
drivers/bus/imx-weim.c +0 -6
@@ -327,12 +327,6 @@ static int of_weim_notify(struct notifier_block *nb, unsigned long action, "Failed to setup timing for '%pOF'\n", rd->dn);if (!of_node_check_flag (rd->dn,OF_POPULATED )) { -/* -* Clear the flag before adding the device so that -* fw_devlink doesn't skip adding consumers to this -* device. -*/ -fwnode_clear_flag (&rd->dn->fwnode,FWNODE_FLAG_NOT_DEVICE );if (!of_platform_device_create (rd->dn,NULL , &pdev->dev)) { dev_err(&pdev->dev, "Failed to create child device '%pOF'\n",
drivers/i2c/i2c-core-of.c +0 -5
@@ -176,11 +176,6 @@ static int of_i2c_notify(struct notifier_block *nb, unsigned long action,return NOTIFY_OK ; } -/* -* Clear the flag before adding the device so that fw_devlink -* doesn't skip adding consumers to this device. -*/ -fwnode_clear_flag (&rd->dn->fwnode,FWNODE_FLAG_NOT_DEVICE ); client =of_i2c_register_device (adap, rd->dn);if (IS_ERR (client)) { dev_err(&adap->dev, "failed to create client for '%pOF'\n",
drivers/of/dynamic.c +0 -1
@@ -225,7 +225,6 @@ static void __of_attach_node(struct device_node *np) np->sibling = np->parent->child; np->parent->child = np;of_node_clear_flag (np,OF_DETACHED ); -fwnode_set_flag (&np->fwnode,FWNODE_FLAG_NOT_DEVICE );raw_spin_unlock_irqrestore (&devtree_lock, flags);
drivers/of/platform.c +0 -5
@@ -739,11 +739,6 @@ static int of_platform_notify(struct notifier_block *nb,if (of_node_check_flag (rd->dn,OF_POPULATED ))return NOTIFY_OK ; -/* -* Clear the flag before adding the device so that fw_devlink -* doesn't skip adding consumers to this device. -*/ -fwnode_clear_flag (&rd->dn->fwnode,FWNODE_FLAG_NOT_DEVICE );/* pdev_parent may be NULL when no bus platform device */ pdev_parent =of_find_device_by_node (parent); pdev = of_platform_device_create(rd->dn, NULL,
drivers/spi/spi.c +0 -5
@@ -4810,11 +4810,6 @@ static int of_spi_notify(struct notifier_block *nb, unsigned long action,return NOTIFY_OK ; } -/* -* Clear the flag before adding the device so that fw_devlink -* doesn't skip adding consumers to this device. -*/ -fwnode_clear_flag (&rd->dn->fwnode,FWNODE_FLAG_NOT_DEVICE ); spi =of_register_spi_device (ctlr, rd->dn);put_device (&ctlr->dev);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 198/1611 of: dynamic: Fix overlayed devices not probing because of fw_devlink
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Saravana Kannan <[email protected]>
[ Upstream commit 81e7c6befa36cecdcbf7244393bd67e8f8c59bf5 ]
When an overlay is applied, if the target device has already probed successfully and bound to a device, then some of the fw_devlink logic that ran when the device was probed needs to be rerun. This allows newly created dangling consumers of the overlayed device tree nodes to be moved to become consumers of the target device.
[Herve: Add the call to driver_deferred_probe_trigger()] [Herve: Use fwnode_test_flag() to test fwnode flags value]
--- drivers/base/core.c | 83 +++++++++++++++++++++++++++++++++++++----- drivers/of/overlay.c | 15 ++++++++ include/linux/fwnode.h | 1 + 3 files changed, 90 insertions(+), 9 deletions(-)
drivers/base/core.c +74 -9
@@ -235,6 +235,79 @@ static void __fw_devlink_pickup_dangling_consumers(struct fwnode_handle *fwnode,__fw_devlink_pickup_dangling_consumers (child, new_sup); } +static void fw_devlink_pickup_dangling_consumers (struct device *dev) +{ +struct fwnode_handle *child; + +guard (mutex)(&fwnode_link_lock); + +fwnode_for_each_available_child_node (dev->fwnode, child) +__fw_devlink_pickup_dangling_consumers (child, dev->fwnode); +__fw_devlink_link_to_consumers (dev); +} + +/** +* fw_devlink_refresh_fwnode - Recheck the tree under this firmware node +* @fwnode: The fwnode under which the fwnode tree has changed +* +* This function is mainly meant to adjust the supplier/consumer dependencies +* after a fwnode tree overlay has occurred. +*/ +void fw_devlink_refresh_fwnode (struct fwnode_handle *fwnode) +{ +struct device *dev; + +/* +* Find the closest ancestor fwnode that has been converted to a device +* that can bind to a driver (bus device). +*/ +fwnode_handle_get (fwnode); +do { +if (fwnode_test_flag (fwnode,FWNODE_FLAG_NOT_DEVICE )) +continue ; + + dev =get_dev_from_fwnode (fwnode); +if (!dev) +continue ; + +if (dev->bus) +break ; + +put_device (dev); + }while ((fwnode =fwnode_get_next_parent (fwnode))); + +/* +* If none of the ancestor fwnodes have (yet) been converted to a device +* that can bind to a driver, there's nothing to fix up. +*/ +if (!fwnode) +return ; + +WARN (device_is_bound (dev) && dev->links.status !=DL_DEV_DRIVER_BOUND , +"Don't multithread overlaying and probing the same device!\n" ); + +/* +* If the device has already bound to a driver, then we need to redo +* some of the work that was done after the device was bound to a +* driver. If the device hasn't bound to a driver, running things too +* soon would incorrectly pick up consumers that it shouldn't. +*/ +if (dev->links.status ==DL_DEV_DRIVER_BOUND ) { +fw_devlink_pickup_dangling_consumers (dev); +/* +* Some of dangling consumers could have been put previously in +* the deferred probe list due to the unavailability of their +* suppliers. Those consumers have been picked up and some of +* their suppliers links have been updated. Time to re-try their +* probe sequence. +*/ +driver_deferred_probe_trigger (); + } + +put_device (dev); +fwnode_handle_put (fwnode); +} +static DEFINE_MUTEX (device_links_lock);DEFINE_STATIC_SRCU (device_links_srcu);
@@ -1312,16 +1385,8 @@ void device_links_driver_bound(struct device *dev)* child firmware node. */ if (dev->fwnode && dev->fwnode->dev == dev) { -struct fwnode_handle *child; -fwnode_links_purge_suppliers (dev->fwnode); - -guard (mutex)(&fwnode_link_lock); - -fwnode_for_each_available_child_node (dev->fwnode, child) -__fw_devlink_pickup_dangling_consumers (child, - dev->fwnode); -__fw_devlink_link_to_consumers (dev); +fw_devlink_pickup_dangling_consumers (dev); }device_remove_file (dev, &dev_attr_waiting_for_supplier);
drivers/of/overlay.c +15 -0
@@ -185,6 +185,15 @@ static int overlay_notify(struct overlay_changeset *ovcs,return 0 ; } +static void overlay_fw_devlink_refresh (struct overlay_changeset *ovcs) +{ +for (int i =0 ; i < ovcs->count; i++) { +struct device_node *np = ovcs->fragments[i].target; + +fw_devlink_refresh_fwnode (of_fwnode_handle (np)); + } +} +/* * The values of properties in the "/__symbols__" node are paths in * the ovcs->overlay_root. When duplicating the properties, the paths
@@ -951,6 +960,12 @@ static int of_overlay_apply(struct overlay_changeset *ovcs,pr_err ("overlay apply changeset entry notify error %d\n" , ret);/* notify failure is not fatal, continue */ +/* +* Needs to happen after changeset notify to give the listeners a chance +* to finish creating all the devices they need to create. +*/ +overlay_fw_devlink_refresh (ovcs); + ret_tmp =overlay_notify (ovcs,OF_OVERLAY_POST_APPLY );if (ret_tmp)if (!ret)
include/linux/fwnode.h +1 -0
@@ -253,6 +253,7 @@ int fwnode_link_add(struct fwnode_handle *con, struct fwnode_handle *sup, u8 flags);void fwnode_links_purge (struct fwnode_handle *fwnode);void fw_devlink_purge_absent_suppliers (struct fwnode_handle *fwnode); +void fw_devlink_refresh_fwnode (struct fwnode_handle *fwnode);bool fw_devlink_is_strict (void );#endif
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 199/1611 crypto: eip93 - fix reset ring register definition
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aleksander Jan Bajkowski <[email protected]>
[ Upstream commit 09e6b79b8ce388993aec9ac91b1cb2c181c27bd9 ]
This patch fixes a descriptor ring reset. This causes a hang in the driver's unload/load sequence.
--- drivers/crypto/inside-secure/eip93/eip93-regs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/inside-secure/eip93/eip93-regs.h +1 -1
@@ -103,7 +103,7 @@#define EIP93_PE_TARGET_COMMAND_NO_RDR_MODE FIELD_PREP(EIP93_PE_CONFIG_PE_MODE, 0x2)#define EIP93_PE_TARGET_COMMAND_WITH_RDR_MODE FIELD_PREP(EIP93_PE_CONFIG_PE_MODE, 0x1)#define EIP93_PE_DIRECT_HOST_MODE FIELD_PREP(EIP93_PE_CONFIG_PE_MODE, 0x0) -#define EIP93_PE_CONFIG_RST_RING BIT(2) +#define EIP93_PE_CONFIG_RST_RING BIT(1)#define EIP93_PE_CONFIG_RST_PE BIT(0)#define EIP93_REG_PE_STATUS 0x104#define EIP93_REG_PE_BUF_THRESH 0x10c
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 200/1611 cpufreq: Documentation: fix sampling_down_factor range
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pengjie Zhang <[email protected]>
[ Upstream commit 85524e651d20944399322d46fb97960337831d43 ]
The ondemand governor implementation accepts sampling_down_factor values from 1 to 100000 via MAX_SAMPLING_DOWN_FACTOR, but the documentation in admin-guide/pm/cpufreq.rst still says the valid range is 1 to 100.
Update the documentation to match the actual code.
--- Documentation/admin-guide/pm/cpufreq.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/admin-guide/pm/cpufreq.rst +1 -1
@@ -516,7 +516,7 @@ This governor exposes the following tunables: of those tasks above 0 and set this attribute to 1. ``sampling_down_factor`` - Temporary multiplier, between 1 (default) and 100 inclusive, to apply to + Temporary multiplier, between 1 (default) and 100000 inclusive, to apply to the ``sampling_rate`` value if the CPU load goes above ``up_threshold``. This causes the next execution of the governor's worker routine (after
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 201/1611 cpufreq: conservative: Simplify frequency limit handling
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lifeng Zheng <[email protected]>
[ Upstream commit 3494dff89779b73a6c70481c982e0e96d336454a ]
cs_dbs_update() performs explicit checks against policy->min/max before updating the target frequency. These checks are redundant as __cpufreq_driver_target() already clamps the requested frequency to the valid policy limits.
Remove the unnecessary boundary checks and simplify the update logic.
This also fixes an issue introduced by commit 00bfe05889e9 ("cpufreq:
conservative: Decrease frequency faster for deferred updates"), where stale target comparisons could cause frequency updates to be skipped entirely after deferred adjustments.
--- drivers/cpufreq/cpufreq_conservative.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)
drivers/cpufreq/cpufreq_conservative.c +1 -11
@@ -103,10 +103,6 @@ static unsigned int cs_dbs_update(struct cpufreq_policy *policy)if (load > dbs_data->up_threshold) { dbs_info->down_skip =0 ; -/* if we are already at full speed then break out early */ -if (requested_freq == policy->max) - goto out; - requested_freq += freq_step;if (requested_freq > policy->max) requested_freq = policy->max;
@@ -124,13 +120,7 @@ static unsigned int cs_dbs_update(struct cpufreq_policy *policy)/* Check for frequency decrease */ if (load < cs_tuners->down_threshold) { -/* -* if we cannot reduce the frequency anymore, break out early -*/ -if (requested_freq == policy->min) - goto out; - -if (requested_freq > freq_step) +if (requested_freq > policy->min + freq_step) requested_freq -= freq_step;else requested_freq = policy->min;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 202/1611 pwm: imx27: Fix variable truncation in .apply()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ronaldo Nunez <[email protected]>
[ Upstream commit dc9e08fdbcc3eb08a1d2b868b535081c44425e27 ]
Fix a variable truncation when calculating period in microseconds as part of the solution for the ERR051198 in .apply() callback.
Example scenario:
- Period of 3us (PWMPR = 196 and prescaler = 1)
- Expected value in tmp: 198000000000 (NSEC_PER_SEC * (196 + 2) * 1)
- Actual value is 431504384 (truncation to u32)
--- drivers/pwm/pwm-imx27.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/pwm/pwm-imx27.c +7 -1
@@ -200,7 +200,7 @@ static void pwm_imx27_wait_fifo_slot(struct pwm_chip *chip,static int pwm_imx27_apply (struct pwm_chip *chip,struct pwm_device *pwm,const struct pwm_state *state) { -unsigned long period_cycles, duty_cycles, prescale, period_us, tmp; +unsigned long period_cycles, duty_cycles, prescale, period_us;struct pwm_imx27_chip *imx =to_pwm_imx27_chip (chip);unsigned long long c;unsigned long long clkrate;
@@ -208,6 +208,7 @@ static int pwm_imx27_apply(struct pwm_chip *chip, struct pwm_device *pwm,int val;int ret;u32 cr; +u64 tmp; clkrate =clk_get_rate (imx->clks[PWM_IMX27_PER ].clk); c = clkrate * state->period;
@@ -249,6 +250,11 @@ static int pwm_imx27_apply(struct pwm_chip *chip, struct pwm_device *pwm, val =readl (imx->mmio_base +MX3_PWMPR ); val = val >=MX3_PWMPR_MAX ?MX3_PWMPR_MAX : val; cr =readl (imx->mmio_base +MX3_PWMCR ); + +/* +* tmp stores period in nanoseconds. Result fits in u64 since +* val <= 0xfffe and prescaler in [1, 0x1000]. +*/ tmp =NSEC_PER_SEC * (u64)(val +2 ) *MX3_PWMCR_PRESCALER_GET (cr); tmp =DIV_ROUND_UP_ULL (tmp, clkrate); period_us =DIV_ROUND_UP_ULL (tmp,1000 );
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 203/1611 RDMA/mana_ib: Use ib_get_eth_speed for reporting port speed
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shiraz Saleem <[email protected]>
[ Upstream commit d28654518c8db5d06d27bd3211c0e9a70c18f7c2 ]
Replace hardcoded IB_WIDTH_4X/IB_SPEED_EDR with ib_get_eth_speed() to report the actual link speed in mana_ib_query_port().
--- drivers/infiniband/hw/mana/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/infiniband/hw/mana/main.c +1 -2
@@ -633,8 +633,7 @@ int mana_ib_query_port(struct ib_device *ibdev, u32 port, props->phys_state =IB_PORT_PHYS_STATE_DISABLED ; } - props->active_width =IB_WIDTH_4X ; - props->active_speed =IB_SPEED_EDR ; +ib_get_eth_speed (ibdev, port, &props->active_speed, &props->active_width); props->pkey_tbl_len =1 ;if (mana_ib_is_rnic (dev)) { props->gid_tbl_len =16 ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 204/1611 bus: sunxi-rsb: Always check register address validity
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Samuel Holland <[email protected]>
[ Upstream commit 61192938a5870ac36edae81e4775b680dcf02c61 ]
The register address was already validated for read operations in regmap_sunxi_rsb_reg_read before being truncated to a u8. Write operations have the same set of possible addresses, and the address is being truncated from u32 to u8 here as well, so the same check is needed.
--- drivers/bus/sunxi-rsb.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/bus/sunxi-rsb.c +3 -0
@@ -447,6 +447,9 @@ static int regmap_sunxi_rsb_reg_write(void *context, unsigned int reg,struct sunxi_rsb_ctx *ctx = context;struct sunxi_rsb_device *rdev = ctx->rdev; +if (reg >0xff ) +return -EINVAL ; +return sunxi_rsb_write (rdev->rsb, rdev->rtaddr, reg, &val, ctx->size); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 205/1611 pinctrl: spacemit: fix NULL check in spacemit_pin_set_config
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Han Gao <[email protected]>
[ Upstream commit 09c816e5c4d3a8d6d6e4b7537433e5e98505d934 ]
spacemit_pin_set_config() looks up the per-pin descriptor with spacemit_get_pin() then checks the wrong variable for failure:
const struct spacemit_pin *spin = spacemit_get_pin(pctrl, pin); ... if (!pin) return -EINVAL; reg = spacemit_pin_to_reg(pctrl, spin->pin);
pin is an unsigned int pin id, where 0 (GPIO_0 / gmac0_rxdv on K3) is a valid pin, so rejecting it here drops the PAD config write for the first pin of every group. On K3 Pico-ITX the GMAC RGMII group lists pin 0 as its first entry, so its drive-strength / bias configuration was silently ignored.
The intended guard is against spacemit_get_pin() returning NULL when the pin id isn't in the SoC's pin table. Check spin instead, which both restores PAD setup for pin 0 and prevents a NULL deref on spin->pin.
--- drivers/pinctrl/spacemit/pinctrl-k1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/spacemit/pinctrl-k1.c +1 -1
@@ -609,7 +609,7 @@ static int spacemit_pin_set_config(struct spacemit_pinctrl *pctrl,void __iomem *reg;unsigned int mux; -if (!pin) +if (!spin)return -EINVAL ; reg =spacemit_pin_to_reg (pctrl, spin->pin);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 206/1611 RDMA/irdma: Fix out-of-bounds write in irdma_copy_user_pgaddrs
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jacob Moroni <[email protected]>
[ Upstream commit 5ebb3ed757be3e04cf803026004aa0beaeb13e9b ]
The irdma_copy_user_pgaddrs function loops through all of the umem DMA blocks to populate the PBLEs and will stop when either the last DMA block is reached or palloc->total_cnt is reached. The issue is that the logic for checking palloc->total_cnt would only work for non-zero values.
When irdma_setup_pbles is called with lvl==0, it
calls irdma_copy_user_pgaddrs with palloc->total_cnt==0, which means the only way to break out of the loop is to reach the last umem DMA block, which means it could end up going beyond the fixed size of 4 iwmr->pgaddrmem array that is used in the lvl==0 case.
In the case of QP/CQ/SRQ rings, the value of lvl is determined by a separate input (for example, req.cq_pages in the case of a CQ). So, we must perform explicit checking to ensure we don't overflow the pgaddrmem array if the user provides a umem that consists of more blocks than their provided req.cq_pages.
--- drivers/infiniband/hw/irdma/verbs.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/infiniband/hw/irdma/verbs.c +10 -4
@@ -2766,10 +2766,11 @@ static inline u64 *irdma_next_pbl_addr(u64 *pbl, struct irdma_pble_info **pinfo,* irdma_copy_user_pgaddrs - copy user page address to pble's os locally * @iwmr: iwmr for IB's user page addresses * @pbl: ple pointer to save 1 level or 0 level pble +* @pbl_len: Max number of PBL entries to populate * @level: indicated level 0, 1 or 2 */ static void irdma_copy_user_pgaddrs (struct irdma_mr *iwmr,u64 *pbl, -enum irdma_pble_level level) +u32 pbl_len,enum irdma_pble_level level) {struct ib_umem *region = iwmr->region;struct irdma_pbl *iwpbl = &iwmr->iwpbl;
@@ -2777,7 +2778,9 @@ static void irdma_copy_user_pgaddrs(struct irdma_mr *iwmr, u64 *pbl,struct irdma_pble_info *pinfo;struct ib_block_iter biter;u32 idx =0 ; -u32 pbl_cnt =0 ; + +if (!pbl_len) +return ; pinfo = (level ==PBLE_LEVEL_1 ) ?NULL : palloc->level2.leaf;
@@ -2786,7 +2789,7 @@ static void irdma_copy_user_pgaddrs(struct irdma_mr *iwmr, u64 *pbl,rdma_umem_for_each_dma_block (region, &biter, iwmr->page_size) { *pbl =rdma_block_iter_dma_address (&biter); -if (++pbl_cnt == palloc->total_cnt) +if (!--pbl_len)break ; pbl =irdma_next_pbl_addr (pbl, &pinfo, &idx); }
@@ -2862,6 +2865,7 @@ static int irdma_setup_pbles(struct irdma_pci_f *rf, struct irdma_mr *iwmr,u64 *pbl;int status;enum irdma_pble_level level =PBLE_LEVEL_1 ; +u32 pbl_len;if (lvl) { status = irdma_get_pble(rf->pble_rsrc, palloc, iwmr->page_cnt,
@@ -2869,16 +2873,18 @@ static int irdma_setup_pbles(struct irdma_pci_f *rf, struct irdma_mr *iwmr,if (status)return status; + pbl_len = palloc->total_cnt; iwpbl->pbl_allocated = true; level = palloc->level; pinfo = (level ==PBLE_LEVEL_1 ) ? &palloc->level1 : palloc->level2.leaf; pbl = pinfo->addr; }else { + pbl_len =IRDMA_MAX_SAVED_PHY_PGADDR ; pbl = iwmr->pgaddrmem; } -irdma_copy_user_pgaddrs (iwmr, pbl, level); +irdma_copy_user_pgaddrs (iwmr, pbl, pbl_len, level);if (lvl) iwmr->pgaddrmem[0 ] = *pbl;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 207/1611 RDMA/rxe: Fix a use-after-free problem in rxe_mmap
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhu Yanjun <[email protected]>
[ Upstream commit 35744ab3d03c5fca8c1752f53fc8fc674e14c561 ]
rxe_mmap() removes a rxe_mmap_info struct from the pending_mmaps list and releases pending_lock while the struct's kref is still at 1:
list_del_init(&ip->pending_mmaps);
spin_unlock_bh(&rxe->pending_lock); /* ref == 1, no lock held */
ret = remap_vmalloc_range(vma, ip->obj, 0); /* walks PTEs */ [...]
rxe_vma_open(vma); /* kref_get, ref → 2 */
remap_vmalloc_range_partial() walks PTEs without any lock.
A concurrent DESTROY_CQ ioctl on another CPU calls:
kref_put(&q->ip->ref, rxe_mmap_release) /* ref 1→0 */
vfree(ip->obj) /* clears vmalloc PTEs mid-walk */
kfree(ip) /* frees rxe_mmap_info */This yields:
1. Kernel crash, vmalloc_to_page() returns NULL when vfree wins the per-PTE race -> vm_insert_page(NULL) → GPF in validate_page_before_insert
2. Page UAF, vmalloc_to_page() reads a stale PTE before vfree clears it. User VMA holds a PTE to a free'd page which might eventually get reallocated later by vmalloc which allows the attacker to get a clean page-level UAF.
It is worth noting that even though a page-level UAF is possible given the strong primitive, it is statistically very difficult to achieve given the very short time window (after the last insert_page and before the kref_get).
The call trace are as below:
Oops: general protection fault, probably for non-canonical address 0xdffffc0000000001: 0000 [#1] SMP KASAN NOPTI KASAN: null-ptr-deref in range [0x0000000000000008-0x000000000000000f] CPU: 0 UID: 1000 PID: 413 Comm: poc Not tainted 7.0.0-rc5-dirty #28 PREEMPT(lazy) Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.15.0-1 04/01/2014 RIP: 0010:validate_page_before_insert+0x32/0x300 Code: e5 41 57 41 56 49 89 fe 41 55 41 54 53 48 89 f3 e8 93 b5 a3 ff 48 8d 7b 08 48 b8 00 00 00 00 00 fc ff df 48 89 fa 48 c1 ea 03 <80> 3c 02 00 0f 85 7b 02 00 00 4c 8b 63 08 31 ff 4d 89 e5 41 83 e5 RSP: 0018:ffff88811b15f2f0 EFLAGS: 00000202 RAX: dffffc0000000000 RBX: 0000000000000000 RCX: 0000000000000000 RDX: 0000000000000001 RSI: 0000000000000000 RDI: 0000000000000008 RBP: ffff88811b15f318 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000000 R12: ffff8881181eee00 R13: 0000000000000000 R14: ffff8881181eee00 R15: ffff8881181eee20 FS: 00007b1e000f76c0(0000) GS:ffff8884268e0000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007b1e00a24ac0 CR3: 0000000116eb3000 CR4: 00000000000006f0 Call Trace: <TASK> insert_page+0x8f/0x190 ? __pfx_insert_page+0x10/0x10 ? kasan_save_alloc_info+0x38/0x60 vm_insert_page+0x2e7/0x400 remap_vmalloc_range_partial+0x212/0x3e0 remap_vmalloc_range+0x6e/0xb0 ? __kasan_check_write+0x14/0x30 rxe_mmap+0x2e9/0x5d0 ib_uverbs_mmap+0x1ad/0x2c0 __mmap_region+0x12c2/0x2ad0 ? __pfx___mmap_region+0x10/0x10 ? __sanitizer_cov_trace_switch+0x58/0xb0 ? mas_prev_slot+0x360/0x39c0 ? __sanitizer_cov_trace_switch+0x58/0xb0 ? mas_next_slot+0x1e5b/0x2f40 ? __sanitizer_cov_trace_cmp8+0x18/0x30 ? unmapped_area_topdown+0x4dd/0x610 ? kfree+0x1b1/0x440 ? free_cpumask_var+0x16/0x30 ? __kasan_slab_free+0x7d/0xa0 ? __sanitizer_cov_trace_cmp8+0x18/0x30 mmap_region+0x2e6/0x3c0 do_mmap+0xa3e/0x12a0 ? __pfx_do_mmap+0x10/0x10 ? __kasan_check_write+0x14/0x30 ? down_write_killable+0xba/0x160 ? __pfx_down_write_killable+0x10/0x10 ? __sanitizer_cov_trace_cmp4+0x16/0x30 vm_mmap_pgoff+0x2d4/0x4a0 ? __pfx_vm_mmap_pgoff+0x10/0x10 ? fget+0x1bf/0x270 ksys_mmap_pgoff+0x40c/0x690 ? __sanitizer_cov_trace_const_cmp4+0x16/0x30 ? __pfx_ksys_mmap_pgoff+0x10/0x10 ? __kasan_check_write+0x14/0x30 ? _raw_spin_trylock+0xbb/0x130 ? __pfx__raw_spin_trylock+0x10/0x10 __x64_sys_mmap+0x135/0x1e0 x64_sys_call+0x1c14/0x2790 do_syscall_64+0xd2/0x1050 ? rcu_core+0x352/0x7d0 ? rcu_core_si+0xe/0x20 ? handle_softirqs+0x1aa/0x650 ? __sanitizer_cov_trace_cmp4+0x16/0x30 ? fpregs_assert_state_consistent+0xe1/0x160 ? irqentry_exit+0xb1/0x670 entry_SYSCALL_64_after_hwframe+0x76/0x7e
--- drivers/infiniband/sw/rxe/rxe_mmap.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
drivers/infiniband/sw/rxe/rxe_mmap.c +16 -3
@@ -93,18 +93,31 @@ int rxe_mmap(struct ib_ucontext *context, struct vm_area_struct *vma) goto done; found_it: +/* +* Increment refcount and check whether it is being freed atm while +* holding lock to prevent UAF +*/ +if (!kref_get_unless_zero (&ip->ref)) { +spin_unlock_bh (&rxe->pending_lock); + ret = -ENXIO ; + goto done; + } +list_del_init (&ip->pending_mmaps);spin_unlock_bh (&rxe->pending_lock); + vma->vm_ops = &rxe_vm_ops; + vma->vm_private_data = ip; + ret =remap_vmalloc_range (vma, ip->obj,0 );if (ret) { + vma->vm_private_data =NULL ; + vma->vm_ops =NULL ; +kref_put (&ip->ref, rxe_mmap_release);rxe_dbg_dev (rxe,"err %d from remap_vmalloc_range\n" , ret); goto done; } - vma->vm_ops = &rxe_vm_ops; - vma->vm_private_data = ip; -rxe_vma_open (vma); done:return ret; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 208/1611 IB/mlx4: Fix refcount leak in add_port() error path
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guangshuo Li <[email protected]>
[ Upstream commit 9a8826fdfbcd7ed2ccf745f5d54208358d939def ]
After kobject_init_and_add(), the lifetime of the embedded struct kobject is expected to be managed through the kobject core reference counting.
In add_port(), failure paths after kobject_init_and_add() must not free struct mlx4_port directly, because the embedded kobject is then managed by the kobject core. Freeing it directly leaves the kobject reference counting unbalanced and can lead to incorrect lifetime handling.
Allocate the pkey and gid attribute arrays before kobject_init_and_add(), so failures before kobject initialization can be handled by directly freeing the allocated memory. Once kobject_init_and_add() has been called, unwind later failures by removing any successfully created sysfs groups, calling kobject_del(), and then releasing the embedded kobject with kobject_put().
--- drivers/infiniband/hw/mlx4/sysfs.c | 45 ++++++++++++++++++------------ 1 file changed, 27 insertions(+), 18 deletions(-)
drivers/infiniband/hw/mlx4/sysfs.c +27 -18
@@ -638,12 +638,6 @@ static int add_port(struct mlx4_ib_dev *dev, int port_num, int slave) p->port_num = port_num; p->slave = slave; - ret =kobject_init_and_add (&p->kobj, &port_type, -kobject_get (dev->dev_ports_parent[slave]), -"%d" , port_num); -if (ret) - goto err_alloc; - p->pkey_group.name ="pkey_idx" ; p->pkey_group.attrs = alloc_group_attrs(show_port_pkey,
@@ -651,13 +645,9 @@ static int add_port(struct mlx4_ib_dev *dev, int port_num, int slave) dev->dev->caps.pkey_table_len[port_num]);if (!p->pkey_group.attrs) { ret = -ENOMEM ; - goto err_alloc; + goto err_free_port; } - ret =sysfs_create_group (&p->kobj, &p->pkey_group); -if (ret) - goto err_free_pkey; - p->gid_group.name ="gid_idx" ; p->gid_group.attrs =alloc_group_attrs (show_port_gid_idx,NULL ,1 );if (!p->gid_group.attrs) {
@@ -665,28 +655,47 @@ static int add_port(struct mlx4_ib_dev *dev, int port_num, int slave) goto err_free_pkey; } + ret =kobject_init_and_add (&p->kobj, &port_type, +kobject_get (dev->dev_ports_parent[slave]), +"%d" , port_num); +if (ret) + goto err_put; + + ret =sysfs_create_group (&p->kobj, &p->pkey_group); +if (ret) + goto err_del; + ret =sysfs_create_group (&p->kobj, &p->gid_group);if (ret) - goto err_free_gid; + goto err_remove_pkey; ret =add_vf_smi_entries (p);if (ret) - goto err_free_gid; + goto err_remove_gid;list_add_tail (&p->kobj.entry, &dev->pkeys.pkey_port_list[slave]);return 0 ; -err_free_gid: -kfree (p->gid_group.attrs[0 ]); -kfree (p->gid_group.attrs); +err_remove_gid: +sysfs_remove_group (&p->kobj, &p->gid_group); + +err_remove_pkey: +sysfs_remove_group (&p->kobj, &p->pkey_group); + +err_del: +kobject_del (&p->kobj); + +err_put: +kobject_put (dev->dev_ports_parent[slave]); +kobject_put (&p->kobj); +return ret; err_free_pkey:for (i =0 ; i < dev->dev->caps.pkey_table_len[port_num]; ++i)kfree (p->pkey_group.attrs[i]);kfree (p->pkey_group.attrs); -err_alloc: -kobject_put (dev->dev_ports_parent[slave]); +err_free_port:kfree (p);return ret; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 209/1611 gpu: nova-core: vbios: stop scanning at BIOS_MAX_SCAN_LEN
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eliot Courtney <[email protected]>
[ Upstream commit fc7c1054b6f983ae2f3e100a24cc87908ae9f4b7 ]
Current code lets current_offset go to BIOS_MAX_SCAN_LEN which is one byte too far.
--- drivers/gpu/nova-core/vbios.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/nova-core/vbios.rs +1 -1
@@ -146,7 +146,7 @@ impl<'a> Iterator for VbiosIterator<'a> {return None ; } -if self.current_offset >BIOS_MAX_SCAN_LEN { +if self.current_offset >=BIOS_MAX_SCAN_LEN {dev_err! (self.dev,"Error: exceeded BIOS scan limit, stopping scan\n" );return None ; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 210/1611 gpu: nova-core: vbios: use checked arithmetic for bios image range end
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eliot Courtney <[email protected]>
[ Upstream commit 7a1d09e477b6496f13f92b84ed9b2eab191b3366 ]
read_bios_image_at_offset is called with a length from the VBIOS header, so we should be more defensive here and use checked arithmetic.
--- drivers/gpu/nova-core/vbios.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/nova-core/vbios.rs +3 -3
@@ -112,8 +112,8 @@ impl<'a> VbiosIterator<'a> { len: usize, context: &str, ) -> Result<BiosImage> { - let data_len = self.data.len(); - if offset + len > data_len { + let end = offset.checked_add(len).ok_or(EINVAL)?; + if end > self.data.len() { self.read_more_at_offset(offset, len).inspect_err(|e| { dev_err!( self.dev,
@@ -124,7 +124,7 @@ impl<'a> VbiosIterator<'a> { })?; } - BiosImage::new(self.dev, &self.data[offset..offset + len]).inspect_err(|err| { + BiosImage::new(self.dev, &self.data[offset..end]).inspect_err(|err| { dev_err!( self.dev, "Failed to {} at offset {:#x}: {:?}\n",
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 211/1611 gpu: nova-core: vbios: avoid reading too far in read_more_at_offset
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eliot Courtney <[email protected]>
[ Upstream commit 33f1402bcfa6cfd85fa265ce6fa5c6bb7d981c6d ]
Fix bug where read_more_at_offset would unnecessarily read more data. This happens when the window to read has some part cached and some part not. It would read len bytes instead of just the uncached portion, which could read past BIOS_MAX_SCAN_LEN.
--- drivers/gpu/nova-core/vbios.rs | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-)
drivers/gpu/nova-core/vbios.rs +11 -14
@@ -59,8 +59,13 @@ impl<'a> VbiosIterator<'a> {/// Read bytes from the ROM at the current end of the data vector. fn read_more (&mut self, len:usize ) ->Result { -let current_len = self.data.len (); -let start =ROM_OFFSET + current_len; +let start = self.data.len (); +let end = start + len; + +if end >BIOS_MAX_SCAN_LEN { +dev_err! (self.dev,"Error: exceeded BIOS scan limit.\n" ); +return Err (EINVAL ); + }// Ensure length is a multiple of 4 for 32-bit reads if len % core::mem::size_of ::<u32 >() !=0 {
@@ -74,9 +79,9 @@ impl<'a> VbiosIterator<'a> { self.data.reserve (len,GFP_KERNEL )?;// Read ROM data bytes and push directly to `data`. -for addrin (start..start + len).step_by (core::mem::size_of ::<u32 >()) { +for addrin (start..end).step_by (core::mem::size_of ::<u32 >()) {// Read 32-bit word from the VBIOS ROM -let word = self.bar0.try_read32 (addr)?; +let word = self.bar0.try_read32 (ROM_OFFSET + addr)?;// Convert the `u32` to a 4 byte array and push each byte. word.to_ne_bytes ()
@@ -89,17 +94,9 @@ impl<'a> VbiosIterator<'a> {/// Read bytes at a specific offset, filling any gap. fn read_more_at_offset (&mut self, offset:usize , len:usize ) ->Result { -if offset >BIOS_MAX_SCAN_LEN { -dev_err! (self.dev,"Error: exceeded BIOS scan limit.\n" ); -return Err (EINVAL ); - } - -// If `offset` is beyond current data size, fill the gap first. -let current_len = self.data.len (); -let gap_bytes = offset.saturating_sub (current_len); +let end = offset.checked_add (len).ok_or (EINVAL )?; -// Now read the requested bytes at the offset. - self.read_more (gap_bytes + len) + self.read_more (end.saturating_sub (self.data.len ())) }/// Read a BIOS image at a specific offset and create a [`BiosImage`] from it.
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 212/1611 gpu: nova-core: replace `as` with `from` conversions where possible
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexandre Courbot <[email protected]>
[ Upstream commit 9a3c2f8a4f84960a48c056d0da88de3d09e6d622 ]
The as operator is best avoided as it silently drops bits if the destination type is smaller that the source.
For data types where this is clearly not the case, use from to unambiguously signal that these conversions are lossless.
Message-ID: <[email protected]>
Stable-dep-of: 237c252be0db ("gpu: nova-core: vbios: read BitToken using FromBytes")
--- drivers/gpu/nova-core/falcon/hal/ga102.rs | 6 ++-- drivers/gpu/nova-core/firmware/fwsec.rs | 4 +-- drivers/gpu/nova-core/vbios.rs | 42 +++++++++++------------ 3 files changed, 25 insertions(+), 27 deletions(-)
drivers/gpu/nova-core/falcon/hal/ga102.rs +2 -4
@@ -42,11 +42,9 @@ fn signature_reg_fuse_version_ga102( engine_id_mask: u16, ucode_id: u8, ) -> Result<u32> { -const NV_FUSE_OPT_FPF_SIZE :u8 = regs::NV_FUSE_OPT_FPF_SIZE as u8 ; -// Each engine has 16 ucode version registers numbered from 1 to 16. -let ucode_idx =match ucode_id { -1 ..=NV_FUSE_OPT_FPF_SIZE => (ucode_id -1 )as usize , +let ucode_idx =match usize::from (ucode_id) { + ucode_id @1 ..=regs::NV_FUSE_OPT_FPF_SIZE => ucode_id -1 , _ => {dev_err! (dev,"invalid ucode id {:#x}" , ucode_id);return Err (EINVAL );
drivers/gpu/nova-core/firmware/fwsec.rs +2 -2
@@ -259,13 +259,13 @@ impl FirmwareDmaObject<FwsecFirmware, Unsigned> { }// Find the DMEM mapper section in the firmware. -for iin 0 ..hdr.entry_countas usize { +for iin 0 ..usize::from (hdr.entry_count) {let app: &FalconAppifV1 =// SAFETY: we have exclusive access to `dma_object`. unsafe {transmute ( &dma_object, - hdr_offset + hdr.header_sizeas usize + i * hdr.entry_sizeas usize + hdr_offset + usize::from (hdr.header_size) + i * usize::from (hdr.entry_size) ) }?;
drivers/gpu/nova-core/vbios.rs +21 -21
115 lines not on this page · raw message
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 213/1611 gpu: nova-core: vbios: read BitToken using FromBytes
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eliot Courtney <[email protected]>
[ Upstream commit 237c252be0db616c93e4984369db7e74bb797564 ]
If header.token_size is smaller than BitToken, then we currently can read past the end of image.base.data. Use checked arithmetic for computing offsets and simplify reading it in using FromBytes.
--- drivers/gpu/nova-core/vbios.rs | 37 +++++++++++++++++----------------- 1 file changed, 18 insertions(+), 19 deletions(-)
drivers/gpu/nova-core/vbios.rs +18 -19
@@ -382,7 +382,7 @@ impl BitHeader {/// BIT Token Entry: Records in the BIT table followed by the BIT header. #[derive( Debug , Clone , Copy )] -#[expect(dead_code)] +#[repr( C )] struct BitToken {/// 00h: Token identifier id:u8 ,
@@ -394,6 +394,9 @@ struct BitToken { data_offset: u16, } +// SAFETY: all bit patterns are valid for `BitToken`. +unsafe impl FromBytes for BitToken {} +// Define the token ID for the Falcon data const BIT_TOKEN_ID_FALCON_DATA :u8 =0x70 ;
@@ -401,32 +404,28 @@ impl BitToken {/// Find a BIT token entry by BIT ID in a PciAtBiosImage fn from_id (image: &PciAtBiosImage , token_id:u8 ) ->Result <Self > {let header = &image.bit_header; +let entry_size = usize::from (header.token_size);// Offset to the first token entry let tokens_start = image.bit_offset + usize::from (header.header_size);for iin 0 ..usize::from (header.token_entries) { -let entry_offset = tokens_start + (i * usize::from (header.token_size)); +let entry_offset = i + .checked_mul (entry_size) + .and_then (|offset| tokens_start.checked_add (offset)) + .ok_or (EINVAL )?; +let entry = image + .base + .data + .get (entry_offset..) + .and_then (|data| data.get (..entry_size)) + .ok_or (EINVAL )?; -// Make sure we don't go out of bounds -if entry_offset + usize::from (header.token_size) > image.base.data.len () { -return Err (EINVAL ); - } +let (token, _) =BitToken ::from_bytes_copy_prefix (entry).ok_or (EINVAL )?;// Check if this token has the requested ID -if image.base.data[entry_offset] == token_id { -return Ok (BitToken { - id: image.base.data[entry_offset], - data_version: image.base.data[entry_offset +1 ], - data_size: u16::from_le_bytes ([ - image.base.data[entry_offset +2 ], - image.base.data[entry_offset +3 ], - ]), - data_offset: u16::from_le_bytes ([ - image.base.data[entry_offset +4 ], - image.base.data[entry_offset +5 ], - ]), - }); +if token.id == token_id { +return Ok (token); } }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 214/1611 RDMA/hns: Fix warning in poll cq direct mode
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lianfa Weng <[email protected]>
[ Upstream commit 3f19c2a3852e6ba75f3e92dd5edc4e07f3d07f4a ]
CQs allocated by ib_alloc_cq() always have a comp_handler. Though in direct mode this handler is never expected to be called, it is still called when the driver is reset, triggering the following WARN_ONCE():
Call trace: ib_cq_completion_direct+0x38/0x60 hns_roce_cq_completion+0x54/0x90 (hns_roce_hw_v2] hns_roce_handle_device_err+Ox1c8/0x340 [hns_roce_hw_v2] hns_roce_hw_v2_uninit_instance.constprop.0+0x34/0x70 [hns_roce_hw_v2] hns_roce_hw_v2_reset_notify+0xc4/0xe0 [hns_roce_hw_v2] hclge_notify_roce_client+0x60/0xbc [hclge] hclge_reset_rebuild+0x48/0x34c [hclge] hclge_reset_subtask+0xcc/0xec [hclge] hclge_reset_service_task+0x80/0x160 [hclge] hclge_service_task+0x50/0x80 (hclge] process_one_work+0x1cc/0x4d0 worker_thread+0x154/0x414 kthread+0x104/0x144 ret_from_fork+0x10/0x18
--- drivers/infiniband/hw/hns/hns_roce_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/hns/hns_roce_main.c +1 -1
@@ -1003,7 +1003,7 @@ static void check_and_get_armed_cq(struct list_head *cq_list, struct ib_cq *cq)unsigned long flags;spin_lock_irqsave (&hr_cq->lock, flags); -if (cq->comp_handler) { +if (cq->comp_handler && hr_cq->ib_cq.poll_ctx !=IB_POLL_DIRECT ) {if (!hr_cq->is_armed) { hr_cq->is_armed =1 ;list_add_tail (&hr_cq->node, cq_list);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 215/1611 RDMA/hns: Fix log flood after cmd_mbox failure
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lianfa Weng <[email protected]>
[ Upstream commit bbd97d71e53e551890e4115ad9de46b5f2ac0858 ]
hns_roce_cmd_mbox() is the command interface between driver and hardware. When hardware is abnormal, the unlimited error printings after hns_roce_cmd_mbox() failure will cause log flood and even system crash.
Replace ibdev_err() and ibdev_warn() with their ratelimited versions in the error handling path after hns_roce_cmd_mbox() (and its wrappers hns_roce_create_hw_ctx/hns_roce_destroy_hw_ctx) fails.
--- drivers/infiniband/hw/hns/hns_roce_cq.c | 6 +++--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 18 +++++++++--------- drivers/infiniband/hw/hns/hns_roce_mr.c | 6 +++--- drivers/infiniband/hw/hns/hns_roce_srq.c | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-)
drivers/infiniband/hw/hns/hns_roce_cq.c +3 -3
@@ -171,9 +171,9 @@ static int hns_roce_create_cqc(struct hns_roce_dev *hr_dev, ret =hns_roce_create_hw_ctx (hr_dev, mailbox,HNS_ROCE_CMD_CREATE_CQC , hr_cq->cqn);if (ret) -ibdev_err (ibdev, -"failed to send create cmd for CQ(0x%lx), ret = %d.\n" , - hr_cq->cqn, ret); +ibdev_err_ratelimited (ibdev, +"failed to send create cmd for CQ(0x%lx), ret = %d.\n" , + hr_cq->cqn, ret);hns_roce_free_cmd_mailbox (hr_dev, mailbox);
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +9 -9
@@ -5950,9 +5950,9 @@ static int hns_roce_v2_modify_srq(struct ib_srq *ibsrq, HNS_ROCE_CMD_MODIFY_SRQC, srq->srqn);hns_roce_free_cmd_mailbox (hr_dev, mailbox);if (ret) -ibdev_err (&hr_dev->ib_dev, -"failed to handle cmd of modifying SRQ, ret = %d.\n" , - ret); +ibdev_err_ratelimited (&hr_dev->ib_dev, +"failed to handle cmd of modifying SRQ, ret = %d.\n" , + ret); } out:
@@ -5978,9 +5978,9 @@ static int hns_roce_v2_query_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr) ret =hns_roce_cmd_mbox (hr_dev,0 , mailbox->dma,HNS_ROCE_CMD_QUERY_SRQC , srq->srqn);if (ret) { -ibdev_err (&hr_dev->ib_dev, -"failed to process cmd of querying SRQ, ret = %d.\n" , - ret); +ibdev_err_ratelimited (&hr_dev->ib_dev, +"failed to process cmd of querying SRQ, ret = %d.\n" , + ret); goto out; }
@@ -6086,9 +6086,9 @@ static int hns_roce_v2_query_mpt(struct hns_roce_dev *hr_dev, u32 key, ret =hns_roce_cmd_mbox (hr_dev,0 , mailbox->dma,HNS_ROCE_CMD_QUERY_MPT ,key_to_hw_index (key));if (ret) { -ibdev_err (&hr_dev->ib_dev, -"failed to process cmd when querying MPT, ret = %d.\n" , - ret); +ibdev_err_ratelimited (&hr_dev->ib_dev, +"failed to process cmd when querying MPT, ret = %d.\n" , + ret); goto err_mailbox; }
drivers/infiniband/hw/hns/hns_roce_mr.c +3 -3
@@ -173,7 +173,7 @@ static int hns_roce_mr_enable(struct hns_roce_dev *hr_dev, ret =hns_roce_create_hw_ctx (hr_dev, mailbox,HNS_ROCE_CMD_CREATE_MPT , mtpt_idx & (hr_dev->caps.num_mtpts -1 ));if (ret) { -dev_err (dev,"failed to create mpt, ret = %d.\n" , ret); +dev_err_ratelimited (dev,"failed to create mpt, ret = %d.\n" , ret); goto err_page; }
@@ -319,7 +319,7 @@ struct ib_mr *hns_roce_rereg_user_mr(struct ib_mr *ibmr, int flags, u64 start, ret =hns_roce_destroy_hw_ctx (hr_dev,HNS_ROCE_CMD_DESTROY_MPT , mtpt_idx);if (ret) -ibdev_warn (ib_dev,"failed to destroy MPT, ret = %d.\n" , ret); +ibdev_warn_ratelimited (ib_dev,"failed to destroy MPT, ret = %d.\n" , ret); mr->enabled =0 ; mr->iova = virt_addr;
@@ -350,7 +350,7 @@ struct ib_mr *hns_roce_rereg_user_mr(struct ib_mr *ibmr, int flags, u64 start, ret =hns_roce_create_hw_ctx (hr_dev, mailbox,HNS_ROCE_CMD_CREATE_MPT , mtpt_idx);if (ret) { -ibdev_err (ib_dev,"failed to create MPT, ret = %d.\n" , ret); +ibdev_err_ratelimited (ib_dev,"failed to create MPT, ret = %d.\n" , ret); goto free_cmd_mbox; }
drivers/infiniband/hw/hns/hns_roce_srq.c +1 -1
@@ -104,7 +104,7 @@ static int hns_roce_create_srqc(struct hns_roce_dev *hr_dev, ret =hns_roce_create_hw_ctx (hr_dev, mailbox,HNS_ROCE_CMD_CREATE_SRQ , srq->srqn);if (ret) -ibdev_err (ibdev,"failed to config SRQC, ret = %d.\n" , ret); +ibdev_err_ratelimited (ibdev,"failed to config SRQC, ret = %d.\n" , ret); err_mbox:hns_roce_free_cmd_mailbox (hr_dev, mailbox);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 216/1611 RDMA/counter: Fix incorrect port index in rdma_counter_init() error cleanup
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tao Cui <[email protected]>
[ Upstream commit b86fd95805a7bd4c5b9465c9e7f75e45bbe7eb6f ]
The error cleanup loop in rdma_counter_init() iterates with variable 'i' but accesses dev->port_data[port] instead of dev->port_data[i]. This causes the failed port's hstats to be freed multiple times while leaking hstats of previously initialized ports.
--- drivers/infiniband/core/counters.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/core/counters.c +1 -1
@@ -661,7 +661,7 @@ void rdma_counter_init(struct ib_device *dev) fail:for (i = port; i >=rdma_start_port (dev); i--) { - port_counter = &dev->port_data[port].port_counter; + port_counter = &dev->port_data[i].port_counter;rdma_free_hw_stats_struct (port_counter->hstats); port_counter->hstats =NULL ;mutex_destroy (&port_counter->lock);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 217/1611 pinctrl: meson: amlogic-a4: fix gpio output glitch
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xianwei Zhao <[email protected]>
[ Upstream commit 45ad4de324cb1bba88e568b5bef633a79d926aed ]
When the system transitions from bootloader to kernel, the GPIO is expected to keep driving high.
However, the Linux kernel first configures the pin direction and then sets the output value. This may cause a brief low-level glitch on the GPIO line, which can be problematic for regulator control.
By configuring the output value before switching the pin direction to output, the glitch can be avoided.
This commit fixes the issue by swapping the configuration order.
--- drivers/pinctrl/meson/pinctrl-amlogic-a4.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/pinctrl/meson/pinctrl-amlogic-a4.c +7 -8
@@ -548,11 +548,11 @@ static int aml_pinconf_set_output_drive(struct aml_pinctrl *info, {int ret; - ret =aml_pinconf_set_output (info, pin, true); + ret =aml_pinconf_set_drive (info, pin, high);if (ret)return ret; -return aml_pinconf_set_drive (info, pin, high); +return aml_pinconf_set_output (info, pin, true); } static int aml_pinconf_set(struct pinctrl_dev *pcdev, unsigned int pin,
@@ -921,15 +921,14 @@ static int aml_gpio_direction_output(struct gpio_chip *chip, unsigned int gpio,unsigned int bit, reg;int ret; -aml_gpio_calc_reg_and_bit (bank,AML_REG_DIR , gpio, ®, &bit); - ret =regmap_update_bits (bank->reg_gpio, reg,BIT (bit),0 ); +aml_gpio_calc_reg_and_bit (bank,AML_REG_OUT , gpio, ®, &bit); + ret =regmap_update_bits (bank->reg_gpio, reg,BIT (bit), + value ?BIT (bit) :0 );if (ret <0 )return ret; -aml_gpio_calc_reg_and_bit (bank,AML_REG_OUT , gpio, ®, &bit); - -return regmap_update_bits (bank->reg_gpio, reg,BIT (bit), - value ?BIT (bit) :0 ); +aml_gpio_calc_reg_and_bit (bank,AML_REG_DIR , gpio, ®, &bit); +return regmap_update_bits (bank->reg_gpio, reg,BIT (bit),0 ); }static int aml_gpio_set (struct gpio_chip *chip,unsigned int gpio,int value)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 218/1611 PM: sleep: Use complete() in device_pm_sleep_init()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiakai Xu <[email protected]>
[ Upstream commit 3855941f1e4069182c895d5093c5fa589f5b38bd ]
Replace complete_all() with complete() in device_pm_sleep_init() to allow it to be called in atomic contexts without triggering a false-positive WARNING from lockdep_assert_RT_in_threaded_ctx() when CONFIG_PROVE_RAW_LOCK_NESTING is enabled.
device_pm_sleep_init() may be called during device initialization while holding a raw_spinlock (e.g., from within device_initialize()), and complete_all() is unsafe in atomic contexts on PREEMPT_RT kernels. complete(), which is safe to call from any context, is sufficient here.
complete_all() sets the completion count to UINT_MAX/2 (permanently signaled), while complete() increments it by 1. Since no threads can be waiting during device initialization, both are functionally equivalent. The completion is always reinitialized via reinit_completion() in dpm_clear_async_state() before each suspend/resume cycle.
However, changing to complete() introduces a potential deadlock for devices with no PM support (dev->power.no_pm = true). Such devices are never added to the dpm_list and never go through dpm_clear_async_state(), so their completion is never reinitialized. A parent device waiting on a no_pm child across multiple suspend phases would consume the single-use token in the first phase and block forever in the second.
Fix this by adding an early return in dpm_wait() when dev->power.no_pm is set, since no_pm devices do not participate in system suspend/resume.
--- drivers/base/power/main.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/base/power/main.c +5 -1
@@ -111,7 +111,7 @@ void device_pm_sleep_init(struct device *dev) dev->power.is_noirq_suspended = false; dev->power.is_late_suspended = false;init_completion (&dev->power.completion); -complete_all (&dev->power.completion); +complete (&dev->power.completion); dev->power.wakeup =NULL ;INIT_LIST_HEAD (&dev->power.entry); }
@@ -248,6 +248,10 @@ static void dpm_wait(struct device *dev, bool async)if (!dev)return ; +/* Devices with no PM support don't use the completion. */ +if (dev->power.no_pm) +return ; +if (async || (pm_async_enabled && dev->power.async_suspend))wait_for_completion (&dev->power.completion); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 219/1611 MIPS: Fix big-endian stack argument fetching in o32 wrapper
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maciej W. Rozycki <[email protected]>
[ Upstream commit 8e0780d30b1b51248e42895b7acc7a20f147b40b ]
Fix an issue in call_o32() where the upper 32-bit half of incoming n64 stack arguments is fetched and used for outgoing o32 stack arguments on big-endian platforms.
This code was adapted from arch/mips/dec/prom/call_o32.S which was meant for a little-endian platform only and therefore using 32-bit loads from 64-bit stack slot locations holding incoming stack arguments resulted in correct values being retrieved for data that is expected to be 32-bit.
This works on little-endian platforms where the lower 32-bit half of the 64-bit value is located at every 64-bit stack slot location. However on big-endian platforms the lower 32-bit half is instead located at offset 4 from every 64-bit stack slot location.
So to fix the issue the offset of 4 would have to be used on big-endian platforms only, or alternatively a 64-bit load from the 64-bit stack slot location can be used across the board, as the subsequent 32-bit store to the corresponding outgoing stack argument slot will correctly truncate the value and cause no unpredictable result. We already take advantage of this architectural feature for the incoming arguments held in $a6 and $a7 registers, since the o32 wrapper does not know how many incoming arguments there are and consequently propagates incoming data which may not be 32-bit.
Since this code is generally supposed to be used with the stack located in cached memory there is no extra overhead expected for 64-bit loads as opposed to 32-bit ones, so pick this variant for code simplicity.
--- arch/mips/fw/lib/call_o32.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/fw/lib/call_o32.S +1 -1
@@ -74,7 +74,7 @@ NESTED(call_o32, O32_FRAMESZ, ra) PTR_LA t1,6*O32_SZREG(fp) li t2,O32_ARGC-6 1: - lw t3,(t0) + ld t3,(t0) REG_ADDU t0,SZREG sw t3,(t1) REG_SUBU t2,1
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 220/1611 MIPS: DEC: Remove do_IRQ() call indirection
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maciej W. Rozycki <[email protected]>
[ Upstream commit 35554eadc1b127bb5294504a4ac8f3a5dd9e299d ]
As from commit 8f99a1626535 ("MIPS: Tracing: Add IRQENTRY_EXIT section for MIPS") do_IRQ() is not a macro anymore and can be invoked directly from assembly code, as a tail call. Remove the dec_irq_dispatch() stub then and the indirection previously introduced with commit 187933f23679 ("[MIPS] do_IRQ cleanup"), improving performance by reducing the number of control flow changes and the overall instruction count, while fixing a compiler's complaint about a missing prototype for said stub:
arch/mips/dec/setup.c:780:25: warning: no previous prototype for 'dec_irq_dispatch' [-Wmissing-prototypes]
780 | asmlinkage unsigned int dec_irq_dispatch(unsigned int irq)
| ^~~~~~~~~~~~~~~~
(which gets promoted to a compilation error with CONFIG_WERROR).
--- arch/mips/dec/int-handler.S | 2 +- arch/mips/dec/setup.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-)
arch/mips/dec/int-handler.S +1 -1
@@ -277,7 +277,7 @@ srlv t3,t1,t2 handle_it: - j dec_irq_dispatch + j do_IRQ nop #if defined(CONFIG_32BIT) && defined(CONFIG_MIPS_FP_SUPPORT)
arch/mips/dec/setup.c +0 -6
@@ -776,9 +776,3 @@ void __init arch_init_irq(void)pr_err ("Failed to register halt interrupt\n" ); } } - -asmlinkage unsigned int dec_irq_dispatch(unsigned int irq) -{ -do_IRQ (irq); -return 0 ; -}
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 221/1611 mips: ralink: mt7621: add missing __iomem
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rosen Penev <[email protected]>
[ Upstream commit 4ddaf88aadd3bd09c2eb3734c53d2864af6b144e ]
raw_readl and writel calls expect pointers annotated with __iomem.
--- arch/mips/ralink/mt7621.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/ralink/mt7621.c +1 -1
@@ -63,7 +63,7 @@ phys_addr_t mips_cpc_default_phys_base(void)static bool __init mt7621_addr_wraparound_test (phys_addr_t size) { -void *dm = (void *)KSEG1ADDR (&detect_magic); +void __iomem *dm = (void __iomem *)KSEG1ADDR (&detect_magic);if (CPHYSADDR (dm + size) >=MT7621_LOWMEM_MAX_SIZE )return true;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 222/1611 mips: n64: add __iomem for writel call
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rosen Penev <[email protected]>
[ Upstream commit 579f5329d5df2dbcf4bb5ef398701c2501d24892 ]
sparse: incorrect type in argument 2 (different address spaces) @@ expected void volatile [noderef] __iomem *mem @@
got unsigned int [usertype] *
--- arch/mips/n64/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/n64/init.c +1 -1
@@ -50,7 +50,7 @@ void __init prom_init(void)#define W 320#define H 240 -#define REG_BASE ((u32 *) CKSEG1ADDR(0x4400000)) +#define REG_BASE ((u32 __iomem *) CKSEG1ADDR(0x4400000))static void __init n64rdp_write_reg (const u8 reg,const u32 value) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 223/1611 driver core: Fix missing jiffies conversion in deferred_probe_extend_timeout()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Danilo Krummrich <[email protected]>
[ Upstream commit f9e6da99fe49277979798a1c3b9790ae10aaa18a ]
mod_delayed_work() takes jiffies, not seconds. Thus, restore the dropped conversion.
While at it, fix incorrect indentation.
--- drivers/base/dd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/base/dd.c +1 -1
@@ -328,7 +328,7 @@ void deferred_probe_extend_timeout(void)* start a new one. */ if (mod_delayed_work (system_wq, &deferred_probe_timeout_work, - driver_deferred_probe_timeout)) +secs_to_jiffies (driver_deferred_probe_timeout)))pr_debug ("Extended deferred probe timeout by %d secs\n" , driver_deferred_probe_timeout); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 224/1611 driver core: Guard deferred probe timeout extension with delayed_work_pending()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Danilo Krummrich <[email protected]>
[ Upstream commit 557495bc879013c3d5e21d667e987e7ce3a514de ]
mod_delayed_work() unconditionally queues the work even when it wasn't previously pending, which can fire the timeout prematurely or restart it after it already fired. Add a delayed_work_pending() guard to restore the originally intended semantics.
Premature firing calls fw_devlink_drivers_done() before all built-in drivers have registered, causing fw_devlink to prematurely relax device links for suppliers whose drivers haven't loaded yet.
--- drivers/base/dd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/base/dd.c +2 -1
@@ -327,7 +327,8 @@ void deferred_probe_extend_timeout(void)* If the work hasn't been queued yet or if the work expired, don't * start a new one. */ -if (mod_delayed_work (system_wq, &deferred_probe_timeout_work, +if (delayed_work_pending (&deferred_probe_timeout_work) && +mod_delayed_work (system_wq, &deferred_probe_timeout_work,secs_to_jiffies (driver_deferred_probe_timeout)))pr_debug ("Extended deferred probe timeout by %d secs\n" , driver_deferred_probe_timeout);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 225/1611 mtd: spi-nor: debugfs: Fix the flags list
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miquel Raynal <[email protected]>
[ Upstream commit 829dff83597615208aedf0f5abb3878b47f2314d ]
As mentioned above the spi_nor_option_flags enumeration in core.h, this list should be kept in sync with the one in the core.
Add the missing flag.
--- drivers/mtd/spi-nor/debugfs.c | 1 + 1 file changed, 1 insertion(+)
drivers/mtd/spi-nor/debugfs.c +1 -0
@@ -29,6 +29,7 @@ static const char *const snor_f_names[] = {SNOR_F_NAME (RWW ),SNOR_F_NAME (ECC ),SNOR_F_NAME (NO_WP ), + SNOR_F_NAME(SWAP16), };#undef SNOR_F_NAME
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 226/1611 mtd: spi-nor: Drop duplicate Kconfig dependency
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miquel Raynal <[email protected]>
[ Upstream commit a6470e2162e9c3779a4bd6ff3bed1b81d796e46e ]
I do not think the MTD dependency is needed twice. This is likely a duplicate coming from a former rebase when the spi-nor core got cleaned up a while ago. Remove the extra line.
--- drivers/mtd/spi-nor/Kconfig | 1 - 1 file changed, 1 deletion(-)
drivers/mtd/spi-nor/Kconfig +0 -1
@@ -1,7 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only menuconfig MTD_SPI_NOR tristate "SPI NOR device support" - depends on MTD depends on MTD && SPI_MASTER select SPI_MEM help
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 227/1611 ALSA: xen-front: Reset event channel state on stream clear
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cássio Gabriel <[email protected]>
[ Upstream commit 9cd81152373c560b8aa8299b0705c4db82b103b7 ]
xen_snd_front_evtchnl_pair_clear() resets evt_next_id for both channels. That is correct for the request channel, where evt_next_id is used to allocate the next request id. It is wrong for the event channel:
incoming events are validated against evt_id, and evt_id is incremented by evtchnl_interrupt_evt().
This leaves the expected event id from the previous stream instance. A backend that restarts event ids for a reopened stream can then have valid current-position events dropped until the stale frontend id catches up.
Reset evt_id for the event channel. Also advance the event-page consumer to the current producer while clearing the stream, so obsolete events queued for the previous stream instance are not delivered to the next ALSA runtime.
--- sound/xen/xen_snd_front_evtchnl.c | 8 ++++++-- sound/xen/xen_snd_front_evtchnl.h | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-)
sound/xen/xen_snd_front_evtchnl.c +6 -2
@@ -457,7 +457,11 @@ void xen_snd_front_evtchnl_pair_clear(struct xen_snd_front_evtchnl_pair *evt_pai } scoped_guard(mutex, &evt_pair->evt.ring_io_lock) { - evt_pair->evt.evt_next_id =0 ; + evt_pair->evt.evt_id =0 ; +/* Drop obsolete events queued for the previous stream instance. */ + evt_pair->evt.u.evt.page->in_cons = + evt_pair->evt.u.evt.page->in_prod; +/* Ensure the consumer index is visible before stream reuse. */ +virt_wmb (); } } -
sound/xen/xen_snd_front_evtchnl.h +2 -2
@@ -37,9 +37,9 @@ struct xen_snd_front_evtchnl {/* State of the event channel. */ enum xen_snd_front_evtchnl_state state;enum xen_snd_front_evtchnl_type type; -/* Either response id or incoming event id. */ +/* Current response id or next expected incoming event id. */ u16 evt_id; -/* Next request id or next expected event id. */ +/* Next request id. */ u16 evt_next_id;/* Shared ring access lock. */ struct mutex ring_io_lock;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 228/1611 ALSA: xen-front: Connect event channel after stream prepare
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cássio Gabriel <[email protected]>
[ Upstream commit 3624f0bd4af15a820b1bd88b489980fa9fd61b7a ]
The request channel must be connected from ALSA .open(), because hw-rule queries and the stream open request use it. The event channel is
different: XENSND_EVT_CUR_POS handling uses ALSA runtime buffer and period geometry, and the corresponding Xen stream parameters are not submitted to the backend until .prepare() sends XENSND_OP_OPEN.
Currently .open() connects both channels. A backend current-position event, or a stale event queued for an earlier stream instance, can therefore reach xen_snd_front_alsa_handle_cur_pos() before runtime->buffer_size and runtime->period_size are valid.
Add a per-channel connection helper, connect only the request channel in .open(), connect the event channel after a successful stream prepare, and disconnect it before stream close/free. Re-check the event-channel state after taking ring_io_lock so disconnecting the event channel synchronizes against a threaded IRQ that passed the initial lockless state test. Keep defensive runtime geometry checks in the position handler.
--- sound/xen/xen_snd_front_alsa.c | 17 ++++++++++++----- sound/xen/xen_snd_front_evtchnl.c | 20 +++++++++++++------- sound/xen/xen_snd_front_evtchnl.h | 2 ++ 3 files changed, 27 insertions(+), 12 deletions(-)
sound/xen/xen_snd_front_alsa.c +12 -5
@@ -378,7 +378,7 @@ static int alsa_open(struct snd_pcm_substream *substream)stream_clear (stream); -xen_snd_front_evtchnl_pair_set_connected (stream->evt_pair, true); +xen_snd_front_evtchnl_set_connected (&stream->evt_pair->req, true); ret = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_FORMAT, alsa_hw_rule, stream,
@@ -499,6 +499,8 @@ static int alsa_hw_free(struct snd_pcm_substream *substream)struct xen_snd_front_pcm_stream_info *stream =stream_get (substream);int ret; +xen_snd_front_evtchnl_set_connected (&stream->evt_pair->evt, false); + ret =xen_snd_front_stream_close (&stream->evt_pair->req);stream_free (stream);return ret;
@@ -533,6 +535,7 @@ static int alsa_prepare(struct snd_pcm_substream *substream)return ret; stream->is_open = true; +xen_snd_front_evtchnl_set_connected (&stream->evt_pair->evt, true); }return 0 ;
@@ -572,20 +575,24 @@ void xen_snd_front_alsa_handle_cur_pos(struct xen_snd_front_evtchnl *evtchnl, {struct snd_pcm_substream *substream = evtchnl->u.evt.substream;struct xen_snd_front_pcm_stream_info *stream =stream_get (substream); +struct snd_pcm_runtime *runtime = substream->runtime;snd_pcm_uframes_t delta, new_hw_ptr, cur_frame; - cur_frame =bytes_to_frames (substream->runtime, pos_bytes); +if (!runtime->buffer_size || !runtime->period_size) +return ; + + cur_frame =bytes_to_frames (runtime, pos_bytes); delta = cur_frame - stream->be_cur_frame; stream->be_cur_frame = cur_frame; new_hw_ptr = (snd_pcm_uframes_t )atomic_read (&stream->hw_ptr); - new_hw_ptr = (new_hw_ptr + delta) % substream->runtime->buffer_size; + new_hw_ptr = (new_hw_ptr + delta) % runtime->buffer_size;atomic_set (&stream->hw_ptr, (int )new_hw_ptr); stream->out_frames += delta; -if (stream->out_frames > substream->runtime->period_size) { - stream->out_frames %= substream->runtime->period_size; +if (stream->out_frames > runtime->period_size) { + stream->out_frames %= runtime->period_size;snd_pcm_period_elapsed (substream); } }
sound/xen/xen_snd_front_evtchnl.c +13 -7
@@ -94,6 +94,9 @@ static irqreturn_t evtchnl_interrupt_evt(int irq, void *dev_id)guard (mutex)(&channel->ring_io_lock); +if (unlikely (channel->state !=EVTCHNL_STATE_CONNECTED )) +return IRQ_HANDLED ; + prod = page->in_prod;/* Ensure we see ring contents up to prod. */ virt_rmb ();
@@ -431,8 +434,8 @@ int xen_snd_front_evtchnl_publish_all(struct xen_snd_front_info *front_info)return ret; } -void xen_snd_front_evtchnl_pair_set_connected (struct xen_snd_front_evtchnl_pair *evt_pair, -bool is_connected) +void xen_snd_front_evtchnl_set_connected (struct xen_snd_front_evtchnl *channel, +bool is_connected) {enum xen_snd_front_evtchnl_state state;
@@ -441,13 +444,16 @@ void xen_snd_front_evtchnl_pair_set_connected(struct xen_snd_front_evtchnl_pairelse state =EVTCHNL_STATE_DISCONNECTED ; - scoped_guard(mutex, &evt_pair->req.ring_io_lock) { - evt_pair->req.state = state; + scoped_guard(mutex, &channel->ring_io_lock) { + channel->state = state; } +} - scoped_guard(mutex, &evt_pair->evt.ring_io_lock) { - evt_pair->evt.state = state; - } +void xen_snd_front_evtchnl_pair_set_connected (struct xen_snd_front_evtchnl_pair *evt_pair, +bool is_connected) +{ +xen_snd_front_evtchnl_set_connected (&evt_pair->req, is_connected); +xen_snd_front_evtchnl_set_connected (&evt_pair->evt, is_connected); }void xen_snd_front_evtchnl_pair_clear (struct xen_snd_front_evtchnl_pair *evt_pair)
sound/xen/xen_snd_front_evtchnl.h +2 -0
@@ -77,6 +77,8 @@ void xen_snd_front_evtchnl_free_all(struct xen_snd_front_info *front_info);int xen_snd_front_evtchnl_publish_all (struct xen_snd_front_info *front_info);void xen_snd_front_evtchnl_flush (struct xen_snd_front_evtchnl *evtchnl); +void xen_snd_front_evtchnl_set_connected (struct xen_snd_front_evtchnl *channel, +bool is_connected);void xen_snd_front_evtchnl_pair_set_connected (struct xen_snd_front_evtchnl_pair *evt_pair,bool is_connected);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 229/1611 ALSA: seq: oss: Fix UAF at handling events with embedded SysEx data
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit 7c349b4f2a603202fb8c363bd2774a22ac2fddf3 ]
The OSS sequencer processes the input MIDI bytes into a sequencer event to be dispatched later (in snd_seq_oss_midi_putc() called from snd_seq_oss_process_event()). When it's a SysEx data, the event record contains data.ext.ptr pointer to the original SysEx bytes, and the referred data is copied into the pool afterwards at dispatching. The problem is that, if the sequencer port gets closed concurrently before the dispatch, the OSS sequencer core also releases the resources (in snd_seq_oss_midi_check_exit_port()), while the pending event may hold a stale pointer, eventually leading to a UAF at a later dispatch.
Fortunately, there is already a refcounting mechanism (snd_use_lock_t) for the OSS MIDI device access, and for addressing the issue above, we just need to extend the refcount until the event gets dispatched.
This patch extends snd_seq_oss_process_event() to give back the refcount object, which is in turn released after calling the sequencer dispatcher with the given event in the caller side.
According to the original report, KASAN report as below:
KASAN slab-use-after-free in snd_seq_event_dup+0x40c/0x470
RIP: 0033:0x7f2cb66a6340 Read of size 6 Call trace: dump_stack_lvl+0x73/0xb0 (?:?) print_report+0xd1/0x650 (?:?) srso_alias_return_thunk+0x5/0xfbef5 (?:?) __virt_addr_valid+0x1a7/0x340 (?:?) kasan_complete_mode_report_info+0x64/0x200 (?:?) kasan_report+0xf7/0x130 (?:?) snd_seq_event_dup+0x40c/0x470 (?:?) kasan_check_range+0x10c/0x1c0 (?:?) __asan_memcpy+0x27/0x70 (?:?) snd_seq_event_dup+0x9/0x470 (?:?) snd_seq_client_enqueue_event+0x139/0x240 (?:?) _raw_spin_unlock_irqrestore+0x4b/0x60 (?:?) snd_seq_kernel_client_enqueue+0x102/0x120 (?:?) snd_seq_oss_write+0x416/0x4e0 (?:?) apparmor_file_permission+0x20/0x30 (?:?) odev_write+0x3b/0x60 (?:?) vfs_write+0x1ce/0x850 (?:?) lock_release+0xc8/0x2a0 (?:?) __kasan_check_write+0x18/0x20 (?:?) __mutex_unlock_slowpath+0x129/0x510 (?:?) ksys_write+0xe1/0x180 (?:?) mutex_unlock+0x16/0x20 (?:?) odev_ioctl+0x65/0xc0 (?:?) __x64_sys_write+0x46/0x60 (?:?) x64_sys_call+0x7d/0x20d0 (?:?) do_syscall_64+0xc1/0x360 (arch/x86/entry/syscall_64.c:87) entry_SYSCALL_64_after_hwframe+0x77/0x7f (?:?)
--- sound/core/seq/oss/seq_oss_event.c | 6 ++++-- sound/core/seq/oss/seq_oss_event.h | 3 ++- sound/core/seq/oss/seq_oss_ioctl.c | 5 ++++- sound/core/seq/oss/seq_oss_midi.c | 6 +++++- sound/core/seq/oss/seq_oss_midi.h | 2 +- sound/core/seq/oss/seq_oss_rw.c | 5 ++++- 6 files changed, 20 insertions(+), 7 deletions(-)
sound/core/seq/oss/seq_oss_event.c +4 -2
@@ -39,8 +39,10 @@ static int set_echo_event(struct seq_oss_devinfo *dp, union evrec *rec, struct s*/ int -snd_seq_oss_process_event (struct seq_oss_devinfo *dp,union evrec *q,struct snd_seq_event *ev) +snd_seq_oss_process_event (struct seq_oss_devinfo *dp,union evrec *q, +struct snd_seq_event *ev,snd_use_lock_t **lockp) { + *lockp =NULL ;switch (q->s.code) {case SEQ_EXTENDED :return extended_event (dp, q, ev);
@@ -69,7 +71,7 @@ snd_seq_oss_process_event(struct seq_oss_devinfo *dp, union evrec *q, struct sndif (snd_seq_oss_midi_open (dp, q->s.dev,SNDRV_SEQ_OSS_FILE_WRITE ))break ;if (snd_seq_oss_midi_filemode (dp, q->s.dev) &SNDRV_SEQ_OSS_FILE_WRITE ) -return snd_seq_oss_midi_putc (dp, q->s.dev, q->s.parm1, ev); +return snd_seq_oss_midi_putc (dp, q->s.dev, q->s.parm1, ev, lockp);break ;case SEQ_ECHO :
sound/core/seq/oss/seq_oss_event.h +2 -1
@@ -91,7 +91,8 @@ union evrec {#define ev_is_long (ev) ((ev)->s.code >= 128)#define ev_length (ev) ((ev)->s.code >= 128 ? LONG_EVENT_SIZE : SHORT_EVENT_SIZE) -int snd_seq_oss_process_event (struct seq_oss_devinfo *dp,union evrec *q,struct snd_seq_event *ev); +int snd_seq_oss_process_event (struct seq_oss_devinfo *dp,union evrec *q, +struct snd_seq_event *ev,snd_use_lock_t **lockp);int snd_seq_oss_process_timer_event (struct seq_oss_timer *rec,union evrec *q);int snd_seq_oss_event_input (struct snd_seq_event *ev,int direct,void *private_data,int atomic,int hop);
sound/core/seq/oss/seq_oss_ioctl.c +4 -1
@@ -45,14 +45,17 @@ static int snd_seq_oss_oob_user(struct seq_oss_devinfo *dp, void __user *arg) {unsigned char ev[8 ];struct snd_seq_event tmpev; +snd_use_lock_t *lock =NULL ;if (copy_from_user (ev, arg,8 ))return -EFAULT ;memset (&tmpev,0 ,sizeof (tmpev));snd_seq_oss_fill_addr (dp, &tmpev, dp->addr.client, dp->addr.port); tmpev.time.tick =0 ; -if (!snd_seq_oss_process_event (dp, (union evrec *)ev, &tmpev)) { +if (!snd_seq_oss_process_event (dp, (union evrec *)ev, &tmpev, &lock)) {snd_seq_oss_dispatch (dp, &tmpev,0 ,0 ); +if (lock) +snd_use_lock_free (lock); }return 0 ; }
sound/core/seq/oss/seq_oss_midi.c +5 -1
@@ -593,7 +593,8 @@ send_midi_event(struct seq_oss_devinfo *dp, struct snd_seq_event *ev, struct seq* non-zero : invalid - ignored */ int -snd_seq_oss_midi_putc (struct seq_oss_devinfo *dp,int dev,unsigned char c,struct snd_seq_event *ev) +snd_seq_oss_midi_putc (struct seq_oss_devinfo *dp,int dev,unsigned char c, +struct snd_seq_event *ev,snd_use_lock_t **lockp) { struct seq_oss_midi *mdev __free(seq_oss_midi) = NULL;
@@ -602,6 +603,9 @@ snd_seq_oss_midi_putc(struct seq_oss_devinfo *dp, int dev, unsigned char c, strureturn -ENODEV ;if (snd_midi_event_encode_byte (mdev->coder, c, ev)) {snd_seq_oss_fill_addr (dp, ev, mdev->client, mdev->port); +/* the caller must release this later */ + *lockp = &mdev->use_lock; +snd_use_lock_use (*lockp);return 0 ; }return -EINVAL ;
sound/core/seq/oss/seq_oss_midi.h +1 -1
@@ -26,7 +26,7 @@ void snd_seq_oss_midi_open_all(struct seq_oss_devinfo *dp, int file_mode);int snd_seq_oss_midi_close (struct seq_oss_devinfo *dp,int dev);void snd_seq_oss_midi_reset (struct seq_oss_devinfo *dp,int dev);int snd_seq_oss_midi_putc (struct seq_oss_devinfo *dp,int dev,unsigned char c, -struct snd_seq_event *ev); +struct snd_seq_event *ev,snd_use_lock_t **lockp);int snd_seq_oss_midi_input (struct snd_seq_event *ev,int direct,void *private);int snd_seq_oss_midi_filemode (struct seq_oss_devinfo *dp,int dev);int snd_seq_oss_midi_make_info (struct seq_oss_devinfo *dp,int dev,struct midi_info *inf);
sound/core/seq/oss/seq_oss_rw.c +4 -1
@@ -153,6 +153,7 @@ insert_queue(struct seq_oss_devinfo *dp, union evrec *rec, struct file *opt) {int rc =0 ;struct snd_seq_event event; +snd_use_lock_t *lock =NULL ;/* if this is a timing event, process the current time */ if (snd_seq_oss_process_timer_event (dp->timer, rec))
@@ -164,7 +165,7 @@ insert_queue(struct seq_oss_devinfo *dp, union evrec *rec, struct file *opt) event.type =SNDRV_SEQ_EVENT_NOTEOFF ;snd_seq_oss_fill_addr (dp, &event, dp->addr.client, dp->addr.port); -if (snd_seq_oss_process_event (dp, rec, &event)) +if (snd_seq_oss_process_event (dp, rec, &event, &lock))return 0 ;/* invalid event - no need to insert queue */ event.time.tick =snd_seq_oss_timer_cur_tick (dp->timer);
@@ -173,6 +174,8 @@ insert_queue(struct seq_oss_devinfo *dp, union evrec *rec, struct file *opt)else rc =snd_seq_kernel_client_enqueue (dp->cseq, &event, opt, !is_nonblock_mode (dp->file_mode)); +if (lock) +snd_use_lock_free (lock);return rc; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 230/1611 ALSA: seq: midi: Serialize output teardown with event_input
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhang Cen <[email protected]>
[ Upstream commit ef7607ab1c8adc6258fb1b27d08e26aecdc18a58 ]
event_process_midi() borrows msynth->output_rfile.output and then passes the substream to dump_midi() and snd_rawmidi_kernel_write() without synchronizing with the output open/close transition. midisynth_use() also publishes output_rfile before snd_rawmidi_output_params() has finished.
The last midisynth_unuse() can therefore release the same rawmidi file and free substream->runtime before snd_rawmidi_kernel_write1() takes its runtime buffer reference. That leaves the event_input path using a stale substream or runtime and can end in a NULL-deref or use-after-free.
Fix this with two pieces of synchronization. Keep a short IRQ-safe spinlock only for publishing or clearing output_rfile and for pairing the output snapshot with an snd_use_lock_t reference. Once event_process_midi() has taken that in-flight reference, it drops the spinlock before calling snd_seq_dump_var_event(), dump_midi(), or snd_rawmidi_kernel_write(). midisynth_unuse() now detaches the visible rawmidi file under the same spinlock, waits for the in-flight writers to drain, and only then drains and releases the saved file. midisynth_use() likewise opens into a local snd_rawmidi_file and publishes it only after snd_rawmidi_output_params() succeeds.
The buggy scenario involves two paths, with each column showing the order within that path:
event_input path: last unuse path:
1. event_process_midi() snapshots 1. midisynth_unuse() starts
output_rfile.output. tearing down output_rfile.
2. dump_midi() reaches 2. snd_rawmidi_kernel_release()
snd_rawmidi_kernel_write() closes the output file.
before runtime is pinned. 3. close_substream() frees
3. The callback keeps using substream->runtime.
the borrowed substream.
Validation reproduced this kernel report:
KASAN null-ptr-deref in snd_rawmidi_kernel_write1+0x56/0x360
RIP: 0033:0x7fde7dd0837f RIP: 0010:snd_rawmidi_kernel_write1+0x56/0x360
--- sound/core/seq/seq_midi.c | 55 +++++++++++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 14 deletions(-)
sound/core/seq/seq_midi.c +41 -14
@@ -24,6 +24,7 @@ Possible options for midisynth module:#include <sound/seq_device.h> #include <sound/seq_midi_event.h> #include <sound/initval.h> +#include "seq_lock.h" MODULE_AUTHOR ("Frank van de Pol <[email protected]>, Jaroslav Kysela <[email protected]>" );MODULE_DESCRIPTION ("Advanced Linux Sound Architecture sequencer MIDI synth." );
@@ -42,6 +43,8 @@ struct seq_midisynth {int device;int subdevice;struct snd_rawmidi_file input_rfile; +spinlock_t output_lock;/* protects output_rfile publication */ +snd_use_lock_t output_use_lock;/* in-flight event_input users */ struct snd_rawmidi_file output_rfile;int seq_client;int seq_port;
@@ -125,31 +128,42 @@ static int event_process_midi(struct snd_seq_event *ev, int direct,struct seq_midisynth *msynth = private_data;unsigned char msg[10 ];/* buffer for constructing midi messages */ struct snd_rawmidi_substream *substream; +int err =0 ;int len;if (snd_BUG_ON (!msynth))return -EINVAL ; - substream = msynth->output_rfile.output; -if (substream ==NULL ) -return -ENODEV ; + + scoped_guard(spinlock_irqsave, &msynth->output_lock) { + substream = msynth->output_rfile.output; +if (!substream) +return -ENODEV ; +snd_use_lock_use (&msynth->output_use_lock); + } +if (ev->type ==SNDRV_SEQ_EVENT_SYSEX ) {/* special case, to save space */ if ((ev->flags &SNDRV_SEQ_EVENT_LENGTH_MASK ) !=SNDRV_SEQ_EVENT_LENGTH_VARIABLE ) {/* invalid event */ pr_debug ("ALSA: seq_midi: invalid sysex event flags = 0x%x\n" , ev->flags); -return 0 ; + goto out; }snd_seq_dump_var_event (ev, __dump_midi, substream);snd_midi_event_reset_decode (msynth->parser); }else { -if (msynth->parser ==NULL ) -return -EIO ; +if (!msynth->parser) { + err = -EIO ; + goto out; + } len =snd_midi_event_decode (msynth->parser, msg,sizeof (msg), ev);if (len <0 ) -return 0 ; + goto out;if (dump_midi (substream, msg, len) <0 )snd_midi_event_reset_decode (msynth->parser); } -return 0 ; + +out: +snd_use_lock_free (&msynth->output_use_lock); +return err; }
@@ -163,6 +177,8 @@ static int snd_seq_midisynth_new(struct seq_midisynth *msynth, msynth->card = card; msynth->device = device; msynth->subdevice = subdevice; +spin_lock_init (&msynth->output_lock); +snd_use_lock_init (&msynth->output_use_lock);return 0 ; }
@@ -215,12 +231,13 @@ static int midisynth_use(void *private_data, struct snd_seq_port_subscribe *info {int err;struct seq_midisynth *msynth = private_data; +struct snd_rawmidi_file rfile = {};struct snd_rawmidi_params params;/* open midi port */ err =snd_rawmidi_kernel_open (msynth->rmidi, msynth->subdevice,SNDRV_RAWMIDI_LFLG_OUTPUT , - &msynth->output_rfile); + &rfile);if (err <0 ) {pr_debug ("ALSA: seq_midi: midi output open failed!!!\n" );return err;
@@ -229,12 +246,14 @@ static int midisynth_use(void *private_data, struct snd_seq_port_subscribe *info params.avail_min =1 ; params.buffer_size = output_buffer_size; params.no_active_sensing =1 ; - err =snd_rawmidi_output_params (msynth->output_rfile.output, ¶ms); + err =snd_rawmidi_output_params (rfile.output, ¶ms);if (err <0 ) { -snd_rawmidi_kernel_release (&msynth->output_rfile); +snd_rawmidi_kernel_release (&rfile);return err; }snd_midi_event_reset_decode (msynth->parser); +scoped_guard (spinlock_irqsave, &msynth->output_lock) + msynth->output_rfile = rfile;return 0 ; }
@@ -242,11 +261,19 @@ static int midisynth_use(void *private_data, struct snd_seq_port_subscribe *infostatic int midisynth_unuse (void *private_data,struct snd_seq_port_subscribe *info) {struct seq_midisynth *msynth = private_data; +struct snd_rawmidi_file rfile = {}; -if (snd_BUG_ON (!msynth->output_rfile.output)) + scoped_guard(spinlock_irqsave, &msynth->output_lock) { + rfile = msynth->output_rfile; + msynth->output_rfile = (struct snd_rawmidi_file ){}; + } + +if (snd_BUG_ON (!rfile.output))return -EINVAL ; -snd_rawmidi_drain_output (msynth->output_rfile.output); -return snd_rawmidi_kernel_release (&msynth->output_rfile); + +snd_use_lock_sync (&msynth->output_use_lock); +snd_rawmidi_drain_output (rfile.output); +return snd_rawmidi_kernel_release (&rfile); }/* delete given midi synth port */
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 231/1611 selftests: Fix Makefile target for nsfs
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Schmaus <[email protected]>
[ Upstream commit 77d1a2d2318fa96f8a662c9ad6647abedcd22734 ]
The kselftests for nsfs where moved under filesystem/ with commit cae73d3bdce5 ("seltests: move nsfs into filesystems subfolder"). However, the kselftest TARGETS declaration was not adjusted.
Since the kselftest Makefile ignores errors unless no target builds, the invalid target declaration can easily be missed.
Fix this by adjusting the TARGETS accordingly.
--- tools/testing/selftests/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/Makefile +1 -1
@@ -36,6 +36,7 @@ TARGETS += filesystems/fat TARGETS += filesystems/overlayfs TARGETS += filesystems/statmount TARGETS += filesystems/mount-notify +TARGETS += filesystems/nsfs TARGETS += filesystems/fuse TARGETS += firmware TARGETS += fpu
@@ -79,7 +80,6 @@ TARGETS += net/packetdrill TARGETS += net/rds TARGETS += net/tcp_ao TARGETS += nolibc -TARGETS += nsfs TARGETS += pci_endpoint TARGETS += pcie_bwctrl TARGETS += perf_events
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 232/1611 pinctrl: nuvoton: ma35d1: fix MFP register offset and pin table
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joey Lu <[email protected]>
[ Upstream commit ce4e27247ca643645c6d3043aad1c1c67bf7fdac ]
Each GPIO bank has two 32-bit MFP registers: MFPL covering pins 0-7 at the bank base offset, and MFPH covering pins 8-15 at base offset+4. ma35_pinctrl_parse_groups() computed the register address without accounting for this split, so any pin with an index >= 8 within its bank was written to the wrong register.
Also fix the pin descriptor table in pinctrl-ma35d1.c: switch from sequential to 16-per-bank pin numbering, add missing PC8-PC11 pins and their mux options, and remove the duplicate PN10-PN15 entries.
--- drivers/pinctrl/nuvoton/pinctrl-ma35.c | 3 +- drivers/pinctrl/nuvoton/pinctrl-ma35d1.c | 470 +++++++++++++---------- 2 files changed, 263 insertions(+), 210 deletions(-)
drivers/pinctrl/nuvoton/pinctrl-ma35.c +2 -1
@@ -1018,7 +1018,8 @@ static int ma35_pinctrl_parse_groups(struct fwnode_handle *fwnode, struct group_ grp->data = pin;for (i =0 , j =0 ; i < count; i +=3 , j++) { - pin->offset = elems[i] *MA35_MFP_REG_SZ_PER_BANK +MA35_MFP_REG_BASE ; + pin->offset = elems[i] *MA35_MFP_REG_SZ_PER_BANK +MA35_MFP_REG_BASE + + (elems[i +1 ] >=8 ?4 :0 ); pin->shift = (elems[i +1 ] *MA35_MFP_BITS_PER_PORT ) %32 ; pin->muxval = elems[i +2 ]; pin->configs = configs;
drivers/pinctrl/nuvoton/pinctrl-ma35d1.c +261 -209
1,510 lines not on this page · raw message
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 233/1611 pinctrl: cs42l43: Fix leaked pm reference on error path
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Charles Keepax <[email protected]>
[ Upstream commit 1cb73b83ab6dec8159d0280345a46fbb282c378f ]
Returning directly if the regmap_update_bits() fails causes a pm runtime reference to be leaked, let things run to the end of the function instead.
--- drivers/pinctrl/cirrus/pinctrl-cs42l43.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/pinctrl/cirrus/pinctrl-cs42l43.c +1 -3
@@ -499,12 +499,10 @@ static int cs42l43_gpio_set(struct gpio_chip *chip, unsigned int offset, ret =regmap_update_bits (priv->regmap,CS42L43_GPIO_CTRL1 ,BIT (shift), value << shift); -if (ret) -return ret;pm_runtime_put (priv->dev); -return 0 ; +return ret; } static int cs42l43_gpio_direction_out(struct gpio_chip *chip,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 234/1611 pinctrl: cs42l43: Fix polarity on debounce
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Charles Keepax <[email protected]>
[ Upstream commit 9da52ee80aee3ab3c69208bd1cfbb4be01371214 ]
The debounce bit sets a bypass on the debounce rather than enabling it, as such the current polarity of the debounce is set incorrectly. Invert the polarity to correct this.
--- drivers/pinctrl/cirrus/pinctrl-cs42l43.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/cirrus/pinctrl-cs42l43.c +1 -1
@@ -343,7 +343,7 @@ static int cs42l43_pin_set_db(struct cs42l43_pin *priv, unsigned int pin,return regmap_update_bits (priv->regmap,CS42L43_GPIO_CTRL2 ,CS42L43_GPIO1_DEGLITCH_BYP_MASK << pin, - !!us << pin); + !us << pin); } static int cs42l43_pin_config_get(struct pinctrl_dev *pctldev,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 235/1611 init/initramfs_test: wait_for_initramfs() before running
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jia He <[email protected]>
[ Upstream commit ec3f4e0443a61e68092ac07111f16dd4ca89ddb4 ]
initramfs_test_extract() and friends call unpack_to_rootfs() from a kunit kthread while do_populate_rootfs() may still be running asynchronously from rootfs_initcall. unpack_to_rootfs() keeps its parser state in module-static variables (victim, byte_count, state, this_header, header_buf, name_buf, ...), so the two writers corrupt each other.
On arm64 v7.0-rc5+ this oopses early in boot:
Unable to handle kernel paging request at virtual address ffff80018f9f0ffc pc : do_reset+0x3c/0x98 Call trace: do_reset initramfs_test_extract kunit_try_run_case Initramfs unpacking failed: junk within compressed archive
do_reset() faults because 'victim' was overwritten by the boot-time unpacker; the boot unpacker meanwhile logs the bogus "junk within compressed archive" on the real initrd because the test wrecked its state machine.
Add a .suite_init callback that calls wait_for_initramfs() so the async unpack is quiescent before the first case runs. suite_init runs once per suite rather than before every individual test case.
--- init/initramfs_test.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
init/initramfs_test.c +16 -1
@@ -3,7 +3,9 @@#include <linux/fcntl.h> #include <linux/file.h> #include <linux/fs.h> +#include <linux/init.h> #include <linux/init_syscalls.h> +#include <linux/initrd.h> #include <linux/stringify.h> #include <linux/timekeeping.h> #include "initramfs_internal.h"
@@ -462,8 +464,21 @@ static struct kunit_case __refdata initramfs_test_cases[] = { {}, }; -static struct kunit_suite initramfs_test_suite = { +static int __init initramfs_test_init (struct kunit_suite *suite) +{ +/* +* unpack_to_rootfs() uses module-static state (victim, byte_count, +* state, ...). The boot-time async do_populate_rootfs() may still be +* running, so wait for it to finish before we call unpack_to_rootfs() +* from the test thread, otherwise the two writers race and crash. +*/ +wait_for_initramfs (); +return 0 ; +} + +static struct kunit_suite __refdata initramfs_test_suite = { .name ="initramfs" , + .suite_init = initramfs_test_init, .test_cases = initramfs_test_cases, };kunit_test_init_section_suites (&initramfs_test_suite);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 236/1611 nvmet-tcp: fix page fragment cache leak in error path
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geliang Tang <[email protected]>
[ Upstream commit 4dae393956093c807212918fd91a8fc70df15338 ]
In nvmet_tcp_alloc_queue(), when a connection is closed during the allocation process (e.g., nvmet_tcp_set_queue_sock() returns -ENOTCONN), the error handling jumps to out_destroy_sq and then to out_ida_remove without draining the page fragment cache.
Although nvmet_tcp_free_cmd() is called in some error paths to release individual page fragments, the underlying page cache reference held by queue->pf_cache is never released. The first allocation using pf_cache is the call to nvmet_tcp_alloc_cmd() for queue->connect, which happens after ida_alloc() returns successfully. This results in a page leak each time a connection fails during allocation, which could lead to memory exhaustion over time if connections are repeatedly opened and closed.
Fix this by calling page_frag_cache_drain() before freeing the queue structure in the out_ida_remove label.
--- drivers/nvme/target/tcp.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/nvme/target/tcp.c +6 -0
@@ -2023,6 +2023,12 @@ static void nvmet_tcp_alloc_queue(struct nvmet_tcp_port *port,nvmet_tcp_free_cmd (&queue->connect); out_ida_remove:ida_free (&nvmet_tcp_queue_ida, queue->idx); +/* +* Drain the page fragment cache if any allocations were done. +* The first allocation using pf_cache is nvmet_tcp_alloc_cmd() +* for queue->connect after ida_alloc(). +*/ +page_frag_cache_drain (&queue->pf_cache); out_sock:fput (queue->sock->file); out_free_queue:
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 237/1611 nvmet-tcp: check return value of nvmet_tcp_set_queue_sock
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geliang Tang <[email protected]>
[ Upstream commit 7ef789703e2b91775dcb36b2efa46325be31a2a0 ]
The return value of nvmet_tcp_set_queue_sock() is currently ignored in nvmet_tcp_tls_handshake_done(). If it fails (e.g., due to the socket not being in TCP_ESTABLISHED state), the socket callbacks will not be properly set, leading to queue and socket leakage.
Fix this by capturing the return value and calling nvmet_tcp_schedule_release_queue() on failure to ensure proper cleanup.
--- drivers/nvme/target/tcp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/nvme/target/tcp.c +3 -2
@@ -1868,10 +1868,11 @@ static void nvmet_tcp_tls_handshake_done(void *data, int status,if (!status) status =nvmet_tcp_tls_key_lookup (queue, peerid); +if (!status) + status =nvmet_tcp_set_queue_sock (queue); +if (status)nvmet_tcp_schedule_release_queue (queue); -else -nvmet_tcp_set_queue_sock (queue);kref_put (&queue->kref, nvmet_tcp_release_queue); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 238/1611 nvme-multipath: fix flex array size in struct nvme_ns_head
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nilay Shroff <[email protected]>
[ Upstream commit 001e57554de81aa79c25c18fd53911d8a415c304 ]
struct nvme_ns_head contains a flexible array member, current_path[], which is indexed using the NUMA node ID:
head->current_path[numa_node_id()]
The structure is currently allocated as:
size = sizeof(struct nvme_ns_head) +
(num_possible_nodes() * sizeof(struct nvme_ns *));
head = kzalloc(size, GFP_KERNEL);
This allocation assumes that NUMA node IDs are sequential and densely packed from 0 .. num_possible_nodes() - 1. While this assumption holds on many systems, it is not always true on some architectures such as powerpc.
On some powerpc systems, NUMA node IDs can be sparse. For example:
NUMA:
NUMA node(s): 6 NUMA node0 CPU(s): 80-159 NUMA node8 CPU(s): 0-79
NUMA node252 CPU(s):
NUMA node253 CPU(s):
NUMA node254 CPU(s):
NUMA node255 CPU(s):
That is, the possible/online NUMA node IDs are: 0, 8, 252, 253, 254, 255 In this case: num_possible_nodes() = 6
So memory is allocated for only 6 entries in current_path[]. However, the array is later indexed using the actual NUMA node ID. As a result, accesses such as:
head->current_path[8] or
head->current_path[252]
goes out of bounds, leading to the following KASAN splat:
==================================================================
BUG: KASAN: slab-out-of-bounds in nvme_mpath_revalidate_paths+0x22c/0x290 [nvme_core] Write of size 8 at addr c00020003bda35b8 by task kworker/u641:2/1997 CPU: 1 UID: 0 PID: 1997 Comm: kworker/u641:2 Not tainted 7.1.0-rc5-dirty #14 PREEMPT(lazy) Hardware name: 8335-GTH POWER9 0x4e1202 opal:skiboot-v6.5.3-35-g1851b2a06 PowerNV Workqueue: async async_run_entry_fn Call Trace: [c000200037fa7510] [c0000000021c23d4] dump_stack_lvl+0x88/0xdc (unreliable) [c000200037fa7540] [c0000000009fda90] print_report+0x22c/0x67c [c000200037fa7630] [c0000000009fd508] kasan_report+0x108/0x220 [c000200037fa7740] [c0000000009fff48] __asan_store8+0xe8/0x120 [c000200037fa7760] [c008000018e76474] nvme_mpath_revalidate_paths+0x22c/0x290 [nvme_core] [c000200037fa7800] [c008000018e6556c] nvme_update_ns_info+0x4a4/0x5e0 [nvme_core] [c000200037fa7a50] [c008000018e66270] nvme_alloc_ns+0x6d8/0x1a70 [nvme_core] [c000200037fa7c20] [c008000018e679fc] nvme_scan_ns+0x3f4/0x630 [nvme_core] [c000200037fa7d10] [c00000000031f22c] async_run_entry_fn+0x9c/0x3a0 [c000200037fa7db0] [c0000000002fa544] process_one_work+0x414/0xa10 [c000200037fa7ec0] [c0000000002fbf00] worker_thread+0x320/0x640 [c000200037fa7f80] [c00000000030d0f8] kthread+0x278/0x290 [c000200037fa7fe0] [c00000000000ded8] start_kernel_thread+0x14/0x18 Allocated by task 1997 on cpu 1 at 35.928317s: The buggy address belongs to the object at c00020003bda3000 which belongs to the cache kmalloc-rnd-15-2k of size 2048
The buggy address is located 16 bytes to the right of
allocated 1448-byte region [c00020003bda3000, c00020003bda35a8)
The buggy address belongs to the physical page:
Memory state around the buggy address:
c00020003bda3480: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
c00020003bda3500: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
>c00020003bda3580: 00 00 00 00 00 fc fc fc fc fc fc fc fc fc fc fc
^
c00020003bda3600: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
c00020003bda3680: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
==================================================================Fix this by allocating the flexible array using nr_node_ids instead of num_possible_nodes(). Since nr_node_ids represents the maximum possible NUMA node IDs, indexing current_path[] using numa_node_id() becomes safe even on systems with sparse node IDs.
--- drivers/nvme/host/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvme/host/core.c +1 -1
@@ -3890,7 +3890,7 @@ static struct nvme_ns_head *nvme_alloc_ns_head(struct nvme_ctrl *ctrl,int ret = -ENOMEM ;#ifdef CONFIG_NVME_MULTIPATH - size +=num_possible_nodes () *sizeof (struct nvme_ns *); + size += nr_node_ids *sizeof (struct nvme_ns *);#endif head =kzalloc (size,GFP_KERNEL );
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 239/1611 nvme-pci: fix out-of-bounds access in nvme_setup_descriptor_pools
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mateusz Nowicki <[email protected]>
[ Upstream commit a192b8cfa447e1b3701a13434a31c392b2e7ed29 ]
nvme_setup_descriptor_pools() indexes dev->descriptor_pools[] using the numa_node forwarded from hctx->numa_node by its single caller, nvme_init_hctx_common(). On a non-NUMA kernel hctx->numa_node is NUMA_NO_NODE (-1). Because the parameter was declared 'unsigned', the value becomes UINT_MAX and the index walks off the array (sized to nr_node_ids), faulting during nvme_alloc_ns() and leaving the namespace without a /dev node.
Reproduces on any NVMe controller probed by a CONFIG_NUMA=n kernel:
BUG: unable to handle page fault for address: ffff889101603d38 RIP: 0010:nvme_init_hctx_common+0x5a/0x190 [nvme] Call Trace: nvme_init_hctx+0x10/0x20 [nvme] nvme_alloc_ns+0x9e/0xa10 [nvme_core] nvme_scan_ns+0x301/0x3b0 [nvme_core] nvme_scan_ns_async+0x23/0x30 [nvme_core]
Switch the parameter to int and fall back to node 0 when it is NUMA_NO_NODE; node 0 is always present.
--- drivers/nvme/host/pci.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/nvme/host/pci.c +7 -2
@@ -431,11 +431,16 @@ static bool nvme_dbbuf_update_and_check_event(u16 value, __le32 *dbbuf_db, }static struct nvme_descriptor_pools * -nvme_setup_descriptor_pools (struct nvme_dev *dev,unsigned numa_node) +nvme_setup_descriptor_pools (struct nvme_dev *dev,int numa_node) { -struct nvme_descriptor_pools *pools = &dev->descriptor_pools[numa_node]; +struct nvme_descriptor_pools *pools;size_t small_align =NVME_SMALL_POOL_SIZE ; +if (numa_node ==NUMA_NO_NODE ) + numa_node =0 ; + + pools = &dev->descriptor_pools[numa_node]; +if (pools->small)return pools;/* already initialized */
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 240/1611 workqueue: drop spurious * from print_worker_info() fn declaration
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Breno Leitao <[email protected]>
[ Upstream commit 611583a76ea97991b0f65ec1ff099eac7fe0bae4 ]
print_worker_info() declares its local 'fn' as work_func_t * but worker->current_func has type work_func_t (a function pointer). The extra level of indirection is wrong and only happens to be harmless today because every supported Linux architecture has sizeof(work_func_t) == sizeof(work_func_t *):copy_from_kernel_nofault() reads the correct number of bytes by accident, and %ps still resolves the printed address because the stored value is the function address regardless of declared type.
On any future ABI where sizeof(void (*)()) differs from sizeof(void *), the nofault copy would transfer the wrong number of bytes and the subsequent %ps would print an incorrect address.
Match the field type so the intent is explicit and the code does not silently rely on equal pointer sizes.
--- kernel/workqueue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/workqueue.c +1 -1
@@ -6232,7 +6232,7 @@ EXPORT_SYMBOL_GPL(set_worker_desc);*/ void print_worker_info (const char *log_lvl,struct task_struct *task) { -work_func_t *fn =NULL ; +work_func_t fn =NULL ;char name[WQ_NAME_LEN ] = { };char desc[WORKER_DESC_LEN ] = { };struct pool_workqueue *pwq =NULL ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 241/1611 ipv6: guard against possible NULL deref in __in6_dev_stats_get()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 507541c2a8eeb76c02bd2511958f73a8cfa3e1bc ]
dev_get_by_index_rcu() could return NULL if the original physical device is unregistered.
Found by Sashiko.
--- include/net/addrconf.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
include/net/addrconf.h +4 -1
@@ -363,8 +363,11 @@ static inline struct inet6_dev *__in6_dev_get_rtnl_net(const struct net_device *static inline struct inet6_dev *__in6_dev_stats_get (const struct net_device *dev,const struct sk_buff *skb) { -if (netif_is_l3_master (dev)) +if (netif_is_l3_master (dev)) { dev =dev_get_by_index_rcu (dev_net (dev),inet6_iif (skb)); +if (!dev) +return NULL ; + }return __in6_dev_get (dev); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 242/1611 net/sched: cls_bpf: prevent unbounded recursion in offload rollback
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiayuan Chen <[email protected]>
[ Upstream commit 27db54b90bcc7c37867fe664107fa25ea6a116e4 ]
Quan Sun reported [1] a stack overflow in cls_bpf_offload_cmd().
Reproducer on netdevsim: add a skip_sw cls_bpf filter, set the bpf_tc_accept debugfs knob to 0, then tc filter replace. The replace calls tc_setup_cb_replace() which fails. cls_bpf_offload_cmd() then swaps prog/oldprog and recursively calls itself to roll back. But bpf_tc_accept=0 makes the rollback fail too, which triggers yet another rollback frame with the same arguments, and so on until the stack is exhausted.
bpf_tc_accept is just a convenient knob for the reproducer. Any driver whose tc_setup_cb_replace() fails twice in a row can hit the same loop, so this is not a netdevsim-only issue.
Two ways to fix it:
1) Have the rollback call tc_setup_cb_add() on oldprog instead of re-entering cls_bpf_offload_cmd().
2) Mark the rollback frame with a flag and skip a second-level rollback from inside it.
Go with (2). It is the smaller change and keeps the original behaviour:
the rollback still goes through tc_setup_cb_replace(), so the driver gets one real chance to restore its state. If that attempt also fails, we just return the original error instead of recursing.
[1]: https://lore.kernel.org/bpf/[email protected]/T/#u
--- net/sched/cls_bpf.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
net/sched/cls_bpf.c +6 -4
@@ -142,7 +142,8 @@ static bool cls_bpf_is_ebpf(const struct cls_bpf_prog *prog)static int cls_bpf_offload_cmd (struct tcf_proto *tp,struct cls_bpf_prog *prog,struct cls_bpf_prog *oldprog, -struct netlink_ext_ack *extack) +struct netlink_ext_ack *extack, +bool is_rollback) {struct tcf_block *block = tp->chain->block;struct tc_cls_bpf_offload cls_bpf = {};
@@ -177,7 +178,8 @@ static int cls_bpf_offload_cmd(struct tcf_proto *tp, struct cls_bpf_prog *prog, &oldprog->in_hw_count, true);if (prog && err) { -cls_bpf_offload_cmd (tp, oldprog, prog, extack); +if (!is_rollback) +cls_bpf_offload_cmd (tp, oldprog, prog, extack, true);return err; }
@@ -208,7 +210,7 @@ static int cls_bpf_offload(struct tcf_proto *tp, struct cls_bpf_prog *prog,if (!prog && !oldprog)return 0 ; -return cls_bpf_offload_cmd (tp, prog, oldprog, extack); +return cls_bpf_offload_cmd (tp, prog, oldprog, extack, false); } static void cls_bpf_stop_offload(struct tcf_proto *tp,
@@ -217,7 +219,7 @@ static void cls_bpf_stop_offload(struct tcf_proto *tp, {int err; - err =cls_bpf_offload_cmd (tp,NULL , prog, extack); + err =cls_bpf_offload_cmd (tp,NULL , prog, extack, false);if (err)pr_err ("Stopping hardware offload failed: %d\n" , err); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 243/1611 iommu/amd: Fix premature break in init_iommu_one()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vasant Hegde <[email protected]>
[ Upstream commit 283d245468a2b61c41aa8b582f25ed5615d1c304 ]
In init_iommu_one(), when processing IOMMU EFR attributes, the code checks whether GASUP is enabled. If GASUP is not enabled, the code falls back to legacy guest IR mode and then breaks out of the switch statement.
This break incorrectly skips the subsequent initialization steps that follow the GASUP check. These initializations are independent of GASUP support and must always be performed.
Fix this by replacing the early break with a conditional else block, ensuring that the XTSUP check is only skipped when GASUP is not available.
--- drivers/iommu/amd/init.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/iommu/amd/init.c +3 -4
@@ -1933,12 +1933,11 @@ static int __init init_iommu_one(struct amd_iommu *iommu, struct ivhd_header *h,/* XT and GAM require GA mode. */ if ((h->efr_reg & (0x1 <<IOMMU_EFR_GASUP_SHIFT )) ==0 ) { amd_iommu_guest_ir =AMD_IOMMU_GUEST_IR_LEGACY ; -break ; + }else { +if (h->efr_reg &BIT (IOMMU_EFR_XTSUP_SHIFT )) + amd_iommu_xt_mode =IRQ_REMAP_X2APIC_MODE ; } -if (h->efr_reg &BIT (IOMMU_EFR_XTSUP_SHIFT )) - amd_iommu_xt_mode =IRQ_REMAP_X2APIC_MODE ; -if (h->efr_attr &BIT (IOMMU_IVHD_ATTR_HATDIS_SHIFT )) {pr_warn_once ("Host Address Translation is not supported.\n" ); amd_iommu_hatdis = true;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 244/1611 rtla: Introduce for_each_action() helper
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wander Lairson Costa <[email protected]>
[ Upstream commit 648634d17c813b35da775982662e56ea8ce750de ]
The for loop to iterate over the list of actions is used in more than one place. To avoid code duplication and improve readability, introduce a for_each_action() helper macro.
Replace the open-coded for loops with the new helper.
Stable-dep-of: dd520daffbc9 ("rtla/actions: Restore continue flag in actions_perform()")
--- tools/tracing/rtla/src/actions.c | 6 ++++-- tools/tracing/rtla/src/actions.h | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-)
tools/tracing/rtla/src/actions.c +4 -2
@@ -32,7 +32,9 @@ void actions_destroy(struct actions *self) {/* Free any action-specific data */ -for (struct action *action = self->list; action < self->list + self->len; action++) { +struct action *action; + +for_each_action (self, action) {if (action->type ==ACTION_SHELL )free (action->command);if (action->type ==ACTION_TRACE_OUTPUT )
@@ -226,7 +228,7 @@ actions_perform(struct actions *self)int pid, retval;const struct action *action; -for (action = self->list; action < self->list + self->len; action++) { +for_each_action (self, action) {switch (action->type) {case ACTION_TRACE_OUTPUT : retval =save_trace_to_file (self->trace_output_inst, action->trace_output);
tools/tracing/rtla/src/actions.h +5 -0
@@ -42,6 +42,11 @@ struct actions {struct tracefs_instance *trace_output_inst; }; +#define for_each_action (actions, action) \ + for ((action) = (actions)->list; \ + (action) < (actions)->list + (actions)->len; \ + (action)++) +void actions_init (struct actions *self);void actions_destroy (struct actions *self);int actions_add_trace_output (struct actions *self,const char *trace_output);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 245/1611 rtla/actions: Restore continue flag in actions_perform()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomas Glozar <[email protected]>
[ Upstream commit dd520daffbc901f10d49a51a58313547d417b506 ]
Currently, actions_perform() only ever sets the continue flag (when performing the continue action), but never resets it. That leads to RTLA continuing tracing even if the continue action was not performed in the current iteration.
For example, the following command:
$ rtla timerlat hist -T 100 --on-threshold shell,command='
echo Spike!
if [ -f /tmp/a ]
then
exit 1
else
touch /tmp/a
fi' --on-threshold continueshould print Spike! at most once, because after hitting the threshold for the first time, /tmp/a exists, the shell action will fail, and the continue action is not performed. However, unless /tmp/a exists before the measurement, it will print Spike! until stopped, as the continue flag stays set.
Set the continue flag to false in the beginning of actions_perform() to make RTLA continue only if the action was actually performed.
--- tools/tracing/rtla/src/actions.c | 2 ++ 1 file changed, 2 insertions(+)
tools/tracing/rtla/src/actions.c +2 -0
@@ -228,6 +228,8 @@ actions_perform(struct actions *self)int pid, retval;const struct action *action; + self->continue_flag = false; +for_each_action (self, action) {switch (action->type) {case ACTION_TRACE_OUTPUT :
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 246/1611 drm/tegra: gr2d/gr3d: Initialize address register map before HOST1X client is registered
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Svyatoslav Ryhel <[email protected]>
[ Upstream commit c4ef5ba1131346159e31f4ef858525cf377380a6 ]
The host1x_client_register() function is called just prior to register map initialization loop, making the device available to userspace. This may result in userspace attempting to submits a job before the register map is initialized. Address this by moving register initialization before host1x client registration.
Stable-dep-of: ace01e2af387 ("drm/tegra: gr2d/gr3d: Contain PM in the gr*d_probe/gr*d_remove")
--- drivers/gpu/drm/tegra/gr2d.c | 8 ++++---- drivers/gpu/drm/tegra/gr3d.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/tegra/gr2d.c +4 -4
@@ -276,16 +276,16 @@ static int gr2d_probe(struct platform_device *pdev)if (err)return err; +/* initialize address register map */ +for (i =0 ; i <ARRAY_SIZE (gr2d_addr_regs); i++) +set_bit (gr2d_addr_regs[i], gr2d->addr_regs); + err =host1x_client_register (&gr2d->client.base);if (err <0 ) {dev_err (dev,"failed to register host1x client: %d\n" , err);return err; } -/* initialize address register map */ -for (i =0 ; i <ARRAY_SIZE (gr2d_addr_regs); i++) -set_bit (gr2d_addr_regs[i], gr2d->addr_regs); -return 0 ; }
drivers/gpu/drm/tegra/gr3d.c +4 -4
@@ -506,6 +506,10 @@ static int gr3d_probe(struct platform_device *pdev)if (err)return err; +/* initialize address register map */ +for (i =0 ; i <ARRAY_SIZE (gr3d_addr_regs); i++) +set_bit (gr3d_addr_regs[i], gr3d->addr_regs); + err =host1x_client_register (&gr3d->client.base);if (err <0 ) { dev_err(&pdev->dev, "failed to register host1x client: %d\n",
@@ -513,10 +517,6 @@ static int gr3d_probe(struct platform_device *pdev)return err; } -/* initialize address register map */ -for (i =0 ; i <ARRAY_SIZE (gr3d_addr_regs); i++) -set_bit (gr3d_addr_regs[i], gr3d->addr_regs); -return 0 ; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 247/1611 drm/tegra: gr2d/gr3d: Contain PM in the gr*d_probe/gr*d_remove
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ion Agorria <[email protected]>
[ Upstream commit ace01e2af3871343d700fb60c6f64d8f8e3180e1 ]
The current power management configuration causes GR2G/GR3D to malfunction after resume. Reconfigure all PM actions to be handled within the GR*D probe and remove operations to address this.
--- drivers/gpu/drm/tegra/gr2d.c | 13 ++++++------- drivers/gpu/drm/tegra/gr3d.c | 13 ++++++------- 2 files changed, 12 insertions(+), 14 deletions(-)
drivers/gpu/drm/tegra/gr2d.c +6 -7
@@ -100,9 +100,6 @@ static int gr2d_exit(struct host1x_client *client)if (err <0 )return err; -pm_runtime_dont_use_autosuspend (client->dev); -pm_runtime_force_suspend (client->dev); -host1x_client_iommu_detach (client);host1x_syncpt_put (client->syncpts[0 ]);host1x_channel_put (gr2d->channel);
@@ -280,12 +277,18 @@ static int gr2d_probe(struct platform_device *pdev)for (i =0 ; i <ARRAY_SIZE (gr2d_addr_regs); i++)set_bit (gr2d_addr_regs[i], gr2d->addr_regs); +pm_runtime_enable (dev); + err =host1x_client_register (&gr2d->client.base);if (err <0 ) { +pm_runtime_disable (dev);dev_err (dev,"failed to register host1x client: %d\n" , err);return err; } +pm_runtime_use_autosuspend (dev); +pm_runtime_set_autosuspend_delay (dev,500 ); +return 0 ; }
@@ -367,10 +370,6 @@ static int __maybe_unused gr2d_runtime_resume(struct device *dev) goto disable_clk; } -pm_runtime_enable (dev); -pm_runtime_use_autosuspend (dev); -pm_runtime_set_autosuspend_delay (dev,500 ); -return 0 ; disable_clk:
drivers/gpu/drm/tegra/gr3d.c +6 -7
@@ -109,9 +109,6 @@ static int gr3d_exit(struct host1x_client *client)if (err <0 )return err; -pm_runtime_dont_use_autosuspend (client->dev); -pm_runtime_force_suspend (client->dev); -host1x_client_iommu_detach (client);host1x_syncpt_put (client->syncpts[0 ]);host1x_channel_put (gr3d->channel);
@@ -510,13 +507,19 @@ static int gr3d_probe(struct platform_device *pdev)for (i =0 ; i <ARRAY_SIZE (gr3d_addr_regs); i++)set_bit (gr3d_addr_regs[i], gr3d->addr_regs); +pm_runtime_enable (&pdev->dev); + err =host1x_client_register (&gr3d->client.base);if (err <0 ) { +pm_runtime_disable (&pdev->dev);dev_err (&pdev->dev,"failed to register host1x client: %d\n" , err);return err; } +pm_runtime_use_autosuspend (&pdev->dev); +pm_runtime_set_autosuspend_delay (&pdev->dev,500 ); +return 0 ; }
@@ -578,10 +581,6 @@ static int __maybe_unused gr3d_runtime_resume(struct device *dev) goto disable_clk; } -pm_runtime_enable (dev); -pm_runtime_use_autosuspend (dev); -pm_runtime_set_autosuspend_delay (dev,500 ); -return 0 ; disable_clk:
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 248/1611 gpu: host1x: Allow entries in BO caches to be freed
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mikko Perttunen <[email protected]>
[ Upstream commit 3cbf5e3c46e66d9b3b6b91099bb720c6cb1be3bc ]
When a buffer object is pinned via host1x_bo_pin() with a cache, the resulting mapping is kept in the cache so it can be reused on subsequent pins. Each mapping held a reference to the underlying host1x_bo (taken in tegra_bo_pin / gather_bo_pin), so as long as a mapping was cached, the bo itself could not be freed.
However, the only way to remove the cached mapping was through the free path of the buffer object. This meant that if a bo got cached, it could never get freed again.
Resolve the circularity by holding a weak reference to the bo from the cache side. This is done by having the .pin callbacks not bump the bo's refcount -- instead the common Host1x bo code does so, except for the cache reference.
Also move the remove-cache-mapping-on-free code into a common function inside Host1x code. This is only called from the TegraDRM GEM buffers since those are the only ones that can be cached at the moment.
--- drivers/gpu/drm/tegra/gem.c | 13 ++------ drivers/gpu/drm/tegra/submit.c | 3 +- drivers/gpu/host1x/bus.c | 60 +++++++++++++++++++++++++++++++++- include/linux/host1x.h | 7 ++++ 4 files changed, 69 insertions(+), 14 deletions(-)
drivers/gpu/drm/tegra/gem.c +2 -11
@@ -68,7 +68,7 @@ static struct host1x_bo_mapping *tegra_bo_pin(struct device *dev, struct host1x_return ERR_PTR (-ENOMEM );kref_init (&map->ref); - map->bo =host1x_bo_get (bo); + map->bo = bo; map->direction = direction; map->dev = dev;
@@ -169,7 +169,6 @@ static void tegra_bo_unpin(struct host1x_bo_mapping *map)kfree (map->sgt); } -host1x_bo_put (map->bo);kfree (map); }
@@ -508,17 +507,9 @@ static struct tegra_bo *tegra_bo_import(struct drm_device *drm,void tegra_bo_free_object (struct drm_gem_object *gem) {struct tegra_drm *tegra = gem->dev->dev_private; -struct host1x_bo_mapping *mapping, *tmp;struct tegra_bo *bo =to_tegra_bo (gem); -/* remove all mappings of this buffer object from any caches */ -list_for_each_entry_safe (mapping, tmp, &bo->base.mappings, list) { -if (mapping->cache) -host1x_bo_unpin (mapping); -else -dev_err (gem->dev->dev,"mapping %p stale for device %s\n" , mapping, -dev_name (mapping->dev)); - } +host1x_bo_clear_cached_mappings (&bo->base);if (tegra->domain) {tegra_bo_iommu_unmap (tegra, bo);
drivers/gpu/drm/tegra/submit.c +1 -2
@@ -76,7 +76,7 @@ gather_bo_pin(struct device *dev, struct host1x_bo *bo, enum dma_data_directionreturn ERR_PTR (-ENOMEM );kref_init (&map->ref); - map->bo =host1x_bo_get (bo); + map->bo = bo; map->direction = direction; map->dev = dev;
@@ -117,7 +117,6 @@ static void gather_bo_unpin(struct host1x_bo_mapping *map)dma_unmap_sgtable (map->dev, map->sgt, map->direction,0 );sg_free_table (map->sgt);kfree (map->sgt); -host1x_bo_put (map->bo);kfree (map); }
drivers/gpu/host1x/bus.c +59 -1
98 lines not on this page · raw message
include/linux/host1x.h +7 -0
@@ -143,6 +143,12 @@ static inline struct host1x_bo_mapping *to_host1x_bo_mapping(struct kref *ref) return container_of(ref, struct host1x_bo_mapping, ref); } +/** +* struct host1x_bo_ops - operations implemented by a host1x_bo provider +* +* @pin: create a DMA mapping. Implementation must not touch the bo's refcount. +* @unpin: destroy a DMA mapping. Implementation must not touch the bo's refcount. +*/ struct host1x_bo_ops {struct host1x_bo *(*get)(struct host1x_bo *bo);void (*put)(struct host1x_bo *bo);
@@ -181,6 +187,7 @@ struct host1x_bo_mapping *host1x_bo_pin(struct device *dev, struct host1x_bo *boenum dma_data_direction dir, struct host1x_bo_cache *cache);void host1x_bo_unpin (struct host1x_bo_mapping *map); +void host1x_bo_clear_cached_mappings (struct host1x_bo *bo);static inline void *host1x_bo_mmap (struct host1x_bo *bo) {
Signature · 1 line
2.53.0
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.18.40 release. There are 1611 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 23 Jul 2026 15:23:00 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.18.40-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.18.y
and the diffstat can be found below.thanks,
greg k-h
perf fails to build with:
util/arm-spe.c: In function 'arm_spe__inject_event':util/arm-spe.c:472:37: error: 'struct perf_sample' has no member named 'evsel'
472 | struct evsel *evsel = sample->evsel;
| ^~
due to commit ca625699a8d5ddea7213231f090dab1e0ec0380c ("perf event: Fix size of synthesized sample with branch stacks"), it looks like we need to backport aeae075a0352eb6ab363fb1910f209eaa296a175 ("perf sample: Add evsel to struct perf_sample")
Signature · 1 line
Florian
Greg Kroah-Hartman
maintainerQuoted 27 lines · Florian Fainelli
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.18.40 release. There are 1611 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 23 Jul 2026 15:23:00 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.18.40-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.18.y
and the diffstat can be found below.thanks,
greg k-h
perf fails to build with:
util/arm-spe.c: In function 'arm_spe__inject_event':util/arm-spe.c:472:37: error: 'structperf_sample' has no member named 'evsel'
472 | struct evsel *evsel =sample->evsel;
| ^~
Quoted 4 lines
due to commit
ca625699a8d5ddea7213231f090dab1e0ec0380c("perf event: Fix size of synthesized sample with branch stacks"), it looks like we need to backportaeae075a0352eb6ab363fb1910f209eaa296a175("perf sample: Add evsel to structperf_sample")
That commit doesn't apply, so I'll just try to drop the offending perf commit instead.
thanks,
greg k-h
Greg Kroah-Hartman
maintainerPATCH 249/1611 drm/tegra: dc: Fix device node reference leak in tegra_dc_has_output()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Felix Gu <[email protected]>
[ Upstream commit 63a3998d792ab5c45304bf879e385a31fa923b61 ]
The of_for_each_phandle() macro increments the reference count of the device node it iterates over. If the loop exits early, the reference must be released manually.
In tegra_dc_has_output(), the function returns true immediately when a match is found, failing to release the current node's reference.
Fix this by adding a call to of_node_put() before returning from the loop.
--- drivers/gpu/drm/tegra/dc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/tegra/dc.c +3 -1
@@ -100,8 +100,10 @@ bool tegra_dc_has_output(struct tegra_dc *dc, struct device *dev)int err;of_for_each_phandle (&it, err, np,"nvidia,outputs" ,NULL ,0 ) -if (it.node == dev->of_node) +if (it.node == dev->of_node) { +of_node_put (it.node);return true; + }return false; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 250/1611 gpu: host1x: Fix iommu_map_sgtable() return value check
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mikko Perttunen <[email protected]>
[ Upstream commit 18f74762013a4b6aa6f905c4459e0f506f9c5c7b ]
Commit "iommu: return full error code from iommu_map_sg[_atomic]()" changed iommu_map_sgtable() to return an ssize_t and negative values in error cases, rather than a size_t and a zero.
pin_job() also was incorrectly assigning to 'int', which could cause overflows into negative values.
Update pin_job() to correctly check for errors from iommu_map_sgtable.
--- drivers/gpu/host1x/job.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/gpu/host1x/job.c +6 -4
@@ -235,6 +235,8 @@ static unsigned int pin_job(struct host1x *host, struct host1x_job *job) }if (host->domain) { +ssize_t map_err; +for_each_sgtable_sg (map->sgt, sg, j) gather_size += sg->length;
@@ -248,11 +250,11 @@ static unsigned int pin_job(struct host1x *host, struct host1x_job *job) goto put; } - err =iommu_map_sgtable (host->domain,iova_dma_addr (&host->iova, alloc), - map->sgt,IOMMU_READ ); -if (err ==0 ) { + map_err =iommu_map_sgtable (host->domain,iova_dma_addr (&host->iova, alloc), + map->sgt,IOMMU_READ ); +if (map_err <0 ) {__free_iova (&host->iova, alloc); - err = -EINVAL ; + err = map_err; goto put; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 251/1611 drm/tegra: Fix iommu_map_sgtable() return value check
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mikko Perttunen <[email protected]>
[ Upstream commit b3f349517de8f4469c385ebb7bfdfcc148790c0f ]
Commit "iommu: return full error code from iommu_map_sg[_atomic]()" changed iommu_map_sgtable() to return an ssize_t and negative values in error cases, rather than a size_t and a zero.
Update tegra_bo_iommu_map() to correctly check for errors from iommu_map_sgtable.
--- drivers/gpu/drm/tegra/gem.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/tegra/gem.c +6 -3
@@ -233,6 +233,7 @@ static const struct host1x_bo_ops tegra_bo_ops = {static int tegra_bo_iommu_map (struct tegra_drm *tegra,struct tegra_bo *bo) {int prot =IOMMU_READ |IOMMU_WRITE ; +ssize_t size;int err;if (bo->mm)
@@ -254,13 +255,15 @@ static int tegra_bo_iommu_map(struct tegra_drm *tegra, struct tegra_bo *bo) bo->iova = bo->mm->start; - bo->size =iommu_map_sgtable (tegra->domain, bo->iova, bo->sgt, prot); -if (!bo->size) { + size =iommu_map_sgtable (tegra->domain, bo->iova, bo->sgt, prot); +if (size <0 ) {dev_err (tegra->drm->dev,"failed to map buffer\n" ); - err = -ENOMEM ; + err = size; goto remove; } + bo->size = size; +mutex_unlock (&tegra->mm_lock);return 0 ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 252/1611 drm/nouveau/bios: specify correct display fuse register for Ampere and Ada
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Timur Tabi <[email protected]>
[ Upstream commit c1cf2d5db80ce91a85855bbaf4da85ff603e089a ]
The NV_FUSE_STATUS_OPT_DISPLAY register is used to determine whether the GPU has display hardware. The current code that normally reads this register is instead hard-coded to check for GA100 vs later GPUs. Since this function is called only on pre-Hopper GPUs, and this if-statement applies only to GA100 and later, the check works because GA100 is the only non-display Ampere and Ada GPU.
However, there actually is a register that can be read, so we should use it.
--- drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowramin.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowramin.c +2 -1
@@ -65,13 +65,14 @@ pramin_init(struct nvkm_bios *bios, const char *name)/* we can't get the bios image pointer without PDISP */ if (device->card_type >=GA100 ) - addr = device->chipset ==0x170 ;/*XXX: find the fuse reg for this */ + addr =nvkm_rd32 (device,0x820c04 );else if (device->card_type >=GM100 ) addr =nvkm_rd32 (device,0x021c04 );else if (device->card_type >=NV_C0 ) addr =nvkm_rd32 (device,0x022500 ); +if (addr &0x00000001 ) {nvkm_debug (subdev,"... display disabled\n" );return ERR_PTR (-ENODEV );
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 253/1611 libbpf: Harden parse_vma_segs() path parsing
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Bommarito <[email protected]>
[ Upstream commit fee9a38174f4c6454fb1fbaf2b9b5a1cca9070d0 ]
parse_vma_segs() in tools/lib/bpf/usdt.c parses /proc/<pid>/maps with two widthless scansets, "%s" into mode[16] and "%[^\n]" into line[4096]. A VMA name in maps is not limited to that local buffer; a deeply nested backing path can produce a maps record long enough to overflow the stack buffer.
Bound both scansets to the declared buffer sizes ("%15s" for mode[16] and "%4095[^\n]" for line[4096]) and drain any residue past line[4094] with "%*[^\n]" before the trailing "\n". Without the drain, the residue of an over-long record would stay in the stream and break the next "%zx-%zx" parse, so the loop would exit early and silently skip later maps records.
Also stop using sscanf(..., "%s") to peel the /proc/<pid>/root prefix from lib_path. Parse the pid and prefix length with "%n", check for the following slash, and copy the remainder with libbpf_strlcpy(). That removes a second unbounded stack write and preserves paths containing spaces.
--- tools/lib/bpf/usdt.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
tools/lib/bpf/usdt.c +12 -4
@@ -460,10 +460,10 @@ static int parse_elf_segs(Elf *elf, const char *path, struct elf_seg **segs, sizstatic int parse_vma_segs (int pid,const char *lib_path,struct elf_seg **segs,size_t *seg_cnt) { -char path[PATH_MAX ], line[PATH_MAX ], mode[16 ]; +char path[PATH_MAX ], line[4096 ], mode[16 ];size_t seg_start, seg_end, seg_off;struct elf_seg *seg; -int tmp_pid, i, err; +int tmp_pid, n, i, err;FILE *f; *seg_cnt =0 ;
@@ -472,8 +472,13 @@ static int parse_vma_segs(int pid, const char *lib_path, struct elf_seg **segs,* /proc/<pid>/root/<path>. They will be reported as just /<path> in * /proc/<pid>/maps. */ -if (sscanf (lib_path,"/proc/%d/root%s" , &tmp_pid, path) ==2 && pid == tmp_pid) +/* %n is not counted in sscanf() return value, so initialize it. */ + n =0 ; +if (sscanf (lib_path,"/proc/%d/root%n" , &tmp_pid, &n) ==1 && + n >0 && pid == tmp_pid && lib_path[n] =='/' ) { +libbpf_strlcpy (path, lib_path + n,sizeof (path)); goto proceed; + }if (!realpath (lib_path, path)) { pr_warn("usdt: failed to get absolute path of '%s' (err %s), using path as is...\n",
@@ -496,8 +501,11 @@ static int parse_vma_segs(int pid, const char *lib_path, struct elf_seg **segs,* 7f5c6f5d1000-7f5c6f5d3000 rw-p 001c7000 08:04 21238613 /usr/lib64/libc-2.17.so * 7f5c6f5d3000-7f5c6f5d8000 rw-p 00000000 00:00 0 * 7f5c6f5d8000-7f5c6f5d9000 r-xp 00000000 103:01 362990598 /data/users/andriin/linux/tools/bpf/usdt/libhello_usdt.so +* +* Some VMA names can be longer than the local buffer. Bound the +* writes, but still consume the rest of the line. */ -while (fscanf (f,"%zx-%zx %s %zx %*s %*d%[^\n]\n" , +while (fscanf (f,"%zx-%zx %15s %zx %*s %*d%4095[^\n]%*[^\n]\n" , &seg_start, &seg_end, mode, &seg_off, line) ==5 ) {void *tmp;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 254/1611 bpftool: Fix typo in struct_ops map FD generation for light skeleton
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Siddharth Nayyar <[email protected]>
[ Upstream commit be4c6c7bc42952b71188894933946b410deadcfe ]
When generating light skeletons for BPF programs containing struct_ops maps, bpftool incorrectly outputs a stray literal 't' instead of a tab character for the map file descriptor member in the links structure. This causes a compilation error when the generated light skeleton is used.
Correct the format string by replacing 't' with '\t'.
--- tools/bpf/bpftool/gen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/bpf/bpftool/gen.c +1 -1
@@ -1399,7 +1399,7 @@ static int do_skeleton(int argc, char **argv)continue ;if (use_loader) -printf ("t\tint %s_fd;\n" , ident); +printf ("\t\tint %s_fd;\n" , ident);else printf ("\t\tstruct bpf_link *%s;\n" , ident); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 255/1611 libbpf: Fix UAF in strset__add_str()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Carlos Llamas <[email protected]>
[ Upstream commit b23705e6afb6ac4ae6d220dcb35975698667dd76 ]
strset_add_str_mem() might reallocate the strset data buffer in order to accommodate the provided string 's'. However, if 's' points to a string already present in the buffer, it becomes dangling after the realloc. This leads to a use-after-free when attempting to memcpy() the string into the new buffer.
One scenario that triggers this problematic path is when resolve_btfids attempts to patch kfunc prototypes using existing BTF parameter names:
| resolve_btfids: function bpf_list_push_back_impl already exists in BTF | Segmentation fault (core dumped)
Compiling resolve_btfids with fsanitize=address generates a detailed report of the UAF:
| ================================================================= | ERROR: AddressSanitizer: heap-use-after-free on address 0x7f4c4a500bd4 | ==1507892==ERROR: AddressSanitizer: heap-use-after-free on address 0x7f4c4a500bd4 at pc 0x55d25155a2a8 bp 0x7ffcef879060 sp 0x7ffcef878818 | READ of size 5 at 0x7f4c4a500bd4 thread T0 | #0 0x55d25155a2a7 in memcpy (tools/bpf/resolve_btfids/resolve_btfids+0xcf2a7) | #1 0x55d2515d708e in strset__add_str tools/lib/bpf/strset.c:162:2 | #2 0x55d2515c730b in btf__add_str tools/lib/bpf/btf.c:2109:8 | #3 0x55d2515c9020 in btf__add_func_param tools/lib/bpf/btf.c:3108:14 | #4 0x55d25159f0b5 in process_kfunc_with_implicit_args tools/bpf/resolve_btfids/main.c:1196:9 | #5 0x55d25159e004 in btf2btf tools/bpf/resolve_btfids/main.c:1229:9 | #6 0x55d25159cee7 in main tools/bpf/resolve_btfids/main.c:1535:6 | #7 0x7f4c78e29f76 in __libc_start_call_main csu/../sysdeps/nptl/libc_start_call_main.h:58:16 | #8 0x7f4c78e2a026 in __libc_start_main csu/../csu/libc-start.c:360:3 | #9 0x55d2514bb860 in _start (tools/bpf/resolve_btfids/resolve_btfids+0x30860) | | 0x7f4c4a500bd4 is located 13268 bytes inside of 2829000-byte region [0x7f4c4a4fd800,0x7f4c4a7b02c8) | freed by thread T0 here: | #0 0x55d25155b700 in realloc (tools/bpf/resolve_btfids/resolve_btfids+0xd0700) | #1 0x55d2515c426c in libbpf_reallocarray tools/lib/bpf/./libbpf_internal.h:220:9 | #2 0x55d2515c426c in libbpf_add_mem tools/lib/bpf/btf.c:224:13 | | previously allocated by thread T0 here: | #0 0x55d25155b2e3 in malloc (tools/bpf/resolve_btfids/resolve_btfids+0xd02e3) | #1 0x55d2515d6e7d in strset__new tools/lib/bpf/strset.c:58:20
While resolve_btfids could be refactored to avoid this call path, let's instead fix this issue at the source in strset__add_str() and avoid similar scenarios.
Let's check if set->strs_data was reallocated and whether 's' points to an internal string within the old strset buffer. In such case, 's' is reconstructed to point to the new buffer.
While already here, also fix strset__find_str() which suffers from the same problem by factoring out the common operations into a new helper function strset_str_append().
--- tools/lib/bpf/strset.c | 62 ++++++++++++++++++++++++++++-------------- 1 file changed, 41 insertions(+), 21 deletions(-)
tools/lib/bpf/strset.c +41 -21
@@ -107,6 +107,41 @@ static void *strset_add_str_mem(struct strset *set, size_t add_sz) set->strs_data_len, set->strs_data_max_len, add_sz); } +static long strset_str_append (struct strset *set,const char *s) +{ +uintptr_t old_data = (uintptr_t )set->strs_data; +size_t old_data_len = set->strs_data_len; +uintptr_t old_s = (uintptr_t )s; +long len =strlen (s) +1 ; +void *p; + +/* +* Hashmap keys are always offsets within set->strs_data, so to even +* look up some string from the "outside", we need to first append it +* at the end, so that it can be addressed with an offset. Luckily, +* until set->strs_data_len is incremented, that string is just a piece +* of garbage for the rest of the code, so no harm, no foul. On the +* other hand, if the string is unique, it's already appended and +* ready to be used, only a simple set->strs_data_len increment away. +*/ + p =strset_add_str_mem (set, len); +if (!p) +return -ENOMEM ; + +/* +* The set->strs_data might have reallocated and if 's' pointed +* to an internal string within the old buffer, then it became +* dangling and needs to be reconstructed before the copy. +*/ +if (old_data && old_data != (uintptr_t )set->strs_data && + old_s >= old_data && old_s < old_data + old_data_len) + s = set->strs_data + (old_s - old_data); + +memcpy (p, s, len); + +return len; +} +/* Find string offset that corresponds to a given string *s*. * Returns: * - >0 offset into string data, if string is found;
@@ -116,16 +151,12 @@ static void *strset_add_str_mem(struct strset *set, size_t add_sz)int strset__find_str (struct strset *set,const char *s) {long old_off, new_off, len; -void *p; -/* see strset__add_str() for why we do this */ - len =strlen (s) +1 ; - p =strset_add_str_mem (set, len); -if (!p) -return -ENOMEM ; + len =strset_str_append (set, s); +if (len <0 ) +return len; new_off = set->strs_data_len; -memcpy (p, s, len);if (hashmap__find (set->strs_hash, new_off, &old_off))return old_off;
@@ -142,24 +173,13 @@ int strset__find_str(struct strset *set, const char *s)int strset__add_str (struct strset *set,const char *s) {long old_off, new_off, len; -void *p;int err; -/* Hashmap keys are always offsets within set->strs_data, so to even -* look up some string from the "outside", we need to first append it -* at the end, so that it can be addressed with an offset. Luckily, -* until set->strs_data_len is incremented, that string is just a piece -* of garbage for the rest of the code, so no harm, no foul. On the -* other hand, if the string is unique, it's already appended and -* ready to be used, only a simple set->strs_data_len increment away. -*/ - len =strlen (s) +1 ; - p =strset_add_str_mem (set, len); -if (!p) -return -ENOMEM ; + len =strset_str_append (set, s); +if (len <0 ) +return len; new_off = set->strs_data_len; -memcpy (p, s, len);/* Now attempt to add the string, but only if the string with the same * contents doesn't exist already (HASHMAP_ADD strategy). If such
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 256/1611 ARM: tegra: Add #{address,size}-cells to Chromium-based /firmware
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brian Norris <[email protected]>
[ Upstream commit 1fe27b10dc97c85821dfae1e4e6f9db4472287aa ]
Chromium/Depthcharge bootloaders may dynamically add a few device nodes to a system's DTB under a /firmware node. A typical DT looks something like the following:
/ {
firmware {
ranges;
coreboot {
compatible = "coreboot";
reg = <...>;
...;
};
};
};Notably, the /firmware node has an empty 'ranges', but does not have address/size-cells.
Commit 6e5773d52f4a ("of/address: Fix WARN when attempting translating non-translatable addresses") started requiring #address-cells for a device's parent if we want to use the reg resource in a device node. This leads to errors like the following:
[ 7.763870] coreboot_table firmware:coreboot: probe with driver coreboot_table failed with error -22
Add appropriate #{address,size}-cells to work around the problem.
Note that Google has also patched the Depthcharge bootloader source to add {address,size}-cells [1], but bootloader updates are typically delivered only via Google OS updates. Not all users install Google software updates, and even if they do, Google may not produce updated binaries for all/older devices.
[1] https://lore.kernel.org/all/[email protected]/
https://crrev.com/c/6051580 ("coreboot: Insert #address-cells and #size-cells for firmware node")
--- arch/arm/boot/dts/nvidia/tegra124-nyan.dtsi | 5 +++++ arch/arm/boot/dts/nvidia/tegra124-venice2.dts | 5 +++++ 2 files changed, 10 insertions(+)
arch/arm/boot/dts/nvidia/tegra124-nyan.dtsi +5 -0
@@ -14,6 +14,11 @@ chosen { stdout-path = "serial0:115200n8"; }; + firmware { + #address-cells = <1>; + #size-cells = <1>; + }; + /* * Note that recent version of the device tree compiler (starting with * version 1.4.2) warn about this node containing a reg property, but
arch/arm/boot/dts/nvidia/tegra124-venice2.dts +5 -0
@@ -18,6 +18,11 @@ chosen { stdout-path = "serial0:115200n8"; }; + firmware { + #address-cells = <1>; + #size-cells = <1>; + }; + memory@80000000 { reg = <0x0 0x80000000 0x0 0x80000000>; };
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 257/1611 arm64: tegra: Add #{address,size}-cells to Chromium-based /firmware
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brian Norris <[email protected]>
[ Upstream commit f0fbedccae9e16624977cca02216ab2399f5a3ab ]
Chromium/Depthcharge bootloaders may dynamically add a few device nodes to a system's DTB under a /firmware node. A typical DT looks something like the following:
/ {
firmware {
ranges;
coreboot {
compatible = "coreboot";
reg = <...>;
...;
};
};
};Notably, the /firmware node has an empty 'ranges', but does not have address/size-cells.
Commit 6e5773d52f4a ("of/address: Fix WARN when attempting translating non-translatable addresses") started requiring #address-cells for a device's parent if we want to use the reg resource in a device node. This leads to errors like the following:
[ 7.763870] coreboot_table firmware:coreboot: probe with driver coreboot_table failed with error -22
Add appropriate #{address,size}-cells to work around the problem.
Note that Google has also patched the Depthcharge bootloader source to add {address,size}-cells [1], but bootloader updates are typically delivered only via Google OS updates. Not all users install Google software updates, and even if they do, Google may not produce updated binaries for all/older devices.
[1] https://lore.kernel.org/all/[email protected]/
https://crrev.com/c/6051580 ("coreboot: Insert #address-cells and #size-cells for firmware node")
--- arch/arm64/boot/dts/nvidia/tegra132-norrin.dts | 5 +++++ arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 5 +++++ 2 files changed, 10 insertions(+)
arch/arm64/boot/dts/nvidia/tegra132-norrin.dts +5 -0
@@ -18,6 +18,11 @@ chosen { stdout-path = "serial0:115200n8"; }; + firmware { + #address-cells = <2>; + #size-cells = <2>; + }; + memory@80000000 { device_type = "memory"; reg = <0x0 0x80000000 0x0 0x80000000>;
arch/arm64/boot/dts/nvidia/tegra210-smaug.dts +5 -0
@@ -25,6 +25,11 @@ chosen { stdout-path = "serial0:115200n8"; }; + firmware { + #address-cells = <2>; + #size-cells = <2>; + }; + memory@80000000 { device_type = "memory"; reg = <0x0 0x80000000 0x0 0xc0000000>;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 258/1611 dax/kmem: account for partial discontiguous resource upon removal
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Davidlohr Bueso <[email protected]>
[ Upstream commit 8aa442cfce79e2d69e72fc8e0c0864ac2971149d ]
When dev_dax_kmem_probe() partially succeeds (at least one range is mapped) but a subsequent range fails request_mem_region() or add_memory_driver_managed(), the probe silently continues, ultimately returning success, but with the corresponding range resource NULL'ed out.
dev_dax_kmem_remove() iterates over all dax_device ranges regardless of if the underlying resource exists. When remove_memory() is called later, it returns 0 because the memory was never added which causes dev_dax_kmem_remove() to incorrectly assume the (nonexistent) resource can be removed and attempts cleanup on a NULL pointer.
Fix this by skipping these ranges altogether, noting that these cases are considered success, such that the cleanup is still reached when all actually-added ranges are successfully removed.
--- drivers/dax/kmem.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/dax/kmem.c +6 -0
@@ -227,6 +227,12 @@ static void dev_dax_kmem_remove(struct dev_dax *dev_dax)if (rc)continue ; +/* range was never added during probe */ +if (!data->res[i]) { + success++; +continue ; + } + rc =remove_memory (range.start,range_len (&range));if (rc ==0 ) {remove_resource (data->res[i]);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 259/1611 rapidio/tsi721: prevent a bad dereference in tsi721_db_dpc()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit fc15e3a30ddd950f009c76765331783b9af94a87 ]
With a list_for_each() loop, if we don't find the item we are looking for in the list, then the loop exits with the iterator, which is "dbell" in this loop, pointing to invalid memory.
This code uses the "found" variable to determine if we have found the doorbell we are looking for or not. However, the problem that the "found" variable needs to be set to false at the start of each iteration, otherwise after the first correct doorbell, then everything is marked as found.
Reset the "found" to false at the start of the iteration and move the variable inside the loop.
--- drivers/rapidio/devices/tsi721.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/rapidio/devices/tsi721.c +2 -1
@@ -394,7 +394,6 @@ static void tsi721_db_dpc(struct work_struct *work) idb_work);struct rio_mport *mport;struct rio_dbell *dbell; -int found =0 ;u32 wr_ptr, rd_ptr;u64 *idb_entry;u32 regval;
@@ -412,6 +411,8 @@ static void tsi721_db_dpc(struct work_struct *work) rd_ptr =ioread32 (priv->regs +TSI721_IDQ_RP (IDB_QUEUE )) %IDB_QSIZE ;while (wr_ptr != rd_ptr) { +int found =0 ; + idb_entry = (u64 *)(priv->idb_base + (TSI721_IDB_ENTRY_SIZE * rd_ptr)); rd_ptr++;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 260/1611 ocfs2: dont BUG_ON an invalid journal dinode
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: ZhengYuan Huang <[email protected]>
[ Upstream commit c0438198c28b1d22c272751af5e717c11d9fa8dd ]
[BUG]
A fuzzed OCFS2 image can corrupt the current slot journal dinode while mount is still in progress. The mount path first reports the invalid journal block and then crashes in shutdown:
kernel BUG at fs/ocfs2/journal.c:1034!
Oops: invalid opcode: 0000 [#1] SMP KASAN NOPTI RIP: 0010:ocfs2_journal_toggle_dirty+0x2d6/0x340 fs/ocfs2/journal.c:1034 Call Trace: ocfs2_journal_shutdown+0x414/0xc30 fs/ocfs2/journal.c:1116 ocfs2_mount_volume fs/ocfs2/super.c:1785 [inline] ocfs2_fill_super+0x30a9/0x3cd0 fs/ocfs2/super.c:1083 get_tree_bdev_flags+0x38b/0x640 fs/super.c:1698 get_tree_bdev+0x24/0x40 fs/super.c:1721 ocfs2_get_tree+0x21/0x30 fs/ocfs2/super.c:1184 vfs_get_tree+0x9a/0x370 fs/super.c:1758 fc_mount fs/namespace.c:1199 [inline] do_new_mount_fc fs/namespace.c:3642 [inline] do_new_mount fs/namespace.c:3718 [inline] path_mount+0x5b8/0x1ea0 fs/namespace.c:4028 do_mount fs/namespace.c:4041 [inline] __do_sys_mount fs/namespace.c:4229 [inline] __se_sys_mount fs/namespace.c:4206 [inline] __x64_sys_mount+0x282/0x320 fs/namespace.c:4206 ...
[CAUSE]ocfs2_journal_toggle_dirty() used to return -EIO when journal->j_bh no longer contained a valid dinode, because the startup and shutdown paths already handled that failure. Commit 10995aa2451a
("ocfs2: Morph the haphazard OCFS2_IS_VALID_DINODE() checks.") changed the check to a BUG_ON() under the assumption that the journal dinode had already been validated. That turns an unexpected invalid journal dinode during mount teardown into a kernel crash instead of a normal mount failure.
[FIX]
Replace the BUG_ON() with WARN_ON() and return -EIO. This keeps the invariant warning for debugging, but restores the original behavior of failing startup or shutdown cleanly instead of panicking the kernel.
--- fs/ocfs2/journal.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
fs/ocfs2/journal.c +2 -5
@@ -1027,11 +1027,8 @@ static int ocfs2_journal_toggle_dirty(struct ocfs2_super *osb,struct ocfs2_dinode *fe; fe = (struct ocfs2_dinode *)bh->b_data; - -/* The journal bh on the osb always comes from ocfs2_journal_init() -* and was validated there inside ocfs2_inode_lock_full(). It's a -* code bug if we mess it up. */ -BUG_ON (!OCFS2_IS_VALID_DINODE (fe)); +if (WARN_ON (!OCFS2_IS_VALID_DINODE (fe))) +return -EIO ; flags =le32_to_cpu (fe->id1.journal1.ij_flags);if (dirty)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 261/1611 ocfs2: kill osb->system_file_mutex lock
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tetsuo Handa <[email protected]>
[ Upstream commit f5b1910e23f1233c8d4185268b2e659df2bc5dbf ]
Commit 43b10a20372d ("ocfs2: avoid system inode ref confusion by adding mutex lock") tried to avoid a refcount leak caused by allowing multiple threads to call igrab(inode). But addition of osb->system_file_mutex made locking dependency complicated and is causing lockdep to warn about possibility of AB-BA deadlock.
Since _ocfs2_get_system_file_inode() returns the same inode for the same input arguments, we don't need to serialize _ocfs2_get_system_file_inode(). What we need to make sure is that igrab(inode) is called for only once(). Therefore, replace osb->system_file_mutex with cmpxchg()-based locking.
--- fs/ocfs2/ocfs2.h | 2 -- fs/ocfs2/super.c | 2 -- fs/ocfs2/sysfile.c | 9 +++------ 3 files changed, 3 insertions(+), 10 deletions(-)
fs/ocfs2/ocfs2.h +0 -2
@@ -494,8 +494,6 @@ struct ocfs2_superstruct rb_root osb_rf_lock_tree;struct ocfs2_refcount_tree *osb_ref_tree_lru; -struct mutex system_file_mutex; -/* * OCFS2 needs to schedule several different types of work which * require cluster locking, disk I/O, recovery waits, etc. Since these
fs/ocfs2/super.c +0 -2
@@ -1997,8 +1997,6 @@ static int ocfs2_initialize_super(struct super_block *sb,spin_lock_init (&osb->osb_xattr_lock);ocfs2_init_steal_slots (osb); -mutex_init (&osb->system_file_mutex); -atomic_set (&osb->alloc_stats.moves,0 );atomic_set (&osb->alloc_stats.local_data,0 );atomic_set (&osb->alloc_stats.bitmap_data,0 );
fs/ocfs2/sysfile.c +3 -6
@@ -98,11 +98,9 @@ struct inode *ocfs2_get_system_file_inode(struct ocfs2_super *osb, }else arr =get_local_system_inode (osb, type, slot); -mutex_lock (&osb->system_file_mutex);if (arr && ((inode = *arr) !=NULL )) {/* get a ref in addition to the array ref */ inode =igrab (inode); -mutex_unlock (&osb->system_file_mutex);BUG_ON (!inode);return inode;
@@ -112,11 +110,10 @@ struct inode *ocfs2_get_system_file_inode(struct ocfs2_super *osb, inode =_ocfs2_get_system_file_inode (osb, type, slot);/* add one more if putting into array for first time */ -if (arr && inode) { - *arr =igrab (inode); -BUG_ON (!*arr); +if (inode && arr && !*arr && !cmpxchg (&(*arr),NULL , inode)) { + inode =igrab (inode); +BUG_ON (!inode); } -mutex_unlock (&osb->system_file_mutex);return inode; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 262/1611 crypto: hisilicon/qm - disable error report before flr
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Weili Qian <[email protected]>
[ Upstream commit e71dc5602b9a29027f6aedd5990d3e8c4f638c8c ]
Before function level reset, driver first disable device error report and then waits for the device reset to complete. However, when the error is recovered, the error bits will be enabled again, resulting in invalid disable. It is modified to detect that there is no error before disable error report, and then do FLR.
--- drivers/crypto/hisilicon/qm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/crypto/hisilicon/qm.c +2 -2
@@ -4785,8 +4785,6 @@ void hisi_qm_reset_prepare(struct pci_dev *pdev)u32 delay =0 ;int ret; -hisi_qm_dev_err_uninit (pf_qm); -/* * Check whether there is an ECC mbit error, If it occurs, need to * wait for soft reset to fix it.
@@ -4803,6 +4801,8 @@ void hisi_qm_reset_prepare(struct pci_dev *pdev)return ; } +hisi_qm_dev_err_uninit (pf_qm); +/* PF obtains the information of VF by querying the register. */ if (qm->fun_type ==QM_HW_PF )qm_cmd_uninit (qm);
Signature · 1 line
2.53.0