shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-27 10:25:06 +03:00
Code

main: ignore EPERM in TIOCSTTY when opening terminal for crash shell

Browse Source
This commit is contained in:
Lennart Poettering 2010-05-18 03:40:19 +02:00
parent 5b2a090372
commit 21de3988ab
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/execute.c
View File

@ -274,7 +274,8 @@ static int setup_input(const ExecContext *context, int socket_fd) {
if ((fd = acquire_terminal(
tty_path(context),
i == EXEC_INPUT_TTY_FAIL,
i == EXEC_INPUT_TTY_FORCE)) < 0)
i == EXEC_INPUT_TTY_FORCE,
false)) < 0)
return fd;
if (fd != STDIN_FILENO) {
@ -429,7 +430,8 @@ static int setup_confirm_stdio(const ExecContext *context,
if ((fd = acquire_terminal(
tty_path(context),
context->std_input == EXEC_INPUT_TTY_FAIL,
context->std_input == EXEC_INPUT_TTY_FORCE)) < 0) {
context->std_input == EXEC_INPUT_TTY_FORCE,
false)) < 0) {
r = EXIT_STDIN;
goto fail;
}

2
src/main.c
View File

@ -138,7 +138,7 @@ _noreturn static void crash(int sig) {
else if (pid == 0) {
int fd, r;
if ((fd = acquire_terminal("/dev/console", false, true)) < 0)
if ((fd = acquire_terminal("/dev/console", false, true, true)) < 0)
log_error("Failed to acquire terminal: %s", strerror(-fd));
else if ((r = make_stdio(fd)) < 0)
log_error("Failed to duplicate terminal fd: %s", strerror(-r));

13
src/util.c
View File

@ -1598,7 +1598,7 @@ int flush_fd(int fd) {
}
}
int acquire_terminal(const char *name, bool fail, bool force) {
int acquire_terminal(const char *name, bool fail, bool force, bool ignore_tiocstty_eperm) {
int fd = -1, notify = -1, r, wd = -1;
assert(name);
@ -1640,8 +1640,15 @@ int acquire_terminal(const char *name, bool fail, bool force) {
return -errno;
/* First, try to get the tty */
if ((r = ioctl(fd, TIOCSCTTY, force)) < 0 &&
(force || fail || errno != EPERM)) {
r = ioctl(fd, TIOCSCTTY, force);
/* Sometimes it makes sense to ignore TIOCSCTTY
* returning EPERM, i.e. when very likely we already
* are have this controlling terminal. */
if (r < 0 && errno == EPERM && ignore_tiocstty_eperm)
r = 0;
if (r < 0 && (force || fail || errno != EPERM)) {
r = -errno;
goto fail;
}

2
src/util.h
View File

@ -218,7 +218,7 @@ int ask(char *ret, const char *replies, const char *text, ...);
int reset_terminal(int fd);
int open_terminal(const char *name, int mode);
int acquire_terminal(const char *name, bool fail, bool force);
int acquire_terminal(const char *name, bool fail, bool force, bool ignore_tiocstty_eperm);
int release_terminal(void);
int flush_fd(int fd);