aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2024-04-30 05:53:03 +0000
committerDamien Miller <djm@mindrot.org>2024-04-30 15:53:26 +1000
commit2e69a724051488e3fb3cd11531c4b5bc1764945b (patch)
tree3d106477cec4db155dd54d7464ae2fe9e4f13289
parentda757b022bf18c6f7d04e685a10cd96ed00f83da (diff)
downloadopenssh-2e69a724051488e3fb3cd11531c4b5bc1764945b.tar.gz
upstream: stricter validation of messaging socket fd number; disallow
usage of stderr. Based on GHPR492 by RealHurrison OpenBSD-Commit-ID: 73dbbe82ea16f73ce1d044d3232bc869ae2f2ce8
-rw-r--r--ssh-keysign.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-keysign.c b/ssh-keysign.c
index c54a4bbb7..968344e79 100644
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keysign.c,v 1.73 2024/01/11 01:51:16 djm Exp $ */
+/* $OpenBSD: ssh-keysign.c,v 1.74 2024/04/30 05:53:03 djm Exp $ */
/*
* Copyright (c) 2002 Markus Friedl. All rights reserved.
*
@@ -268,7 +268,7 @@ main(int argc, char **argv)
__progname, rver, version);
if ((r = sshbuf_get_u32(b, (u_int *)&fd)) != 0)
fatal_r(r, "%s: buffer error", __progname);
- if (fd < 0 || fd == STDIN_FILENO || fd == STDOUT_FILENO)
+ if (fd <= STDERR_FILENO)
fatal("%s: bad fd = %d", __progname, fd);
if ((host = get_local_name(fd)) == NULL)
fatal("%s: cannot get local name for fd", __progname);