diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2020-01-21 07:07:31 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-01-21 18:09:25 +1100 |
| commit | b5fcb0ac1cc0ef01aeec1c089146298654ab3ae0 (patch) | |
| tree | 51a92a833a7c39892f7d383e4f1aac39b6b766e2 /ssh-sk-client.c | |
| parent | 56bced43c14dc6fa2bfa1816007e441644105609 (diff) | |
| download | openssh-git-b5fcb0ac1cc0ef01aeec1c089146298654ab3ae0.tar.gz | |
upstream: check access(ssh-sk-helper, X_OK) to provide friendly
error message for misconfigured helper paths
OpenBSD-Commit-ID: 061bcc262155d12e726305c91394ac0aaf1f8341
Diffstat (limited to 'ssh-sk-client.c')
| -rw-r--r-- | ssh-sk-client.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/ssh-sk-client.c b/ssh-sk-client.c index 9121570d..359327b6 100644 --- a/ssh-sk-client.c +++ b/ssh-sk-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-sk-client.c,v 1.5 2020/01/10 23:43:26 djm Exp $ */ +/* $OpenBSD: ssh-sk-client.c,v 1.6 2020/01/21 07:07:31 djm Exp $ */ /* * Copyright (c) 2019 Google LLC * @@ -21,6 +21,7 @@ #include <sys/socket.h> #include <sys/wait.h> +#include <fcntl.h> #include <limits.h> #include <errno.h> #include <signal.h> @@ -56,6 +57,13 @@ start_helper(int *fdp, pid_t *pidp, void (**osigchldp)(int)) helper = getenv("SSH_SK_HELPER"); if (helper == NULL || strlen(helper) == 0) helper = _PATH_SSH_SK_HELPER; + if (access(helper, X_OK) != 0) { + oerrno = errno; + error("%s: helper \"%s\" unusable: %s", __func__, helper, + strerror(errno)); + errno = oerrno; + return SSH_ERR_SYSTEM_ERROR; + } #ifdef DEBUG_SK verbosity = "-vvv"; #endif |