From 372807c2065c8572fdc6478b25cc5ac363743073 Mon Sep 17 00:00:00 2001 From: "tb@openbsd.org" Date: Mon, 11 Jul 2016 21:38:13 +0000 Subject: 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 --- clientloop.c | 4 ++-- 1 file 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 * Copyright (c) 1995 Tatu Ylonen , 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)); -- cgit v1.2.3