From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 19 Jun 2024 12:51:21 +0000 (+0200)
Subject: 5.15-stable patches
X-Git-Tag: v6.1.95~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=08c5b4fa7d5be1bf60db2c7a13896791406ec358;p=thirdparty%2Fkernel%2Fstable-queue.git

5.15-stable patches

added patches:
	bluetooth-qca-fix-error-code-in-qca_read_fw_build_info.patch
---

diff --git a/queue-5.15/bluetooth-qca-fix-error-code-in-qca_read_fw_build_info.patch b/queue-5.15/bluetooth-qca-fix-error-code-in-qca_read_fw_build_info.patch
new file mode 100644
index 00000000000..85827fbc7d6
--- /dev/null
+++ b/queue-5.15/bluetooth-qca-fix-error-code-in-qca_read_fw_build_info.patch
@@ -0,0 +1,34 @@
+From a189f0ee6685457528db7a36ded3085e5d13ddc3 Mon Sep 17 00:00:00 2001
+From: Dan Carpenter <dan.carpenter@linaro.org>
+Date: Sat, 4 May 2024 14:25:43 +0300
+Subject: Bluetooth: qca: Fix error code in qca_read_fw_build_info()
+
+From: Dan Carpenter <dan.carpenter@linaro.org>
+
+commit a189f0ee6685457528db7a36ded3085e5d13ddc3 upstream.
+
+Return -ENOMEM on allocation failure.  Don't return success.
+
+Fixes: cda0d6a198e2 ("Bluetooth: qca: fix info leak when fetching fw build id")
+Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
+Reviewed-by: Johan Hovold <johan+linaro@kernel.org>
+Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/bluetooth/btqca.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/drivers/bluetooth/btqca.c
++++ b/drivers/bluetooth/btqca.c
+@@ -147,8 +147,10 @@ static int qca_read_fw_build_info(struct
+ 	}
+ 
+ 	build_label = kstrndup(&edl->data[1], build_lbl_len, GFP_KERNEL);
+-	if (!build_label)
++	if (!build_label) {
++		err = -ENOMEM;
+ 		goto out;
++	}
+ 
+ 	hci_set_fw_info(hdev, "%s", build_label);
+ 
diff --git a/queue-5.15/series b/queue-5.15/series
index d173b7a1d74..d67f2599a0d 100644
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -172,3 +172,4 @@ usb-storage-alauda-check-whether-the-media-is-initia.patch
 i2c-at91-fix-the-functionality-flags-of-the-slave-on.patch
 i2c-designware-fix-the-functionality-flags-of-the-sl.patch
 zap_pid_ns_processes-clear-tif_notify_signal-along-w.patch
+bluetooth-qca-fix-error-code-in-qca_read_fw_build_info.patch