[openssh-commits] [openssh] 01/01: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch V_7_3
in repository openssh.

commit 9295c18a4436ec98c67ad61fe3919522936c9ef1
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Sun Aug 28 22:28:12 2016 +0000

    upstream commit
    
    fix uninitialised optlen in getsockopt() call; harmless
    on Unix/BSD but potentially crashy on Cygwin. Reported by James Slepicka ok
    deraadt@
    
    Upstream-ID: 1987ccee508ba5b18f016c85100d7ac3f70ff965
---
 sshd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sshd.c b/sshd.c
index 9fc829a..e42e467 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1486,8 +1486,8 @@ check_ip_options(struct ssh *ssh)
 #ifdef IP_OPTIONS
 	int sock_in = ssh_packet_get_connection_in(ssh);
 	struct sockaddr_storage from;
-	socklen_t option_size, i, fromlen = sizeof(from);
 	u_char opts[200];
+	socklen_t i, option_size = sizeof(opts), fromlen = sizeof(from);
 	char text[sizeof(opts) * 3 + 1];
 
 	memset(&from, 0, sizeof(from));

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.