Drop um-port_user-improve-error-handling-when-port-helper.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.14/series b/queue-4.14/series
index ecdb74ba367b2f3d7ff0f8aad41c648872093e0c..20412fbce9a7dd9145f2d75f87a4a1aeb5fd8621 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -1,6 +1,5 @@
 floppy-use-a-statically-allocated-error-counter.patch
 um-cleanup-syscall_handler_t-definition-cast-fix-war.patch
-um-port_user-improve-error-handling-when-port-helper.patch
 input-add-bounds-checking-to-input_set_capability.patch
 input-stmfts-fix-reference-leak-in-stmfts_input_open.patch
 mips-lantiq-check-the-return-value-of-kzalloc.patch

diff --git a/queue-4.14/um-port_user-improve-error-handling-when-port-helper.patch b/queue-4.14/um-port_user-improve-error-handling-when-port-helper.patch
deleted file mode 100644 (file)
index 1fc58ef..0000000
--- a/queue-4.14/um-port_user-improve-error-handling-when-port-helper.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 533d4814678807a038ae74fdbdcab780f5af538b Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 3 Mar 2022 01:53:32 -0600
-Subject: um: port_user: Improve error handling when port-helper is not found
-
-From: Glenn Washburn <development@efficientek.com>
-
-[ Upstream commit 3cb5a7f167c620a8b0e38b0446df2e024d2243dc ]
-
-Check if port-helper exists and is executable. If not, write an error
-message to the kernel log with information to help the user diagnose the
-issue and exit with an error. If UML_PORT_HELPER was not set, write a
-message suggesting that the user set it. This makes it easier to understand
-why telneting to the UML instance is failing and what can be done to fix it.
-
-Signed-off-by: Glenn Washburn <development@efficientek.com>
-Signed-off-by: Richard Weinberger <richard@nod.at>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/um/drivers/port_user.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/arch/um/drivers/port_user.c b/arch/um/drivers/port_user.c
-index 9a8e1b64c22e..d3cf5db1350a 100644
---- a/arch/um/drivers/port_user.c
-+++ b/arch/um/drivers/port_user.c
-@@ -5,6 +5,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <errno.h>
- #include <termios.h>
- #include <unistd.h>
-@@ -175,6 +176,17 @@ int port_connection(int fd, int *socket, int *pid_out)
-       if (new < 0)
-               return -errno;
- 
-+      err = os_access(argv[2], X_OK);
-+      if (err < 0) {
-+              printk(UM_KERN_ERR "port_connection : error accessing port-helper "
-+                     "executable at %s: %s\n", argv[2], strerror(-err));
-+              if (env == NULL)
-+                      printk(UM_KERN_ERR "Set UML_PORT_HELPER environment "
-+                              "variable to path to uml-utilities port-helper "
-+                              "binary\n");
-+              goto out_close;
-+      }
-+
-       err = os_pipe(socket, 0, 0);
-       if (err < 0)
-               goto out_close;
--- 
-2.35.1
-

diff --git a/queue-4.19/series b/queue-4.19/series
index 5408c873d9d2a605bbebf32f78f8f201ee09ffe0..544218746619ee610a2d0ec61013b041c56428d2 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -1,6 +1,5 @@
 floppy-use-a-statically-allocated-error-counter.patch
 um-cleanup-syscall_handler_t-definition-cast-fix-war.patch
-um-port_user-improve-error-handling-when-port-helper.patch
 input-add-bounds-checking-to-input_set_capability.patch
 input-stmfts-fix-reference-leak-in-stmfts_input_open.patch
 crypto-stm32-fix-reference-leak-in-stm32_crc_remove.patch

diff --git a/queue-4.19/um-port_user-improve-error-handling-when-port-helper.patch b/queue-4.19/um-port_user-improve-error-handling-when-port-helper.patch
deleted file mode 100644 (file)
index 34a7b38..0000000
--- a/queue-4.19/um-port_user-improve-error-handling-when-port-helper.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From bd2fd76bb405133fd01c72dbf083637ca85e89db Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 3 Mar 2022 01:53:32 -0600
-Subject: um: port_user: Improve error handling when port-helper is not found
-
-From: Glenn Washburn <development@efficientek.com>
-
-[ Upstream commit 3cb5a7f167c620a8b0e38b0446df2e024d2243dc ]
-
-Check if port-helper exists and is executable. If not, write an error
-message to the kernel log with information to help the user diagnose the
-issue and exit with an error. If UML_PORT_HELPER was not set, write a
-message suggesting that the user set it. This makes it easier to understand
-why telneting to the UML instance is failing and what can be done to fix it.
-
-Signed-off-by: Glenn Washburn <development@efficientek.com>
-Signed-off-by: Richard Weinberger <richard@nod.at>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/um/drivers/port_user.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/arch/um/drivers/port_user.c b/arch/um/drivers/port_user.c
-index 5f56d11b886f..f66dc4efc64e 100644
---- a/arch/um/drivers/port_user.c
-+++ b/arch/um/drivers/port_user.c
-@@ -5,6 +5,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <errno.h>
- #include <termios.h>
- #include <unistd.h>
-@@ -175,6 +176,17 @@ int port_connection(int fd, int *socket, int *pid_out)
-       if (new < 0)
-               return -errno;
- 
-+      err = os_access(argv[2], X_OK);
-+      if (err < 0) {
-+              printk(UM_KERN_ERR "port_connection : error accessing port-helper "
-+                     "executable at %s: %s\n", argv[2], strerror(-err));
-+              if (env == NULL)
-+                      printk(UM_KERN_ERR "Set UML_PORT_HELPER environment "
-+                              "variable to path to uml-utilities port-helper "
-+                              "binary\n");
-+              goto out_close;
-+      }
-+
-       err = os_pipe(socket, 0, 0);
-       if (err < 0)
-               goto out_close;
--- 
-2.35.1
-

diff --git a/queue-4.9/series b/queue-4.9/series
index 5f38bf8dc81568e4161967caf49c6c303ff93a9b..720a19ac70e84cca9962a768e850fc085efb0639 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -1,6 +1,5 @@
 floppy-use-a-statically-allocated-error-counter.patch
 um-cleanup-syscall_handler_t-definition-cast-fix-war.patch
-um-port_user-improve-error-handling-when-port-helper.patch
 input-add-bounds-checking-to-input_set_capability.patch
 mips-lantiq-check-the-return-value-of-kzalloc.patch
 drbd-remove-usage-of-list-iterator-variable-after-lo.patch

diff --git a/queue-4.9/um-port_user-improve-error-handling-when-port-helper.patch b/queue-4.9/um-port_user-improve-error-handling-when-port-helper.patch
deleted file mode 100644 (file)
index 4f66903..0000000
--- a/queue-4.9/um-port_user-improve-error-handling-when-port-helper.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From f85a356c251c832665dc8d01a95835e905315783 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 3 Mar 2022 01:53:32 -0600
-Subject: um: port_user: Improve error handling when port-helper is not found
-
-From: Glenn Washburn <development@efficientek.com>
-
-[ Upstream commit 3cb5a7f167c620a8b0e38b0446df2e024d2243dc ]
-
-Check if port-helper exists and is executable. If not, write an error
-message to the kernel log with information to help the user diagnose the
-issue and exit with an error. If UML_PORT_HELPER was not set, write a
-message suggesting that the user set it. This makes it easier to understand
-why telneting to the UML instance is failing and what can be done to fix it.
-
-Signed-off-by: Glenn Washburn <development@efficientek.com>
-Signed-off-by: Richard Weinberger <richard@nod.at>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/um/drivers/port_user.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/arch/um/drivers/port_user.c b/arch/um/drivers/port_user.c
-index 9a8e1b64c22e..d3cf5db1350a 100644
---- a/arch/um/drivers/port_user.c
-+++ b/arch/um/drivers/port_user.c
-@@ -5,6 +5,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <errno.h>
- #include <termios.h>
- #include <unistd.h>
-@@ -175,6 +176,17 @@ int port_connection(int fd, int *socket, int *pid_out)
-       if (new < 0)
-               return -errno;
- 
-+      err = os_access(argv[2], X_OK);
-+      if (err < 0) {
-+              printk(UM_KERN_ERR "port_connection : error accessing port-helper "
-+                     "executable at %s: %s\n", argv[2], strerror(-err));
-+              if (env == NULL)
-+                      printk(UM_KERN_ERR "Set UML_PORT_HELPER environment "
-+                              "variable to path to uml-utilities port-helper "
-+                              "binary\n");
-+              goto out_close;
-+      }
-+
-       err = os_pipe(socket, 0, 0);
-       if (err < 0)
-               goto out_close;
--- 
-2.35.1
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 2be865f24620e57a60490dd71915992e030d5977..a39b29561549c3a793f368a71895644ebc7f4ab5 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -19,7 +19,6 @@ revert-drm-i915-opregion-check-port-number-bounds-for-swsci-display-power-state.
 rtc-fix-use-after-free-on-device-removal.patch
 rtc-pcf2127-fix-bug-when-reading-alarm-registers.patch
 um-cleanup-syscall_handler_t-definition-cast-fix-war.patch
-um-port_user-improve-error-handling-when-port-helper.patch
 input-add-bounds-checking-to-input_set_capability.patch
 input-stmfts-fix-reference-leak-in-stmfts_input_open.patch
 nvme-pci-add-quirks-for-samsung-x5-ssds.patch

diff --git a/queue-5.15/um-port_user-improve-error-handling-when-port-helper.patch b/queue-5.15/um-port_user-improve-error-handling-when-port-helper.patch
deleted file mode 100644 (file)
index 5ce5cbd..0000000
--- a/queue-5.15/um-port_user-improve-error-handling-when-port-helper.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 11f4f3e18ae8e90bdb7edf60d5b343f16b6c7c49 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 3 Mar 2022 01:53:32 -0600
-Subject: um: port_user: Improve error handling when port-helper is not found
-
-From: Glenn Washburn <development@efficientek.com>
-
-[ Upstream commit 3cb5a7f167c620a8b0e38b0446df2e024d2243dc ]
-
-Check if port-helper exists and is executable. If not, write an error
-message to the kernel log with information to help the user diagnose the
-issue and exit with an error. If UML_PORT_HELPER was not set, write a
-message suggesting that the user set it. This makes it easier to understand
-why telneting to the UML instance is failing and what can be done to fix it.
-
-Signed-off-by: Glenn Washburn <development@efficientek.com>
-Signed-off-by: Richard Weinberger <richard@nod.at>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/um/drivers/port_user.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/arch/um/drivers/port_user.c b/arch/um/drivers/port_user.c
-index 5b5b64cb1071..133ca7bf2d91 100644
---- a/arch/um/drivers/port_user.c
-+++ b/arch/um/drivers/port_user.c
-@@ -5,6 +5,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <errno.h>
- #include <termios.h>
- #include <unistd.h>
-@@ -175,6 +176,17 @@ int port_connection(int fd, int *socket, int *pid_out)
-       if (new < 0)
-               return -errno;
- 
-+      err = os_access(argv[2], X_OK);
-+      if (err < 0) {
-+              printk(UM_KERN_ERR "port_connection : error accessing port-helper "
-+                     "executable at %s: %s\n", argv[2], strerror(-err));
-+              if (env == NULL)
-+                      printk(UM_KERN_ERR "Set UML_PORT_HELPER environment "
-+                              "variable to path to uml-utilities port-helper "
-+                              "binary\n");
-+              goto out_close;
-+      }
-+
-       err = os_pipe(socket, 0, 0);
-       if (err < 0)
-               goto out_close;
--- 
-2.35.1
-

diff --git a/queue-5.17/series b/queue-5.17/series
index d607ce8d9bbe7c5fe491a198c84461afd6cf8c95..51afa8e04e3c1e80129e25ee14e7ce272ecf7e20 100644 (file)
--- a/queue-5.17/series
+++ b/queue-5.17/series
@@ -20,7 +20,6 @@ rtc-fix-use-after-free-on-device-removal.patch
 rtc-pcf2127-fix-bug-when-reading-alarm-registers.patch
 kconfig-add-fflush-before-ferror-check.patch
 um-cleanup-syscall_handler_t-definition-cast-fix-war.patch
-um-port_user-improve-error-handling-when-port-helper.patch
 input-add-bounds-checking-to-input_set_capability.patch
 input-stmfts-fix-reference-leak-in-stmfts_input_open.patch
 nvme-pci-add-quirks-for-samsung-x5-ssds.patch

diff --git a/queue-5.17/um-port_user-improve-error-handling-when-port-helper.patch b/queue-5.17/um-port_user-improve-error-handling-when-port-helper.patch
deleted file mode 100644 (file)
index eb9467d..0000000
--- a/queue-5.17/um-port_user-improve-error-handling-when-port-helper.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From efc324ad7e7e1c92a8862bd71b2f5f8f15513304 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 3 Mar 2022 01:53:32 -0600
-Subject: um: port_user: Improve error handling when port-helper is not found
-
-From: Glenn Washburn <development@efficientek.com>
-
-[ Upstream commit 3cb5a7f167c620a8b0e38b0446df2e024d2243dc ]
-
-Check if port-helper exists and is executable. If not, write an error
-message to the kernel log with information to help the user diagnose the
-issue and exit with an error. If UML_PORT_HELPER was not set, write a
-message suggesting that the user set it. This makes it easier to understand
-why telneting to the UML instance is failing and what can be done to fix it.
-
-Signed-off-by: Glenn Washburn <development@efficientek.com>
-Signed-off-by: Richard Weinberger <richard@nod.at>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/um/drivers/port_user.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/arch/um/drivers/port_user.c b/arch/um/drivers/port_user.c
-index 5b5b64cb1071..133ca7bf2d91 100644
---- a/arch/um/drivers/port_user.c
-+++ b/arch/um/drivers/port_user.c
-@@ -5,6 +5,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <errno.h>
- #include <termios.h>
- #include <unistd.h>
-@@ -175,6 +176,17 @@ int port_connection(int fd, int *socket, int *pid_out)
-       if (new < 0)
-               return -errno;
- 
-+      err = os_access(argv[2], X_OK);
-+      if (err < 0) {
-+              printk(UM_KERN_ERR "port_connection : error accessing port-helper "
-+                     "executable at %s: %s\n", argv[2], strerror(-err));
-+              if (env == NULL)
-+                      printk(UM_KERN_ERR "Set UML_PORT_HELPER environment "
-+                              "variable to path to uml-utilities port-helper "
-+                              "binary\n");
-+              goto out_close;
-+      }
-+
-       err = os_pipe(socket, 0, 0);
-       if (err < 0)
-               goto out_close;
--- 
-2.35.1
-

diff --git a/queue-5.4/series b/queue-5.4/series
index 3d65d56bd64fdd06040c842ff74852ab00cb46eb..825aaf9369518612b2f51e8a4edfbc12e445c73a 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -3,7 +3,6 @@ x86-xen-make-the-boot-cpu-idle-task-reliable.patch
 x86-xen-make-the-secondary-cpu-idle-tasks-reliable.patch
 rtc-fix-use-after-free-on-device-removal.patch
 um-cleanup-syscall_handler_t-definition-cast-fix-war.patch
-um-port_user-improve-error-handling-when-port-helper.patch
 input-add-bounds-checking-to-input_set_capability.patch
 input-stmfts-fix-reference-leak-in-stmfts_input_open.patch
 crypto-stm32-fix-reference-leak-in-stm32_crc_remove.patch

diff --git a/queue-5.4/um-port_user-improve-error-handling-when-port-helper.patch b/queue-5.4/um-port_user-improve-error-handling-when-port-helper.patch
deleted file mode 100644 (file)
index 7d97fc2..0000000
--- a/queue-5.4/um-port_user-improve-error-handling-when-port-helper.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 347d446d74d57354a34c9b47abd6c36ba8c75fd4 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 3 Mar 2022 01:53:32 -0600
-Subject: um: port_user: Improve error handling when port-helper is not found
-
-From: Glenn Washburn <development@efficientek.com>
-
-[ Upstream commit 3cb5a7f167c620a8b0e38b0446df2e024d2243dc ]
-
-Check if port-helper exists and is executable. If not, write an error
-message to the kernel log with information to help the user diagnose the
-issue and exit with an error. If UML_PORT_HELPER was not set, write a
-message suggesting that the user set it. This makes it easier to understand
-why telneting to the UML instance is failing and what can be done to fix it.
-
-Signed-off-by: Glenn Washburn <development@efficientek.com>
-Signed-off-by: Richard Weinberger <richard@nod.at>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/um/drivers/port_user.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/arch/um/drivers/port_user.c b/arch/um/drivers/port_user.c
-index 5b5b64cb1071..133ca7bf2d91 100644
---- a/arch/um/drivers/port_user.c
-+++ b/arch/um/drivers/port_user.c
-@@ -5,6 +5,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <errno.h>
- #include <termios.h>
- #include <unistd.h>
-@@ -175,6 +176,17 @@ int port_connection(int fd, int *socket, int *pid_out)
-       if (new < 0)
-               return -errno;
- 
-+      err = os_access(argv[2], X_OK);
-+      if (err < 0) {
-+              printk(UM_KERN_ERR "port_connection : error accessing port-helper "
-+                     "executable at %s: %s\n", argv[2], strerror(-err));
-+              if (env == NULL)
-+                      printk(UM_KERN_ERR "Set UML_PORT_HELPER environment "
-+                              "variable to path to uml-utilities port-helper "
-+                              "binary\n");
-+              goto out_close;
-+      }
-+
-       err = os_pipe(socket, 0, 0);
-       if (err < 0)
-               goto out_close;
--- 
-2.35.1
-