drop a patch

diff --git a/queue-4.14/hsi-ssi_protocol-fix-potential-resource-leak-in-ssip.patch b/queue-4.14/hsi-ssi_protocol-fix-potential-resource-leak-in-ssip.patch
deleted file mode 100644 (file)
index e14a396..0000000
--- a/queue-4.14/hsi-ssi_protocol-fix-potential-resource-leak-in-ssip.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From de94b076f4f102c7be94c986c92966898f654cc2 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 5 Sep 2022 15:48:01 +0800
-Subject: HSI: ssi_protocol: fix potential resource leak in ssip_pn_open()
-
-From: Jianglei Nie <niejianglei2021@163.com>
-
-[ Upstream commit b28dbcb379e6a7f80262c2732a57681b1ee548ca ]
-
-ssip_pn_open() claims the HSI client's port with hsi_claim_port(). When
-hsi_register_port_event() gets some error and returns a negetive value,
-the HSI client's port should be released with hsi_release_port().
-
-Fix it by calling hsi_release_port() when hsi_register_port_event() fails.
-
-Signed-off-by: Jianglei Nie <niejianglei2021@163.com>
-Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/hsi/clients/ssi_protocol.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/hsi/clients/ssi_protocol.c b/drivers/hsi/clients/ssi_protocol.c
-index 93d28c0ec8bf..7fe3639c2826 100644
---- a/drivers/hsi/clients/ssi_protocol.c
-+++ b/drivers/hsi/clients/ssi_protocol.c
-@@ -932,6 +932,7 @@ static int ssip_pn_open(struct net_device *dev)
-       if (err < 0) {
-               dev_err(&cl->device, "Register HSI port event failed (%d)\n",
-                       err);
-+              hsi_release_port(cl);
-               return err;
-       }
-       dev_dbg(&cl->device, "Configuring SSI port\n");
--- 
-2.35.1
-

diff --git a/queue-4.14/series b/queue-4.14/series
index a7dceef12f52b46d25008fcf28cb67bf9cf3d82a..dc2e59913aa623ba1ed6ea34071fd449f203a3a4 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -195,7 +195,6 @@ media-cx88-fix-a-null-ptr-deref-bug-in-buffer_prepar.patch
 scsi-3w-9xxx-avoid-disabling-device-if-failing-to-en.patch
 nbd-fix-hung-when-signal-interrupts-nbd_start_device.patch
 hid-roccat-fix-use-after-free-in-roccat_read.patch
-hsi-ssi_protocol-fix-potential-resource-leak-in-ssip.patch
 md-raid5-wait-for-md_sb_change_pending-in-raid5d.patch
 usb-host-xhci-fix-potential-memory-leak-in-xhci_allo.patch
 usb-musb-fix-musb_gadget.c-rxstate-overflow-bug.patch

diff --git a/queue-4.19/hsi-ssi_protocol-fix-potential-resource-leak-in-ssip.patch b/queue-4.19/hsi-ssi_protocol-fix-potential-resource-leak-in-ssip.patch
deleted file mode 100644 (file)
index c1ec954..0000000
--- a/queue-4.19/hsi-ssi_protocol-fix-potential-resource-leak-in-ssip.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 1c929ec661fd5d2083fe203dad8383fd5dc46000 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 5 Sep 2022 15:48:01 +0800
-Subject: HSI: ssi_protocol: fix potential resource leak in ssip_pn_open()
-
-From: Jianglei Nie <niejianglei2021@163.com>
-
-[ Upstream commit b28dbcb379e6a7f80262c2732a57681b1ee548ca ]
-
-ssip_pn_open() claims the HSI client's port with hsi_claim_port(). When
-hsi_register_port_event() gets some error and returns a negetive value,
-the HSI client's port should be released with hsi_release_port().
-
-Fix it by calling hsi_release_port() when hsi_register_port_event() fails.
-
-Signed-off-by: Jianglei Nie <niejianglei2021@163.com>
-Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/hsi/clients/ssi_protocol.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/hsi/clients/ssi_protocol.c b/drivers/hsi/clients/ssi_protocol.c
-index 561abf7bdf1f..2d2175fd150f 100644
---- a/drivers/hsi/clients/ssi_protocol.c
-+++ b/drivers/hsi/clients/ssi_protocol.c
-@@ -942,6 +942,7 @@ static int ssip_pn_open(struct net_device *dev)
-       if (err < 0) {
-               dev_err(&cl->device, "Register HSI port event failed (%d)\n",
-                       err);
-+              hsi_release_port(cl);
-               return err;
-       }
-       dev_dbg(&cl->device, "Configuring SSI port\n");
--- 
-2.35.1
-

diff --git a/queue-4.19/series b/queue-4.19/series
index c06a5832afacae79671018df21ed9240a8f5ff8b..13142b74904e9210aca7a354c727cb1c6e2bb313 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -213,7 +213,6 @@ power-supply-adp5061-fix-out-of-bounds-read-in-adp50.patch
 staging-vt6655-fix-potential-memory-leak.patch
 ata-libahci_platform-sanity-check-the-dt-child-nodes.patch
 hid-roccat-fix-use-after-free-in-roccat_read.patch
-hsi-ssi_protocol-fix-potential-resource-leak-in-ssip.patch
 md-raid5-wait-for-md_sb_change_pending-in-raid5d.patch
 usb-host-xhci-fix-potential-memory-leak-in-xhci_allo.patch
 usb-musb-fix-musb_gadget.c-rxstate-overflow-bug.patch

diff --git a/queue-4.9/hsi-ssi_protocol-fix-potential-resource-leak-in-ssip.patch b/queue-4.9/hsi-ssi_protocol-fix-potential-resource-leak-in-ssip.patch
deleted file mode 100644 (file)
index 171908c..0000000
--- a/queue-4.9/hsi-ssi_protocol-fix-potential-resource-leak-in-ssip.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 0c7af5deb592a7a835a974a83cb3928a6f7b547a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 5 Sep 2022 15:48:01 +0800
-Subject: HSI: ssi_protocol: fix potential resource leak in ssip_pn_open()
-
-From: Jianglei Nie <niejianglei2021@163.com>
-
-[ Upstream commit b28dbcb379e6a7f80262c2732a57681b1ee548ca ]
-
-ssip_pn_open() claims the HSI client's port with hsi_claim_port(). When
-hsi_register_port_event() gets some error and returns a negetive value,
-the HSI client's port should be released with hsi_release_port().
-
-Fix it by calling hsi_release_port() when hsi_register_port_event() fails.
-
-Signed-off-by: Jianglei Nie <niejianglei2021@163.com>
-Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/hsi/clients/ssi_protocol.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/hsi/clients/ssi_protocol.c b/drivers/hsi/clients/ssi_protocol.c
-index 802afc98e8bd..09e6be746d1e 100644
---- a/drivers/hsi/clients/ssi_protocol.c
-+++ b/drivers/hsi/clients/ssi_protocol.c
-@@ -932,6 +932,7 @@ static int ssip_pn_open(struct net_device *dev)
-       if (err < 0) {
-               dev_err(&cl->device, "Register HSI port event failed (%d)\n",
-                       err);
-+              hsi_release_port(cl);
-               return err;
-       }
-       dev_dbg(&cl->device, "Configuring SSI port\n");
--- 
-2.35.1
-

diff --git a/queue-4.9/series b/queue-4.9/series
index 6897949c3e17887c2bb5ba1085259b58267c3433..37df05bdbc2530d74be6ba2982f132a13a6991a1 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -146,7 +146,6 @@ arm-dts-imx6sl-add-missing-properties-for-sram.patch
 media-cx88-fix-a-null-ptr-deref-bug-in-buffer_prepar.patch
 scsi-3w-9xxx-avoid-disabling-device-if-failing-to-en.patch
 hid-roccat-fix-use-after-free-in-roccat_read.patch
-hsi-ssi_protocol-fix-potential-resource-leak-in-ssip.patch
 usb-host-xhci-fix-potential-memory-leak-in-xhci_allo.patch
 usb-musb-fix-musb_gadget.c-rxstate-overflow-bug.patch
 revert-usb-storage-add-quirk-for-samsung-fit-flash.patch

diff --git a/queue-5.10/hsi-ssi_protocol-fix-potential-resource-leak-in-ssip.patch b/queue-5.10/hsi-ssi_protocol-fix-potential-resource-leak-in-ssip.patch
deleted file mode 100644 (file)
index b0252ec..0000000
--- a/queue-5.10/hsi-ssi_protocol-fix-potential-resource-leak-in-ssip.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From b05b19e0de0e32ea68fe79a14bf8f2fba1abbe52 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 5 Sep 2022 15:48:01 +0800
-Subject: HSI: ssi_protocol: fix potential resource leak in ssip_pn_open()
-
-From: Jianglei Nie <niejianglei2021@163.com>
-
-[ Upstream commit b28dbcb379e6a7f80262c2732a57681b1ee548ca ]
-
-ssip_pn_open() claims the HSI client's port with hsi_claim_port(). When
-hsi_register_port_event() gets some error and returns a negetive value,
-the HSI client's port should be released with hsi_release_port().
-
-Fix it by calling hsi_release_port() when hsi_register_port_event() fails.
-
-Signed-off-by: Jianglei Nie <niejianglei2021@163.com>
-Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/hsi/clients/ssi_protocol.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/hsi/clients/ssi_protocol.c b/drivers/hsi/clients/ssi_protocol.c
-index 96d0eccca3aa..f202751484aa 100644
---- a/drivers/hsi/clients/ssi_protocol.c
-+++ b/drivers/hsi/clients/ssi_protocol.c
-@@ -931,6 +931,7 @@ static int ssip_pn_open(struct net_device *dev)
-       if (err < 0) {
-               dev_err(&cl->device, "Register HSI port event failed (%d)\n",
-                       err);
-+              hsi_release_port(cl);
-               return err;
-       }
-       dev_dbg(&cl->device, "Configuring SSI port\n");
--- 
-2.35.1
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 1c9f16ec903289a7dddcd0da99f88d8184a68ec9..01409ff09c15485982e06cb6069791db41eae0af 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -378,7 +378,6 @@ bcache-fix-set_at_max_writeback_rate-for-multiple-at.patch
 soundwire-cadence-don-t-overwrite-msg-buf-during-wri.patch
 soundwire-intel-fix-error-handling-on-dai-registrati.patch
 hid-roccat-fix-use-after-free-in-roccat_read.patch
-hsi-ssi_protocol-fix-potential-resource-leak-in-ssip.patch
 md-raid5-wait-for-md_sb_change_pending-in-raid5d.patch
 usb-host-xhci-fix-potential-memory-leak-in-xhci_allo.patch
 usb-musb-fix-musb_gadget.c-rxstate-overflow-bug.patch

diff --git a/queue-5.15/hsi-ssi_protocol-fix-potential-resource-leak-in-ssip.patch b/queue-5.15/hsi-ssi_protocol-fix-potential-resource-leak-in-ssip.patch
deleted file mode 100644 (file)
index ff9ab5d..0000000
--- a/queue-5.15/hsi-ssi_protocol-fix-potential-resource-leak-in-ssip.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 521247f5e382920cc0b1ddb76fb92d0ec87be09b Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 5 Sep 2022 15:48:01 +0800
-Subject: HSI: ssi_protocol: fix potential resource leak in ssip_pn_open()
-
-From: Jianglei Nie <niejianglei2021@163.com>
-
-[ Upstream commit b28dbcb379e6a7f80262c2732a57681b1ee548ca ]
-
-ssip_pn_open() claims the HSI client's port with hsi_claim_port(). When
-hsi_register_port_event() gets some error and returns a negetive value,
-the HSI client's port should be released with hsi_release_port().
-
-Fix it by calling hsi_release_port() when hsi_register_port_event() fails.
-
-Signed-off-by: Jianglei Nie <niejianglei2021@163.com>
-Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/hsi/clients/ssi_protocol.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/hsi/clients/ssi_protocol.c b/drivers/hsi/clients/ssi_protocol.c
-index 96d0eccca3aa..f202751484aa 100644
---- a/drivers/hsi/clients/ssi_protocol.c
-+++ b/drivers/hsi/clients/ssi_protocol.c
-@@ -931,6 +931,7 @@ static int ssip_pn_open(struct net_device *dev)
-       if (err < 0) {
-               dev_err(&cl->device, "Register HSI port event failed (%d)\n",
-                       err);
-+              hsi_release_port(cl);
-               return err;
-       }
-       dev_dbg(&cl->device, "Configuring SSI port\n");
--- 
-2.35.1
-

diff --git a/queue-5.15/series b/queue-5.15/series
index e6c1c5f8f0c6bcab14ad18f3e1d433e62be224e6..5bc91d1caf70e710f5cb18b7eb630fbacb57fece 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -500,7 +500,6 @@ bcache-fix-set_at_max_writeback_rate-for-multiple-at.patch
 soundwire-cadence-don-t-overwrite-msg-buf-during-wri.patch
 soundwire-intel-fix-error-handling-on-dai-registrati.patch
 hid-roccat-fix-use-after-free-in-roccat_read.patch
-hsi-ssi_protocol-fix-potential-resource-leak-in-ssip.patch
 eventfd-guard-wake_up-in-eventfd-fs-calls-as-well.patch
 md-raid5-wait-for-md_sb_change_pending-in-raid5d.patch
 usb-host-xhci-fix-potential-memory-leak-in-xhci_allo.patch

diff --git a/queue-5.4/hsi-ssi_protocol-fix-potential-resource-leak-in-ssip.patch b/queue-5.4/hsi-ssi_protocol-fix-potential-resource-leak-in-ssip.patch
deleted file mode 100644 (file)
index 5794a8c..0000000
--- a/queue-5.4/hsi-ssi_protocol-fix-potential-resource-leak-in-ssip.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From b7d090fa689a4bbcd5359583613729591f7daab1 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 5 Sep 2022 15:48:01 +0800
-Subject: HSI: ssi_protocol: fix potential resource leak in ssip_pn_open()
-
-From: Jianglei Nie <niejianglei2021@163.com>
-
-[ Upstream commit b28dbcb379e6a7f80262c2732a57681b1ee548ca ]
-
-ssip_pn_open() claims the HSI client's port with hsi_claim_port(). When
-hsi_register_port_event() gets some error and returns a negetive value,
-the HSI client's port should be released with hsi_release_port().
-
-Fix it by calling hsi_release_port() when hsi_register_port_event() fails.
-
-Signed-off-by: Jianglei Nie <niejianglei2021@163.com>
-Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/hsi/clients/ssi_protocol.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/hsi/clients/ssi_protocol.c b/drivers/hsi/clients/ssi_protocol.c
-index 365b5d5967ac..01a2e861c399 100644
---- a/drivers/hsi/clients/ssi_protocol.c
-+++ b/drivers/hsi/clients/ssi_protocol.c
-@@ -931,6 +931,7 @@ static int ssip_pn_open(struct net_device *dev)
-       if (err < 0) {
-               dev_err(&cl->device, "Register HSI port event failed (%d)\n",
-                       err);
-+              hsi_release_port(cl);
-               return err;
-       }
-       dev_dbg(&cl->device, "Configuring SSI port\n");
--- 
-2.35.1
-

diff --git a/queue-5.4/series b/queue-5.4/series
index 8d8df04eed21979fffeb036af364663bf1f84a8a..aaae0ae581ec913398593cd8584e9dc066ef4952 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -235,7 +235,6 @@ staging-vt6655-fix-potential-memory-leak.patch
 ata-libahci_platform-sanity-check-the-dt-child-nodes.patch
 bcache-fix-set_at_max_writeback_rate-for-multiple-at.patch
 hid-roccat-fix-use-after-free-in-roccat_read.patch
-hsi-ssi_protocol-fix-potential-resource-leak-in-ssip.patch
 md-raid5-wait-for-md_sb_change_pending-in-raid5d.patch
 usb-host-xhci-fix-potential-memory-leak-in-xhci_allo.patch
 usb-musb-fix-musb_gadget.c-rxstate-overflow-bug.patch