]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream commit V_7_3 anongit/V_7_3 github-selfhosted/V_7_3 github/V_7_3
authordjm@openbsd.org <djm@openbsd.org>
Sun, 28 Aug 2016 22:28:12 +0000 (22:28 +0000)
committerDamien Miller <djm@mindrot.org>
Mon, 29 Aug 2016 01:23:24 +0000 (11:23 +1000)
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

diff --git a/sshd.c b/sshd.c
index 9fc829a91bc8fba32c69892267fc5adc2865f97c..e42e4674fa7df9b086f828c15ee1d80c10cba2e0 100644 (file)
--- 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));