]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
Fixes for 6.6
authorSasha Levin <sashal@kernel.org>
Sun, 1 Sep 2024 11:25:52 +0000 (07:25 -0400)
committerSasha Levin <sashal@kernel.org>
Sun, 1 Sep 2024 11:25:52 +0000 (07:25 -0400)
Signed-off-by: Sasha Levin <sashal@kernel.org>
queue-6.6/apparmor-fix-policy_unpack_test-on-big-endian-system.patch [new file with mode: 0644]
queue-6.6/arm-dts-omap3-n900-correct-the-accelerometer-orienta.patch [new file with mode: 0644]
queue-6.6/arm64-dts-freescale-imx93-tqma9352-fix-cma-alloc-ran.patch [new file with mode: 0644]
queue-6.6/arm64-dts-freescale-imx93-tqma9352-mba93xxla-fix-typ.patch [new file with mode: 0644]
queue-6.6/arm64-dts-imx8mp-beacon-kit-fix-stereo-audio-on-wm89.patch [new file with mode: 0644]
queue-6.6/arm64-dts-imx93-add-nvmem-property-for-eqos.patch [new file with mode: 0644]
queue-6.6/arm64-dts-imx93-add-nvmem-property-for-fec1.patch [new file with mode: 0644]
queue-6.6/arm64-dts-imx93-update-default-value-for-snps-clk-cs.patch [new file with mode: 0644]
queue-6.6/scsi-aacraid-fix-double-free-on-probe-failure.patch [new file with mode: 0644]
queue-6.6/series

diff --git a/queue-6.6/apparmor-fix-policy_unpack_test-on-big-endian-system.patch b/queue-6.6/apparmor-fix-policy_unpack_test-on-big-endian-system.patch
new file mode 100644 (file)
index 0000000..c259c2f
--- /dev/null
@@ -0,0 +1,69 @@
+From fd686251be19870b8ff18295015d48349ff4632b Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Thu, 8 Aug 2024 08:50:03 -0700
+Subject: apparmor: fix policy_unpack_test on big endian systems
+
+From: Guenter Roeck <linux@roeck-us.net>
+
+[ Upstream commit 98c0cc48e27e9d269a3e4db2acd72b486c88ec77 ]
+
+policy_unpack_test fails on big endian systems because data byte order
+is expected to be little endian but is generated in host byte order.
+This results in test failures such as:
+
+ # policy_unpack_test_unpack_array_with_null_name: EXPECTATION FAILED at security/apparmor/policy_unpack_test.c:150
+    Expected array_size == (u16)16, but
+        array_size == 4096 (0x1000)
+        (u16)16 == 16 (0x10)
+    # policy_unpack_test_unpack_array_with_null_name: pass:0 fail:1 skip:0 total:1
+    not ok 3 policy_unpack_test_unpack_array_with_null_name
+    # policy_unpack_test_unpack_array_with_name: EXPECTATION FAILED at security/apparmor/policy_unpack_test.c:164
+    Expected array_size == (u16)16, but
+        array_size == 4096 (0x1000)
+        (u16)16 == 16 (0x10)
+    # policy_unpack_test_unpack_array_with_name: pass:0 fail:1 skip:0 total:1
+
+Add the missing endianness conversions when generating test data.
+
+Fixes: 4d944bcd4e73 ("apparmor: add AppArmor KUnit tests for policy unpack")
+Cc: Brendan Higgins <brendanhiggins@google.com>
+Cc: Kees Cook <keescook@chromium.org>
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ security/apparmor/policy_unpack_test.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/security/apparmor/policy_unpack_test.c b/security/apparmor/policy_unpack_test.c
+index 5c9bde25e56df..2b8003eb4f463 100644
+--- a/security/apparmor/policy_unpack_test.c
++++ b/security/apparmor/policy_unpack_test.c
+@@ -80,14 +80,14 @@ static struct aa_ext *build_aa_ext_struct(struct policy_unpack_fixture *puf,
+       *(buf + 1) = strlen(TEST_U32_NAME) + 1;
+       strscpy(buf + 3, TEST_U32_NAME, e->end - (void *)(buf + 3));
+       *(buf + 3 + strlen(TEST_U32_NAME) + 1) = AA_U32;
+-      *((u32 *)(buf + 3 + strlen(TEST_U32_NAME) + 2)) = TEST_U32_DATA;
++      *((__le32 *)(buf + 3 + strlen(TEST_U32_NAME) + 2)) = cpu_to_le32(TEST_U32_DATA);
+       buf = e->start + TEST_NAMED_U64_BUF_OFFSET;
+       *buf = AA_NAME;
+       *(buf + 1) = strlen(TEST_U64_NAME) + 1;
+       strscpy(buf + 3, TEST_U64_NAME, e->end - (void *)(buf + 3));
+       *(buf + 3 + strlen(TEST_U64_NAME) + 1) = AA_U64;
+-      *((u64 *)(buf + 3 + strlen(TEST_U64_NAME) + 2)) = TEST_U64_DATA;
++      *((__le64 *)(buf + 3 + strlen(TEST_U64_NAME) + 2)) = cpu_to_le64(TEST_U64_DATA);
+       buf = e->start + TEST_NAMED_BLOB_BUF_OFFSET;
+       *buf = AA_NAME;
+@@ -103,7 +103,7 @@ static struct aa_ext *build_aa_ext_struct(struct policy_unpack_fixture *puf,
+       *(buf + 1) = strlen(TEST_ARRAY_NAME) + 1;
+       strscpy(buf + 3, TEST_ARRAY_NAME, e->end - (void *)(buf + 3));
+       *(buf + 3 + strlen(TEST_ARRAY_NAME) + 1) = AA_ARRAY;
+-      *((u16 *)(buf + 3 + strlen(TEST_ARRAY_NAME) + 2)) = TEST_ARRAY_SIZE;
++      *((__le16 *)(buf + 3 + strlen(TEST_ARRAY_NAME) + 2)) = cpu_to_le16(TEST_ARRAY_SIZE);
+       return e;
+ }
+-- 
+2.43.0
+
diff --git a/queue-6.6/arm-dts-omap3-n900-correct-the-accelerometer-orienta.patch b/queue-6.6/arm-dts-omap3-n900-correct-the-accelerometer-orienta.patch
new file mode 100644 (file)
index 0000000..acb0347
--- /dev/null
@@ -0,0 +1,39 @@
+From 0d45c307d9ec40338458f4a44dcd6c7c86f02f7c Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Mon, 22 Jul 2024 13:31:11 +0200
+Subject: ARM: dts: omap3-n900: correct the accelerometer orientation
+
+From: Sicelo A. Mhlongo <absicsz@gmail.com>
+
+[ Upstream commit 5062d9c0cbbc202e495e9b20f147f64ef5cc2897 ]
+
+Negate the values reported for the accelerometer z-axis in order to
+match Documentation/devicetree/bindings/iio/mount-matrix.txt.
+
+Fixes: 14a213dcb004 ("ARM: dts: n900: use iio driver for accelerometer")
+
+Signed-off-by: Sicelo A. Mhlongo <absicsz@gmail.com>
+Reviewed-By: Andreas Kemnade <andreas@kemnade.info>
+Link: https://lore.kernel.org/r/20240722113137.3240847-1-absicsz@gmail.com
+Signed-off-by: Kevin Hilman <khilman@baylibre.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ arch/arm/boot/dts/ti/omap/omap3-n900.dts | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm/boot/dts/ti/omap/omap3-n900.dts b/arch/arm/boot/dts/ti/omap/omap3-n900.dts
+index d334853412517..036e472b77beb 100644
+--- a/arch/arm/boot/dts/ti/omap/omap3-n900.dts
++++ b/arch/arm/boot/dts/ti/omap/omap3-n900.dts
+@@ -781,7 +781,7 @@
+               mount-matrix =   "-1",  "0",  "0",
+                                 "0",  "1",  "0",
+-                                "0",  "0",  "1";
++                                "0",  "0",  "-1";
+       };
+       cam1: camera@3e {
+-- 
+2.43.0
+
diff --git a/queue-6.6/arm64-dts-freescale-imx93-tqma9352-fix-cma-alloc-ran.patch b/queue-6.6/arm64-dts-freescale-imx93-tqma9352-fix-cma-alloc-ran.patch
new file mode 100644 (file)
index 0000000..f899a32
--- /dev/null
@@ -0,0 +1,37 @@
+From dc68ef1bca27578a30ddc15557e1b8cf95c655a2 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Wed, 24 Jul 2024 14:58:48 +0200
+Subject: arm64: dts: freescale: imx93-tqma9352: fix CMA alloc-ranges
+
+From: Markus Niebel <Markus.Niebel@ew.tq-group.com>
+
+[ Upstream commit cd0c6872aab4d2c556a5e953e6926a1b4485e543 ]
+
+DRAM starts at 0x80000000.
+
+Fixes: c982ecfa7992 ("arm64: dts: freescale: add initial device tree for MBa93xxLA SBC board")
+Signed-off-by: Markus Niebel <Markus.Niebel@ew.tq-group.com>
+Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
+Reviewed-by: Peng Fan <peng.fan@nxp.com>
+Signed-off-by: Shawn Guo <shawnguo@kernel.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ arch/arm64/boot/dts/freescale/imx93-tqma9352.dtsi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm64/boot/dts/freescale/imx93-tqma9352.dtsi b/arch/arm64/boot/dts/freescale/imx93-tqma9352.dtsi
+index f6e422dc2663e..b6f3c076fe54a 100644
+--- a/arch/arm64/boot/dts/freescale/imx93-tqma9352.dtsi
++++ b/arch/arm64/boot/dts/freescale/imx93-tqma9352.dtsi
+@@ -19,7 +19,7 @@
+               linux,cma {
+                       compatible = "shared-dma-pool";
+                       reusable;
+-                      alloc-ranges = <0 0x60000000 0 0x40000000>;
++                      alloc-ranges = <0 0x80000000 0 0x40000000>;
+                       size = <0 0x10000000>;
+                       linux,cma-default;
+               };
+-- 
+2.43.0
+
diff --git a/queue-6.6/arm64-dts-freescale-imx93-tqma9352-mba93xxla-fix-typ.patch b/queue-6.6/arm64-dts-freescale-imx93-tqma9352-mba93xxla-fix-typ.patch
new file mode 100644 (file)
index 0000000..a8f6482
--- /dev/null
@@ -0,0 +1,36 @@
+From dcbf1d86b3bd4e1bea542b176c1c58ad763b2f52 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Wed, 24 Jul 2024 14:58:52 +0200
+Subject: arm64: dts: freescale: imx93-tqma9352-mba93xxla: fix typo
+
+From: Markus Niebel <Markus.Niebel@ew.tq-group.com>
+
+[ Upstream commit 5f0a894bfa3c26ce61deda4c52b12e8ec84d876a ]
+
+Fix typo in assignment of SD-Card cd-gpios.
+
+Fixes: c982ecfa7992 ("arm64: dts: freescale: add initial device tree for MBa93xxLA SBC board")
+Signed-off-by: Markus Niebel <Markus.Niebel@ew.tq-group.com>
+Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
+Signed-off-by: Shawn Guo <shawnguo@kernel.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ arch/arm64/boot/dts/freescale/imx93-tqma9352-mba93xxla.dts | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm64/boot/dts/freescale/imx93-tqma9352-mba93xxla.dts b/arch/arm64/boot/dts/freescale/imx93-tqma9352-mba93xxla.dts
+index 3c5c67ebee5d3..aaf9685ef0fbb 100644
+--- a/arch/arm64/boot/dts/freescale/imx93-tqma9352-mba93xxla.dts
++++ b/arch/arm64/boot/dts/freescale/imx93-tqma9352-mba93xxla.dts
+@@ -437,7 +437,7 @@
+       pinctrl-0 = <&pinctrl_usdhc2_hs>, <&pinctrl_usdhc2_gpio>;
+       pinctrl-1 = <&pinctrl_usdhc2_uhs>, <&pinctrl_usdhc2_gpio>;
+       pinctrl-2 = <&pinctrl_usdhc2_uhs>, <&pinctrl_usdhc2_gpio>;
+-      cd-gpios = <&gpio3 00 GPIO_ACTIVE_LOW>;
++      cd-gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
+       vmmc-supply = <&reg_usdhc2_vmmc>;
+       bus-width = <4>;
+       no-sdio;
+-- 
+2.43.0
+
diff --git a/queue-6.6/arm64-dts-imx8mp-beacon-kit-fix-stereo-audio-on-wm89.patch b/queue-6.6/arm64-dts-imx8mp-beacon-kit-fix-stereo-audio-on-wm89.patch
new file mode 100644 (file)
index 0000000..01d83d0
--- /dev/null
@@ -0,0 +1,61 @@
+From c1ce00985e83f3f20860b4a748b4d4fe7ed95a08 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Sun, 14 Jul 2024 12:20:17 -0500
+Subject: arm64: dts: imx8mp-beacon-kit: Fix Stereo Audio on WM8962
+
+From: Adam Ford <aford173@gmail.com>
+
+[ Upstream commit 4e69cd835a2d5c3915838491f59a68ee697a87d0 ]
+
+The L/R clock needs to be controlled by the SAI3 instead of the
+CODEC to properly achieve stereo sound. Doing this allows removes
+the need for unnecessary clock manipulation to try to get the
+CODEC's clock in sync with the SAI3 clock, since the CODEC can cope
+with a wide variety of clock inputs.
+
+Fixes: 161af16c18f3 ("arm64: dts: imx8mp-beacon-kit: Fix audio_pll2 clock")
+Fixes: 69e2f37a6ddc ("arm64: dts: imx8mp-beacon-kit: Enable WM8962 Audio CODEC")
+Signed-off-by: Adam Ford <aford173@gmail.com>
+Signed-off-by: Shawn Guo <shawnguo@kernel.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ arch/arm64/boot/dts/freescale/imx8mp-beacon-kit.dts | 12 +++++-------
+ 1 file changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/freescale/imx8mp-beacon-kit.dts b/arch/arm64/boot/dts/freescale/imx8mp-beacon-kit.dts
+index acd265d8b58ed..e094f409028dd 100644
+--- a/arch/arm64/boot/dts/freescale/imx8mp-beacon-kit.dts
++++ b/arch/arm64/boot/dts/freescale/imx8mp-beacon-kit.dts
+@@ -163,13 +163,12 @@
+               simple-audio-card,cpu {
+                       sound-dai = <&sai3>;
++                      frame-master;
++                      bitclock-master;
+               };
+               simple-audio-card,codec {
+                       sound-dai = <&wm8962>;
+-                      clocks = <&clk IMX8MP_CLK_IPP_DO_CLKO1>;
+-                      frame-master;
+-                      bitclock-master;
+               };
+       };
+ };
+@@ -381,10 +380,9 @@
+ &sai3 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_sai3>;
+-      assigned-clocks = <&clk IMX8MP_CLK_SAI3>,
+-                        <&clk IMX8MP_AUDIO_PLL2> ;
+-      assigned-clock-parents = <&clk IMX8MP_AUDIO_PLL2_OUT>;
+-      assigned-clock-rates = <12288000>, <361267200>;
++      assigned-clocks = <&clk IMX8MP_CLK_SAI3>;
++      assigned-clock-parents = <&clk IMX8MP_AUDIO_PLL1_OUT>;
++      assigned-clock-rates = <12288000>;
+       fsl,sai-mclk-direction-output;
+       status = "okay";
+ };
+-- 
+2.43.0
+
diff --git a/queue-6.6/arm64-dts-imx93-add-nvmem-property-for-eqos.patch b/queue-6.6/arm64-dts-imx93-add-nvmem-property-for-eqos.patch
new file mode 100644 (file)
index 0000000..2ad40cd
--- /dev/null
@@ -0,0 +1,46 @@
+From 12331d15214bb08d84987606306c4f9d58a4cd4d Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Fri, 19 Apr 2024 11:37:01 +0800
+Subject: arm64: dts: imx93: add nvmem property for eqos
+
+From: Peng Fan <peng.fan@nxp.com>
+
+[ Upstream commit 0d4fbaffbdcaec3fce29445b00324f470ee403c4 ]
+
+Add nvmem properties for eqos to get mac address.
+
+Signed-off-by: Peng Fan <peng.fan@nxp.com>
+Signed-off-by: Shawn Guo <shawnguo@kernel.org>
+Stable-dep-of: 109f256285dd ("arm64: dts: imx93: update default value for snps,clk-csr")
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ arch/arm64/boot/dts/freescale/imx93.dtsi | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/freescale/imx93.dtsi b/arch/arm64/boot/dts/freescale/imx93.dtsi
+index 1b7260d2a0fff..8ca5c7b6fbf03 100644
+--- a/arch/arm64/boot/dts/freescale/imx93.dtsi
++++ b/arch/arm64/boot/dts/freescale/imx93.dtsi
+@@ -810,6 +810,8 @@
+                               assigned-clock-rates = <100000000>, <250000000>;
+                               intf_mode = <&wakeupmix_gpr 0x28>;
+                               snps,clk-csr = <0>;
++                              nvmem-cells = <&eth_mac2>;
++                              nvmem-cell-names = "mac-address";
+                               status = "disabled";
+                       };
+@@ -895,6 +897,10 @@
+                               reg = <0x4ec 0x6>;
+                       };
++                      eth_mac2: mac-address@4f2 {
++                              reg = <0x4f2 0x6>;
++                      };
++
+               };
+               s4muap: mailbox@47520000 {
+-- 
+2.43.0
+
diff --git a/queue-6.6/arm64-dts-imx93-add-nvmem-property-for-fec1.patch b/queue-6.6/arm64-dts-imx93-add-nvmem-property-for-fec1.patch
new file mode 100644 (file)
index 0000000..f078382
--- /dev/null
@@ -0,0 +1,47 @@
+From 67be6abd0d592283483a926384adb70ad36c2891 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Fri, 19 Apr 2024 11:37:00 +0800
+Subject: arm64: dts: imx93: add nvmem property for fec1
+
+From: Peng Fan <peng.fan@nxp.com>
+
+[ Upstream commit b2ab0edaf484d578e8d0c06093af0003586def72 ]
+
+Add nvmem property for fec1 to get mac address.
+
+Signed-off-by: Peng Fan <peng.fan@nxp.com>
+Signed-off-by: Shawn Guo <shawnguo@kernel.org>
+Stable-dep-of: 109f256285dd ("arm64: dts: imx93: update default value for snps,clk-csr")
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ arch/arm64/boot/dts/freescale/imx93.dtsi | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/freescale/imx93.dtsi b/arch/arm64/boot/dts/freescale/imx93.dtsi
+index 943b7e6655634..1b7260d2a0fff 100644
+--- a/arch/arm64/boot/dts/freescale/imx93.dtsi
++++ b/arch/arm64/boot/dts/freescale/imx93.dtsi
+@@ -786,6 +786,8 @@
+                               fsl,num-tx-queues = <3>;
+                               fsl,num-rx-queues = <3>;
+                               fsl,stop-mode = <&wakeupmix_gpr 0x0c 1>;
++                              nvmem-cells = <&eth_mac1>;
++                              nvmem-cell-names = "mac-address";
+                               status = "disabled";
+                       };
+@@ -888,6 +890,11 @@
+                       reg = <0x47510000 0x10000>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
++
++                      eth_mac1: mac-address@4ec {
++                              reg = <0x4ec 0x6>;
++                      };
++
+               };
+               s4muap: mailbox@47520000 {
+-- 
+2.43.0
+
diff --git a/queue-6.6/arm64-dts-imx93-update-default-value-for-snps-clk-cs.patch b/queue-6.6/arm64-dts-imx93-update-default-value-for-snps-clk-cs.patch
new file mode 100644 (file)
index 0000000..0cc6846
--- /dev/null
@@ -0,0 +1,46 @@
+From d20ab41559dd2b412082dd4a3200a8dd21851586 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Mon, 15 Jul 2024 08:17:22 -0500
+Subject: arm64: dts: imx93: update default value for snps,clk-csr
+
+From: Shenwei Wang <shenwei.wang@nxp.com>
+
+[ Upstream commit 109f256285dd6a5f8c3bd0d80d39b2ccd4fe314e ]
+
+For the i.MX93 SoC, the default clock rate for the IP of STMMAC EQOS is
+312.5 MHz. According to the following mapping table from the i.MX93
+reference manual, this clock rate corresponds to a CSR value of 6.
+
+ 0000: CSR clock = 60-100 MHz; MDC clock = CSR clock/42
+ 0001: CSR clock = 100-150 MHz; MDC clock = CSR clock/62
+ 0010: CSR clock = 20-35 MHz; MDC clock = CSR clock/16
+ 0011: CSR clock = 35-60 MHz; MDC clock = CSR clock/26
+ 0100: CSR clock = 150-250 MHz; MDC clock = CSR clock/102
+ 0101: CSR clock = 250-300 MHz; MDC clock = CSR clock/124
+ 0110: CSR clock = 300-500 MHz; MDC clock = CSR clock/204
+ 0111: CSR clock = 500-800 MHz; MDC clock = CSR clock/324
+
+Fixes: f2d03ba997cb ("arm64: dts: imx93: reorder device nodes")
+Signed-off-by: Shenwei Wang <shenwei.wang@nxp.com>
+Signed-off-by: Shawn Guo <shawnguo@kernel.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ arch/arm64/boot/dts/freescale/imx93.dtsi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm64/boot/dts/freescale/imx93.dtsi b/arch/arm64/boot/dts/freescale/imx93.dtsi
+index 8ca5c7b6fbf03..35155b009dd24 100644
+--- a/arch/arm64/boot/dts/freescale/imx93.dtsi
++++ b/arch/arm64/boot/dts/freescale/imx93.dtsi
+@@ -809,7 +809,7 @@
+                                                        <&clk IMX93_CLK_SYS_PLL_PFD0_DIV2>;
+                               assigned-clock-rates = <100000000>, <250000000>;
+                               intf_mode = <&wakeupmix_gpr 0x28>;
+-                              snps,clk-csr = <0>;
++                              snps,clk-csr = <6>;
+                               nvmem-cells = <&eth_mac2>;
+                               nvmem-cell-names = "mac-address";
+                               status = "disabled";
+-- 
+2.43.0
+
diff --git a/queue-6.6/scsi-aacraid-fix-double-free-on-probe-failure.patch b/queue-6.6/scsi-aacraid-fix-double-free-on-probe-failure.patch
new file mode 100644 (file)
index 0000000..fc804da
--- /dev/null
@@ -0,0 +1,54 @@
+From 85bff3f829751f2513dc3c1370091adb012a456f Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Thu, 22 Aug 2024 00:51:42 +0200
+Subject: scsi: aacraid: Fix double-free on probe failure
+
+From: Ben Hutchings <benh@debian.org>
+
+[ Upstream commit 919ddf8336f0b84c0453bac583808c9f165a85c2 ]
+
+aac_probe_one() calls hardware-specific init functions through the
+aac_driver_ident::init pointer, all of which eventually call down to
+aac_init_adapter().
+
+If aac_init_adapter() fails after allocating memory for aac_dev::queues,
+it frees the memory but does not clear that member.
+
+After the hardware-specific init function returns an error,
+aac_probe_one() goes down an error path that frees the memory pointed to
+by aac_dev::queues, resulting.in a double-free.
+
+Reported-by: Michael Gordon <m.gordon.zelenoborsky@gmail.com>
+Link: https://bugs.debian.org/1075855
+Fixes: 8e0c5ebde82b ("[SCSI] aacraid: Newer adapter communication iterface support")
+Signed-off-by: Ben Hutchings <benh@debian.org>
+Link: https://lore.kernel.org/r/ZsZvfqlQMveoL5KQ@decadent.org.uk
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/scsi/aacraid/comminit.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
+index bd99c5492b7d4..0f64b02443037 100644
+--- a/drivers/scsi/aacraid/comminit.c
++++ b/drivers/scsi/aacraid/comminit.c
+@@ -642,6 +642,7 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev)
+       if (aac_comm_init(dev)<0){
+               kfree(dev->queues);
++              dev->queues = NULL;
+               return NULL;
+       }
+       /*
+@@ -649,6 +650,7 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev)
+        */
+       if (aac_fib_setup(dev) < 0) {
+               kfree(dev->queues);
++              dev->queues = NULL;
+               return NULL;
+       }
+               
+-- 
+2.43.0
+
index 5c69106c7759add0928ea78fbb7362b2ff77fe6b..5b9496551dce31b355c165ccaccafa680a27388a 100644 (file)
@@ -82,3 +82,12 @@ usb-dwc3-st-add-missing-depopulate-in-probe-error-path.patch
 usb-core-sysfs-unmerge-usb3_hardware_lpm_attr_group-in-remove_power_attributes.patch
 usb-cdnsp-fix-incorrect-index-in-cdnsp_get_hw_deq-function.patch
 usb-cdnsp-fix-for-link-trb-with-tc.patch
+arm-dts-omap3-n900-correct-the-accelerometer-orienta.patch
+arm64-dts-imx8mp-beacon-kit-fix-stereo-audio-on-wm89.patch
+arm64-dts-imx93-add-nvmem-property-for-fec1.patch
+arm64-dts-imx93-add-nvmem-property-for-eqos.patch
+arm64-dts-imx93-update-default-value-for-snps-clk-cs.patch
+arm64-dts-freescale-imx93-tqma9352-fix-cma-alloc-ran.patch
+arm64-dts-freescale-imx93-tqma9352-mba93xxla-fix-typ.patch
+scsi-aacraid-fix-double-free-on-probe-failure.patch
+apparmor-fix-policy_unpack_test-on-big-endian-system.patch