From 25ce70fa935289b048f0eb5bde7e1b768e78f199 Mon Sep 17 00:00:00 2001
From: Ivan T. Ivanov <iivanov@suse.de>
Date: Mar 01 2023 08:22:04 +0000
Subject: Merge branch 'users/oneukum/cve/linux-5.3/for-next' into cve/linux-5.3


---

diff --git a/patches.suse/usb-dwc3-dwc3-qcom-Add-missing-platform_device_put-i.patch b/patches.suse/usb-dwc3-dwc3-qcom-Add-missing-platform_device_put-i.patch
new file mode 100644
index 0000000..2cbe0de
--- /dev/null
+++ b/patches.suse/usb-dwc3-dwc3-qcom-Add-missing-platform_device_put-i.patch
@@ -0,0 +1,51 @@
+From fa0ef93868a6062babe1144df2807a8b1d4924d2 Mon Sep 17 00:00:00 2001
+From: Miaoqian Lin <linmq006@gmail.com>
+Date: Fri, 31 Dec 2021 11:36:41 +0000
+Subject: [PATCH] usb: dwc3: dwc3-qcom: Add missing platform_device_put() in
+ dwc3_qcom_acpi_register_core
+Git-commit: fa0ef93868a6062babe1144df2807a8b1d4924d2
+Patch-mainline: v5.17-rc1
+References: bsc#1208741 CVE-2023-22995
+
+Add the missing platform_device_put() before return from
+dwc3_qcom_acpi_register_core in the error handling case.
+
+Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
+Link: https://lore.kernel.org/r/20211231113641.31474-1-linmq006@gmail.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Oliver Neukum <oneukum@suse.com>
+---
+ drivers/usb/dwc3/dwc3-qcom.c |   11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+--- a/drivers/usb/dwc3/dwc3-qcom.c
++++ b/drivers/usb/dwc3/dwc3-qcom.c
+@@ -474,8 +474,10 @@ static int dwc3_qcom_acpi_register_core(
+ 	qcom->dwc3->dev.coherent_dma_mask = dev->coherent_dma_mask;
+ 
+ 	child_res = kcalloc(2, sizeof(*child_res), GFP_KERNEL);
+-	if (!child_res)
++	if (!child_res) {
++		platform_device_put(qcom->dwc3);
+ 		return -ENOMEM;
++	}
+ 
+ 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ 	if (!res) {
+@@ -507,10 +509,15 @@ static int dwc3_qcom_acpi_register_core(
+ 	}
+ 
+ 	ret = platform_device_add(qcom->dwc3);
+-	if (ret)
++	if (ret) {
+ 		dev_err(&pdev->dev, "failed to add device\n");
++		goto out;
++	}
++	kfree(child_res);
++	return 0;
+ 
+ out:
++	platform_device_put(qcom->dwc3);
+ 	kfree(child_res);
+ 	return ret;
+ }
diff --git a/series.conf b/series.conf
index 1b63c86..9a9bcc5 100644
--- a/series.conf
+++ b/series.conf
@@ -22865,6 +22865,7 @@
 	patches.suse/usb-host-xen-hcd-add-missing-unlock-in-error-path.patch
 	patches.suse/usb-gadget-don-t-release-an-existing-dev-buf.patch
 	patches.suse/usb-gadget-clear-related-members-when-goto-fail.patch
+	patches.suse/usb-dwc3-dwc3-qcom-Add-missing-platform_device_put-i.patch
 	patches.suse/powerpc-watchdog-Fix-missed-watchdog-reset-due-to-me.patch
 	patches.suse/powerpc-watchdog-tighten-non-atomic-read-modify-writ.patch
 	patches.suse/powerpc-watchdog-Avoid-holding-wd_smp_lock-over-prin.patch