- deraadt@cvs.openbsd.org 2002/06/28 10:08:25

     [sshd.c]
     range check -u option at invocation

2 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 4b093dae7..cad81cab6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,9 @@
    - deraadt@cvs.openbsd.org 2002/06/28 01:50:37
      [monitor_wrap.c]
      use ssize_t
+   - deraadt@cvs.openbsd.org 2002/06/28 10:08:25
+     [sshd.c]
+     range check -u option at invocation
 
 20020702
  - (djm) Use PAM_MSG_MEMBER for PAM_TEXT_INFO messages, use xmalloc & 
@@ -1232,4 +1235,4 @@
  - (stevesk) entropy.c: typo in debug message
  - (djm) ssh-keygen -i needs seeded RNG; report from markus@
 
-$Id: ChangeLog,v 1.2321 2002/07/04 00:09:26 mouring Exp $
+$Id: ChangeLog,v 1.2322 2002/07/04 00:10:34 mouring Exp $
diff --git a/sshd.c b/sshd.c
index d2524c4bc..21db6d5cf 100644
--- a/sshd.c
+++ b/sshd.c
@@ -42,7 +42,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.251 2002/06/25 18:51:04 markus Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.252 2002/06/28 10:08:25 deraadt Exp $");
 
 #include <openssl/dh.h>
 #include <openssl/bn.h>
@@ -906,6 +906,8 @@ main(int ac, char **av)
                         break;
                 case 'u':
                         utmp_len = atoi(optarg);
+                        if (utmp_len < 0 || utmp_len > MAXHOSTNAMELEN)
+                                usage();
                         break;
                 case 'o':
                         if (process_server_config_line(&options, optarg,