[PATCH] um: Don't hardcode path as it is architecture dependent

[PATCH] um: Don't hardcode path as it is architecture dependent

[Ritesh Raj Sarraf]

Dear Stable Team,
Request for inclusion into the stable branches of Linux. This change
went into 4.20 but 4.19 is the LTS release that many of the Linux
Vendors are rebasing on. Hence, it'd be nice to see this part of the LTS
releases, at least 4.19.


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>
---
 arch/um/drivers/port_user.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/um/drivers/port_user.c b/arch/um/drivers/port_user.c
index 9a8e1b64c22e..5f56d11b886f 100644
--- 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 *pid_out)
 {
 	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);
-- 
2.20.1

Re: [PATCH] um: Don't hardcode path as it is architecture dependent

[Greg KH]

On Tue, May 14, 2019 at 03:46:57PM +0530, Ritesh Raj Sarraf wrote:
> Dear Stable Team,
> Request for inclusion into the stable branches of Linux. This change
> went into 4.20 but 4.19 is the LTS release that many of the Linux
> Vendors are rebasing on. Hence, it'd be nice to see this part of the LTS
> releases, at least 4.19.
> 
> 
> 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>
> ---
>  arch/um/drivers/port_user.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

What is the git commit id of this patch in Linus's tree?

thanks,

greg k-h

Re: [PATCH] um: Don't hardcode path as it is architecture dependent

[Ritesh Raj Sarraf]

[-- Attachment #1: Type: text/plain, Size: 830 bytes --]

Hello Greg,

On Tue, 2019-05-14 at 12:26 +0200, Greg KH wrote:
> On Tue, May 14, 2019 at 03:46:57PM +0530, Ritesh Raj Sarraf wrote:
> > 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>
> > ---
> >   arch/um/drivers/port_user.c | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> What is the git commit id of this patch in Linus's tree?

The git commit id should be: 9ca19a3a3e2482916c475b90f3d7fa2a03d8e5ed
The web url is: 
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=9ca19a3a3e2482916c475b90f3d7fa2a03d8e5ed


-- 
Ritesh Raj Sarraf | http://people.debian.org/~rrs
Debian - The Universal Operating System

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH] um: Don't hardcode path as it is architecture dependent

[Greg KH]

On Tue, May 14, 2019 at 04:36:38PM +0530, Ritesh Raj Sarraf wrote:
> Hello Greg,
> 
> On Tue, 2019-05-14 at 12:26 +0200, Greg KH wrote:
> > On Tue, May 14, 2019 at 03:46:57PM +0530, Ritesh Raj Sarraf wrote:
> > > 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>
> > > ---
> > >   arch/um/drivers/port_user.c | 2 +-
> > >   1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > What is the git commit id of this patch in Linus's tree?
> 
> The git commit id should be: 9ca19a3a3e2482916c475b90f3d7fa2a03d8e5ed

Thanks, now queued up.

greg k-h