]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.19-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 14 May 2019 12:23:22 +0000 (14:23 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 14 May 2019 12:23:22 +0000 (14:23 +0200)
added patches:
um-don-t-hardcode-path-as-it-is-architecture-dependent.patch

queue-4.19/series
queue-4.19/um-don-t-hardcode-path-as-it-is-architecture-dependent.patch [new file with mode: 0644]

index 5f6faf470e3b291e3af739f9b409440b61fe967f..5800cc5192bce541bf2e98ba5a3756c39209bcc9 100644 (file)
@@ -83,3 +83,4 @@ cw1200-fix-missing-unlock-on-error-in-cw1200_hw_scan.patch
 mwl8k-fix-rate_idx-underflow.patch
 rtlwifi-rtl8723ae-fix-missing-break-in-switch-statement.patch
 don-t-jump-to-compute_result-state-from-check_result-state.patch
+um-don-t-hardcode-path-as-it-is-architecture-dependent.patch
diff --git a/queue-4.19/um-don-t-hardcode-path-as-it-is-architecture-dependent.patch b/queue-4.19/um-don-t-hardcode-path-as-it-is-architecture-dependent.patch
new file mode 100644 (file)
index 0000000..37b0c5a
--- /dev/null
@@ -0,0 +1,31 @@
+From 9ca19a3a3e2482916c475b90f3d7fa2a03d8e5ed Mon Sep 17 00:00:00 2001
+From: Ritesh Raj Sarraf <rrs@debian.org>
+Date: Thu, 20 Sep 2018 11:56:38 +0530
+Subject: um: Don't hardcode path as it is architecture dependent
+
+From: Ritesh Raj Sarraf <rrs@debian.org>
+
+commit 9ca19a3a3e2482916c475b90f3d7fa2a03d8e5ed upstream.
+
+The current code fails to run on amd64 because of hardcoded reference to
+i386
+
+Signed-off-by: Ritesh Raj Sarraf <rrs@researchut.com>
+Signed-off-by: Richard Weinberger <richard@nod.at>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/um/drivers/port_user.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/um/drivers/port_user.c
++++ b/arch/um/drivers/port_user.c
+@@ -168,7 +168,7 @@ int port_connection(int fd, int *socket,
+ {
+       int new, err;
+       char *argv[] = { "/usr/sbin/in.telnetd", "-L",
+-                       "/usr/lib/uml/port-helper", NULL };
++                       OS_LIB_PATH "/uml/port-helper", NULL };
+       struct port_pre_exec_data data;
+       new = accept(fd, NULL, 0);