- deraadt@cvs.openbsd.org 2004/05/11 19:01:43

     [auth.c auth2-none.c authfile.c channels.c monitor.c monitor_mm.c
     packet.c packet.h progressmeter.c session.c openbsd-compat/xmmap.c]
     improve some code lint did not like; djm millert ok

1 files changed, 8 insertions, 3 deletions

diff --git a/auth2-none.c b/auth2-none.c
index c342addec..2bf5b5c80 100644
--- a/auth2-none.c
+++ b/auth2-none.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth2-none.c,v 1.6 2003/08/26 09:58:43 markus Exp $");
+RCSID("$OpenBSD: auth2-none.c,v 1.7 2004/05/11 19:01:43 deraadt Exp $");
 
 #include "auth.h"
 #include "xmalloc.h"
@@ -46,7 +46,7 @@ auth2_read_banner(void)
 {
         struct stat st;
         char *banner = NULL;
-        off_t len, n;
+        size_t len, n;
         int fd;
 
         if ((fd = open(options.banner, O_RDONLY)) == -1)
@@ -55,7 +55,12 @@ auth2_read_banner(void)
                 close(fd);
                 return (NULL);
         }
-        len = st.st_size;
+        if (st.st_size > 1*1024*1024) {
+                close(fd);
+                return (NULL);
+        }
+
+        len = (size_t)st.st_size;               /* truncate */
         banner = xmalloc(len + 1);
         n = atomicio(read, fd, banner, len);
         close(fd);