From: Greg Kroah-Hartman Date: Tue, 14 May 2019 12:23:22 +0000 (+0200) Subject: 4.19-stable patches X-Git-Tag: v5.1.2~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fefada5fe9ca3e1256ed7999f995c23e98ba801a;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: um-don-t-hardcode-path-as-it-is-architecture-dependent.patch --- diff --git a/queue-4.19/series b/queue-4.19/series index 5f6faf470e3..5800cc5192b 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -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 index 00000000000..37b0c5ae90a --- /dev/null +++ b/queue-4.19/um-don-t-hardcode-path-as-it-is-architecture-dependent.patch @@ -0,0 +1,31 @@ +From 9ca19a3a3e2482916c475b90f3d7fa2a03d8e5ed Mon Sep 17 00:00:00 2001 +From: Ritesh Raj Sarraf +Date: Thu, 20 Sep 2018 11:56:38 +0530 +Subject: um: Don't hardcode path as it is architecture dependent + +From: Ritesh Raj Sarraf + +commit 9ca19a3a3e2482916c475b90f3d7fa2a03d8e5ed upstream. + +The current code fails to run on amd64 because of hardcoded reference to +i386 + +Signed-off-by: Ritesh Raj Sarraf +Signed-off-by: Richard Weinberger +Signed-off-by: Greg Kroah-Hartman + +--- + 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);