summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2015-12-01 23:29:24 +0000
committerDamien Miller <djm@mindrot.org>2015-12-04 15:14:58 +1100
commitd952162b3c158a8f23220587bb6c8fcda75da551 (patch)
tree4fbcbc74a2e9cc9ceb3116dabc0aeed93b5eaca5
parentf0191d7c8e76e30551084b79341886d9bb38e453 (diff)
upstream commit
basic pledge() for ssh-agent, more refinement needed Upstream-ID: 5b5b03c88162fce549e45e1b6dd833f20bbb5e13
-rw-r--r--ssh-agent.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/ssh-agent.c b/ssh-agent.c
index a335ea33..38879335 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-agent.c,v 1.204 2015/07/08 20:24:02 markus Exp $ */
+/* $OpenBSD: ssh-agent.c,v 1.205 2015/12/01 23:29:24 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1402,6 +1402,9 @@ skip:
signal(SIGTERM, cleanup_handler);
nalloc = 0;
+ if (pledge("stdio unix exec", NULL) != 0)
+ fatal("%s: pledge: %s", __progname, strerror(errno));
+
while (1) {
prepare_select(&readsetp, &writesetp, &max_fd, &nalloc, &tvp);
result = select(max_fd + 1, readsetp, writesetp, NULL, tvp);