diff options
| author | semarie@openbsd.org <semarie@openbsd.org> | 2015-12-03 17:00:18 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-12-04 15:14:59 +1100 |
| commit | b91926a97620f3e51761c271ba57aa5db790f48d (patch) | |
| tree | ab1f30a7c36b682e33e97ef4dfa852c4abc7f734 /mux.c | |
| parent | bcce47466bbc974636f588b5e4a9a18ae386f64a (diff) | |
| download | openssh-git-b91926a97620f3e51761c271ba57aa5db790f48d.tar.gz | |
upstream commit
pledges ssh client: - mux client: which is used when
ControlMaster is in use. will end with "stdio proc tty" (proc is to
permit sending SIGWINCH to mux master on window resize)
- client loop: several levels of pledging depending of your used options
ok deraadt@
Upstream-ID: 21676155a700e51f2ce911e33538e92a2cd1d94b
Diffstat (limited to 'mux.c')
| -rw-r--r-- | mux.c | 11 |
1 files changed, 10 insertions, 1 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: mux.c,v 1.55 2015/10/15 23:51:40 djm Exp $ */ +/* $OpenBSD: mux.c,v 1.56 2015/12/03 17:00:18 semarie Exp $ */ /* * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> * @@ -1851,6 +1851,9 @@ mux_client_request_session(int fd) mm_send_fd(fd, STDERR_FILENO) == -1) fatal("%s: send fds failed", __func__); + if (pledge("stdio proc tty", NULL) == -1) + fatal("%s pledge(): %s", __func__, strerror(errno)); + debug3("%s: session request sent", __func__); /* Read their reply */ @@ -1996,6 +1999,9 @@ mux_client_request_stdio_fwd(int fd) mm_send_fd(fd, STDOUT_FILENO) == -1) fatal("%s: send fds failed", __func__); + if (pledge("stdio proc tty", NULL) == -1) + fatal("%s pledge(): %s", __func__, strerror(errno)); + debug3("%s: stdio forward request sent", __func__); /* Read their reply */ @@ -2159,6 +2165,9 @@ muxclient(const char *path) } set_nonblock(sock); + if (pledge("stdio sendfd proc tty", NULL) == -1) + fatal("%s pledge(): %s", __func__, strerror(errno)); + if (mux_client_hello_exchange(sock) != 0) { error("%s: master hello exchange failed", __func__); close(sock); |