From 9b8e905e244715eccec305026db5844dcb3263f9 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 17 Oct 2022 08:51:43 +0200 Subject: [PATCH] drop usb-serial-console-move-mutex_unlock-before-usb_seri.patch from everywhere --- queue-4.14/series | 1 - ...le-move-mutex_unlock-before-usb_seri.patch | 39 ------------------- queue-4.19/series | 1 - ...le-move-mutex_unlock-before-usb_seri.patch | 39 ------------------- queue-4.9/series | 1 - ...le-move-mutex_unlock-before-usb_seri.patch | 39 ------------------- queue-5.10/series | 1 - ...le-move-mutex_unlock-before-usb_seri.patch | 39 ------------------- queue-5.15/series | 1 - ...le-move-mutex_unlock-before-usb_seri.patch | 39 ------------------- queue-5.19/series | 1 - ...le-move-mutex_unlock-before-usb_seri.patch | 39 ------------------- queue-5.4/series | 1 - ...le-move-mutex_unlock-before-usb_seri.patch | 39 ------------------- queue-6.0/series | 1 - ...le-move-mutex_unlock-before-usb_seri.patch | 39 ------------------- 16 files changed, 320 deletions(-) delete mode 100644 queue-4.14/usb-serial-console-move-mutex_unlock-before-usb_seri.patch delete mode 100644 queue-4.19/usb-serial-console-move-mutex_unlock-before-usb_seri.patch delete mode 100644 queue-4.9/usb-serial-console-move-mutex_unlock-before-usb_seri.patch delete mode 100644 queue-5.10/usb-serial-console-move-mutex_unlock-before-usb_seri.patch delete mode 100644 queue-5.15/usb-serial-console-move-mutex_unlock-before-usb_seri.patch delete mode 100644 queue-5.19/usb-serial-console-move-mutex_unlock-before-usb_seri.patch delete mode 100644 queue-5.4/usb-serial-console-move-mutex_unlock-before-usb_seri.patch delete mode 100644 queue-6.0/usb-serial-console-move-mutex_unlock-before-usb_seri.patch diff --git a/queue-4.14/series b/queue-4.14/series index c6619d2b79b..b40214dded9 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -129,7 +129,6 @@ rdma-rxe-fix-kernel-null-pointer-dereference-error.patch rdma-rxe-fix-the-error-caused-by-qp-sk.patch dyndbg-fix-module.dyndbg-handling.patch dyndbg-let-query-modname-override-actual-module-name.patch -usb-serial-console-move-mutex_unlock-before-usb_seri.patch ata-fix-ata_id_sense_reporting_enabled-and-ata_id_ha.patch ata-fix-ata_id_has_devslp.patch ata-fix-ata_id_has_ncq_autosense.patch diff --git a/queue-4.14/usb-serial-console-move-mutex_unlock-before-usb_seri.patch b/queue-4.14/usb-serial-console-move-mutex_unlock-before-usb_seri.patch deleted file mode 100644 index 2ef869a4865..00000000000 --- a/queue-4.14/usb-serial-console-move-mutex_unlock-before-usb_seri.patch +++ /dev/null @@ -1,39 +0,0 @@ -From b183aa0f146e7f34b5fae92f6f8fd77e870c6332 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 19 Sep 2022 18:48:24 +0800 -Subject: USB: serial: console: move mutex_unlock() before usb_serial_put() - -From: Liang He - -[ Upstream commit 61dfa797c731754642d1ac500a6ac42f9b47f920 ] - -While in current version there is no use-after-free as USB serial -core holds another reference when the console is registered, we -should better unlock before dropping the reference in -usb_console_setup(). - -Fixes: 7bd032dc2793 ("USB serial: update the console driver") -Signed-off-by: Liang He -Signed-off-by: Johan Hovold -Signed-off-by: Sasha Levin ---- - drivers/usb/serial/console.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c -index 43a862a90a77..6e5dc9ffe724 100644 ---- a/drivers/usb/serial/console.c -+++ b/drivers/usb/serial/console.c -@@ -189,8 +189,8 @@ static int usb_console_setup(struct console *co, char *options) - info->port = NULL; - usb_autopm_put_interface(serial->interface); - error_get_interface: -- usb_serial_put(serial); - mutex_unlock(&serial->disc_mutex); -+ usb_serial_put(serial); - return retval; - } - --- -2.35.1 - diff --git a/queue-4.19/series b/queue-4.19/series index f83ae57f030..17cf952a4c6 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -138,7 +138,6 @@ rdma-rxe-fix-the-error-caused-by-qp-sk.patch dyndbg-fix-module.dyndbg-handling.patch dyndbg-let-query-modname-override-actual-module-name.patch sbitmap-avoid-leaving-waitqueue-in-invalid-state-in-.patch -usb-serial-console-move-mutex_unlock-before-usb_seri.patch mtd-devices-docg3-check-the-return-value-of-devm_ior.patch ata-fix-ata_id_sense_reporting_enabled-and-ata_id_ha.patch ata-fix-ata_id_has_devslp.patch diff --git a/queue-4.19/usb-serial-console-move-mutex_unlock-before-usb_seri.patch b/queue-4.19/usb-serial-console-move-mutex_unlock-before-usb_seri.patch deleted file mode 100644 index b40770a771e..00000000000 --- a/queue-4.19/usb-serial-console-move-mutex_unlock-before-usb_seri.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8018340be2eb73f413e44383b523eca8b1ce1d5d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 19 Sep 2022 18:48:24 +0800 -Subject: USB: serial: console: move mutex_unlock() before usb_serial_put() - -From: Liang He - -[ Upstream commit 61dfa797c731754642d1ac500a6ac42f9b47f920 ] - -While in current version there is no use-after-free as USB serial -core holds another reference when the console is registered, we -should better unlock before dropping the reference in -usb_console_setup(). - -Fixes: 7bd032dc2793 ("USB serial: update the console driver") -Signed-off-by: Liang He -Signed-off-by: Johan Hovold -Signed-off-by: Sasha Levin ---- - drivers/usb/serial/console.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c -index 7d289302ff6c..299bdb3a58fe 100644 ---- a/drivers/usb/serial/console.c -+++ b/drivers/usb/serial/console.c -@@ -186,8 +186,8 @@ static int usb_console_setup(struct console *co, char *options) - info->port = NULL; - usb_autopm_put_interface(serial->interface); - error_get_interface: -- usb_serial_put(serial); - mutex_unlock(&serial->disc_mutex); -+ usb_serial_put(serial); - return retval; - } - --- -2.35.1 - diff --git a/queue-4.9/series b/queue-4.9/series index ab895623126..51ee96f28a7 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -102,7 +102,6 @@ rdma-rxe-fix-kernel-null-pointer-dereference-error.patch rdma-rxe-fix-the-error-caused-by-qp-sk.patch dyndbg-fix-module.dyndbg-handling.patch dyndbg-let-query-modname-override-actual-module-name.patch -usb-serial-console-move-mutex_unlock-before-usb_seri.patch ata-fix-ata_id_sense_reporting_enabled-and-ata_id_ha.patch ata-fix-ata_id_has_devslp.patch ata-fix-ata_id_has_ncq_autosense.patch diff --git a/queue-4.9/usb-serial-console-move-mutex_unlock-before-usb_seri.patch b/queue-4.9/usb-serial-console-move-mutex_unlock-before-usb_seri.patch deleted file mode 100644 index 4f2ea413a3b..00000000000 --- a/queue-4.9/usb-serial-console-move-mutex_unlock-before-usb_seri.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 3dd36f21191220cf593913bc40e64d94cac6f87f Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 19 Sep 2022 18:48:24 +0800 -Subject: USB: serial: console: move mutex_unlock() before usb_serial_put() - -From: Liang He - -[ Upstream commit 61dfa797c731754642d1ac500a6ac42f9b47f920 ] - -While in current version there is no use-after-free as USB serial -core holds another reference when the console is registered, we -should better unlock before dropping the reference in -usb_console_setup(). - -Fixes: 7bd032dc2793 ("USB serial: update the console driver") -Signed-off-by: Liang He -Signed-off-by: Johan Hovold -Signed-off-by: Sasha Levin ---- - drivers/usb/serial/console.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c -index 76062ce2d459..8b2ce8a9d97a 100644 ---- a/drivers/usb/serial/console.c -+++ b/drivers/usb/serial/console.c -@@ -189,8 +189,8 @@ static int usb_console_setup(struct console *co, char *options) - info->port = NULL; - usb_autopm_put_interface(serial->interface); - error_get_interface: -- usb_serial_put(serial); - mutex_unlock(&serial->disc_mutex); -+ usb_serial_put(serial); - return retval; - } - --- -2.35.1 - diff --git a/queue-5.10/series b/queue-5.10/series index 393b7d7d268..1503315c357 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -238,7 +238,6 @@ dyndbg-fix-module.dyndbg-handling.patch dyndbg-let-query-modname-override-actual-module-name.patch dyndbg-drop-exported-dynamic_debug_exec_queries.patch sbitmap-avoid-leaving-waitqueue-in-invalid-state-in-.patch -usb-serial-console-move-mutex_unlock-before-usb_seri.patch mtd-devices-docg3-check-the-return-value-of-devm_ior.patch phy-qcom-qmp-create-copies-of-qmp-phy-driver.patch phy-qcom-qmp-combo-disable-runtime-pm-on-unbind.patch diff --git a/queue-5.10/usb-serial-console-move-mutex_unlock-before-usb_seri.patch b/queue-5.10/usb-serial-console-move-mutex_unlock-before-usb_seri.patch deleted file mode 100644 index 3624137de0b..00000000000 --- a/queue-5.10/usb-serial-console-move-mutex_unlock-before-usb_seri.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 5db5401988518237efa9f3e295ec3f7b637206ca Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 19 Sep 2022 18:48:24 +0800 -Subject: USB: serial: console: move mutex_unlock() before usb_serial_put() - -From: Liang He - -[ Upstream commit 61dfa797c731754642d1ac500a6ac42f9b47f920 ] - -While in current version there is no use-after-free as USB serial -core holds another reference when the console is registered, we -should better unlock before dropping the reference in -usb_console_setup(). - -Fixes: 7bd032dc2793 ("USB serial: update the console driver") -Signed-off-by: Liang He -Signed-off-by: Johan Hovold -Signed-off-by: Sasha Levin ---- - drivers/usb/serial/console.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c -index b97aa40ca4d1..da19a5fa414f 100644 ---- a/drivers/usb/serial/console.c -+++ b/drivers/usb/serial/console.c -@@ -189,8 +189,8 @@ static int usb_console_setup(struct console *co, char *options) - info->port = NULL; - usb_autopm_put_interface(serial->interface); - error_get_interface: -- usb_serial_put(serial); - mutex_unlock(&serial->disc_mutex); -+ usb_serial_put(serial); - return retval; - } - --- -2.35.1 - diff --git a/queue-5.15/series b/queue-5.15/series index 18ccbd3b866..2380863122a 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -325,7 +325,6 @@ dyndbg-drop-exported-dynamic_debug_exec_queries.patch sbitmap-avoid-leaving-waitqueue-in-invalid-state-in-.patch clk-qcom-sm6115-select-qcom_gdsc.patch scsi-nvme-fc-add-new-routine-nvme_fc_io_getuuid.patch -usb-serial-console-move-mutex_unlock-before-usb_seri.patch mtd-devices-docg3-check-the-return-value-of-devm_ior.patch phy-qcom-qmp-create-copies-of-qmp-phy-driver.patch phy-qcom-qmp-combo-disable-runtime-pm-on-unbind.patch diff --git a/queue-5.15/usb-serial-console-move-mutex_unlock-before-usb_seri.patch b/queue-5.15/usb-serial-console-move-mutex_unlock-before-usb_seri.patch deleted file mode 100644 index 4f9c94a8f48..00000000000 --- a/queue-5.15/usb-serial-console-move-mutex_unlock-before-usb_seri.patch +++ /dev/null @@ -1,39 +0,0 @@ -From eba7219babbf4a33191207113d6308d6afbbe729 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 19 Sep 2022 18:48:24 +0800 -Subject: USB: serial: console: move mutex_unlock() before usb_serial_put() - -From: Liang He - -[ Upstream commit 61dfa797c731754642d1ac500a6ac42f9b47f920 ] - -While in current version there is no use-after-free as USB serial -core holds another reference when the console is registered, we -should better unlock before dropping the reference in -usb_console_setup(). - -Fixes: 7bd032dc2793 ("USB serial: update the console driver") -Signed-off-by: Liang He -Signed-off-by: Johan Hovold -Signed-off-by: Sasha Levin ---- - drivers/usb/serial/console.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c -index b97aa40ca4d1..da19a5fa414f 100644 ---- a/drivers/usb/serial/console.c -+++ b/drivers/usb/serial/console.c -@@ -189,8 +189,8 @@ static int usb_console_setup(struct console *co, char *options) - info->port = NULL; - usb_autopm_put_interface(serial->interface); - error_get_interface: -- usb_serial_put(serial); - mutex_unlock(&serial->disc_mutex); -+ usb_serial_put(serial); - return retval; - } - --- -2.35.1 - diff --git a/queue-5.19/series b/queue-5.19/series index 2ad7b30a6bf..1d6dc92b2f9 100644 --- a/queue-5.19/series +++ b/queue-5.19/series @@ -454,7 +454,6 @@ revert-sbitmap-fix-batched-wait_cnt-accounting.patch sbitmap-avoid-leaving-waitqueue-in-invalid-state-in-.patch clk-qcom-sm6115-select-qcom_gdsc.patch scsi-lpfc-fix-various-issues-reported-by-tools.patch -usb-serial-console-move-mutex_unlock-before-usb_seri.patch mtd-devices-docg3-check-the-return-value-of-devm_ior.patch remoteproc-harden-rproc_handle_vdev-against-integer-.patch phy-qcom-qmp-create-copies-of-qmp-phy-driver.patch diff --git a/queue-5.19/usb-serial-console-move-mutex_unlock-before-usb_seri.patch b/queue-5.19/usb-serial-console-move-mutex_unlock-before-usb_seri.patch deleted file mode 100644 index 6d05a955bda..00000000000 --- a/queue-5.19/usb-serial-console-move-mutex_unlock-before-usb_seri.patch +++ /dev/null @@ -1,39 +0,0 @@ -From a3d6eb0e59c646e0f627088507c2074e03d08b01 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 19 Sep 2022 18:48:24 +0800 -Subject: USB: serial: console: move mutex_unlock() before usb_serial_put() - -From: Liang He - -[ Upstream commit 61dfa797c731754642d1ac500a6ac42f9b47f920 ] - -While in current version there is no use-after-free as USB serial -core holds another reference when the console is registered, we -should better unlock before dropping the reference in -usb_console_setup(). - -Fixes: 7bd032dc2793 ("USB serial: update the console driver") -Signed-off-by: Liang He -Signed-off-by: Johan Hovold -Signed-off-by: Sasha Levin ---- - drivers/usb/serial/console.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c -index b97aa40ca4d1..da19a5fa414f 100644 ---- a/drivers/usb/serial/console.c -+++ b/drivers/usb/serial/console.c -@@ -189,8 +189,8 @@ static int usb_console_setup(struct console *co, char *options) - info->port = NULL; - usb_autopm_put_interface(serial->interface); - error_get_interface: -- usb_serial_put(serial); - mutex_unlock(&serial->disc_mutex); -+ usb_serial_put(serial); - return retval; - } - --- -2.35.1 - diff --git a/queue-5.4/series b/queue-5.4/series index 1def98bd8cd..6debf00a8a9 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -141,7 +141,6 @@ misc-ocxl-fix-possible-refcount-leak-in-afu_ioctl.patch dyndbg-fix-module.dyndbg-handling.patch dyndbg-let-query-modname-override-actual-module-name.patch sbitmap-avoid-leaving-waitqueue-in-invalid-state-in-.patch -usb-serial-console-move-mutex_unlock-before-usb_seri.patch mtd-devices-docg3-check-the-return-value-of-devm_ior.patch rdma-siw-always-consume-all-skbuf-data-in-sk_data_re.patch ata-fix-ata_id_sense_reporting_enabled-and-ata_id_ha.patch diff --git a/queue-5.4/usb-serial-console-move-mutex_unlock-before-usb_seri.patch b/queue-5.4/usb-serial-console-move-mutex_unlock-before-usb_seri.patch deleted file mode 100644 index 2f8042cf4c4..00000000000 --- a/queue-5.4/usb-serial-console-move-mutex_unlock-before-usb_seri.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ab97ffaf71223afed27527dec0496563b1304832 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 19 Sep 2022 18:48:24 +0800 -Subject: USB: serial: console: move mutex_unlock() before usb_serial_put() - -From: Liang He - -[ Upstream commit 61dfa797c731754642d1ac500a6ac42f9b47f920 ] - -While in current version there is no use-after-free as USB serial -core holds another reference when the console is registered, we -should better unlock before dropping the reference in -usb_console_setup(). - -Fixes: 7bd032dc2793 ("USB serial: update the console driver") -Signed-off-by: Liang He -Signed-off-by: Johan Hovold -Signed-off-by: Sasha Levin ---- - drivers/usb/serial/console.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c -index 7d289302ff6c..299bdb3a58fe 100644 ---- a/drivers/usb/serial/console.c -+++ b/drivers/usb/serial/console.c -@@ -186,8 +186,8 @@ static int usb_console_setup(struct console *co, char *options) - info->port = NULL; - usb_autopm_put_interface(serial->interface); - error_get_interface: -- usb_serial_put(serial); - mutex_unlock(&serial->disc_mutex); -+ usb_serial_put(serial); - return retval; - } - --- -2.35.1 - diff --git a/queue-6.0/series b/queue-6.0/series index a6859480c84..172184663fd 100644 --- a/queue-6.0/series +++ b/queue-6.0/series @@ -542,7 +542,6 @@ dyndbg-drop-exported-dynamic_debug_exec_queries.patch sbitmap-avoid-leaving-waitqueue-in-invalid-state-in-.patch clk-qcom-sm6115-select-qcom_gdsc.patch scsi-lpfc-fix-various-issues-reported-by-tools.patch -usb-serial-console-move-mutex_unlock-before-usb_seri.patch mtd-devices-docg3-check-the-return-value-of-devm_ior.patch remoteproc-harden-rproc_handle_vdev-against-integer-.patch phy-qcom-qmp-combo-disable-runtime-pm-on-unbind.patch diff --git a/queue-6.0/usb-serial-console-move-mutex_unlock-before-usb_seri.patch b/queue-6.0/usb-serial-console-move-mutex_unlock-before-usb_seri.patch deleted file mode 100644 index c556358a0ce..00000000000 --- a/queue-6.0/usb-serial-console-move-mutex_unlock-before-usb_seri.patch +++ /dev/null @@ -1,39 +0,0 @@ -From a6a2b086047b4f69ed056e84e9448502d96e3af7 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 19 Sep 2022 18:48:24 +0800 -Subject: USB: serial: console: move mutex_unlock() before usb_serial_put() - -From: Liang He - -[ Upstream commit 61dfa797c731754642d1ac500a6ac42f9b47f920 ] - -While in current version there is no use-after-free as USB serial -core holds another reference when the console is registered, we -should better unlock before dropping the reference in -usb_console_setup(). - -Fixes: 7bd032dc2793 ("USB serial: update the console driver") -Signed-off-by: Liang He -Signed-off-by: Johan Hovold -Signed-off-by: Sasha Levin ---- - drivers/usb/serial/console.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c -index b97aa40ca4d1..da19a5fa414f 100644 ---- a/drivers/usb/serial/console.c -+++ b/drivers/usb/serial/console.c -@@ -189,8 +189,8 @@ static int usb_console_setup(struct console *co, char *options) - info->port = NULL; - usb_autopm_put_interface(serial->interface); - error_get_interface: -- usb_serial_put(serial); - mutex_unlock(&serial->disc_mutex); -+ usb_serial_put(serial); - return retval; - } - --- -2.35.1 - -- 2.47.3