Skip to content

Commit

Permalink
um: port_user: Improve error handling when port-helper is not found
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Glenn Washburn authored and Richard Weinberger committed Mar 11, 2022
1 parent db8109a commit 3cb5a7f
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions arch/um/drivers/port_user.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <termios.h>
#include <unistd.h>
Expand Down Expand Up @@ -179,6 +180,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;
Expand Down

0 comments on commit 3cb5a7f

Please sign in to comment.