diff options
| author | tb@openbsd.org <tb@openbsd.org> | 2016-07-11 21:38:13 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2016-07-14 11:27:56 +1000 |
| commit | 372807c2065c8572fdc6478b25cc5ac363743073 (patch) | |
| tree | cb47a54044ae9fe1c0fe356e640d6ef5be7b57e9 | |
| parent | e0453f3df64bf485c61c7eb6bd12893eee9fe2cd (diff) | |
upstream commit
Add missing "recvfd" pledge promise: Raf Czlonka reported
ssh coredumps when Control* keywords were set in ssh_config. This patch also
fixes similar problems with scp and sftp.
ok deraadt, looks good to millert
Upstream-ID: ca2099eade1ef3e87a79614fefa26a0297ad8a3b
| -rw-r--r-- | clientloop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clientloop.c b/clientloop.c index 9820455c..2272f24c 100644 --- a/clientloop.c +++ b/clientloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.284 2016/02/08 10:57:07 djm Exp $ */ +/* $OpenBSD: clientloop.c,v 1.285 2016/07/11 21:38:13 tb Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1512,7 +1512,7 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id) if (options.control_master && ! option_clear_or_none(options.control_path)) { debug("pledge: id"); - if (pledge("stdio rpath wpath cpath unix inet dns proc exec id tty", + if (pledge("stdio rpath wpath cpath unix inet dns recvfd proc exec id tty", NULL) == -1) fatal("%s pledge(): %s", __func__, strerror(errno)); |