summaryrefslogtreecommitdiff
path: root/sshconnect.c
diff options
context:
space:
mode:
authorflorian@openbsd.org <florian@openbsd.org>2018-10-15 11:28:50 +0000
committerDamien Miller <djm@mindrot.org>2018-10-22 10:58:06 +1100
commit83b3d99d2b47321b7ebb8db6f6ea04f3808bc069 (patch)
tree14e8a2c7473840ad4c84fc532981e71a27c8a3de /sshconnect.c
parentaede1c34243a6f7feae2fb2cb686ade5f9be6f3d (diff)
upstream: struct sockaddr_storage is guaranteed to be large enough,
no need to check the size. OK kn, deraadt OpenBSD-Commit-ID: 0aa56e92eb49c79f495b31a5093109ec5841f439
Diffstat (limited to 'sshconnect.c')
-rw-r--r--sshconnect.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sshconnect.c b/sshconnect.c
index 6d819279e..52c328111 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshconnect.c,v 1.305 2018/09/20 03:30:44 djm Exp $ */ 1/* $OpenBSD: sshconnect.c,v 1.306 2018/10/15 11:28:50 florian Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -369,10 +369,6 @@ ssh_create_socket(struct addrinfo *ai)
369 error("getaddrinfo: no addrs"); 369 error("getaddrinfo: no addrs");
370 goto fail; 370 goto fail;
371 } 371 }
372 if (res->ai_addrlen > sizeof(bindaddr)) {
373 error("%s: addr doesn't fit", __func__);
374 goto fail;
375 }
376 memcpy(&bindaddr, res->ai_addr, res->ai_addrlen); 372 memcpy(&bindaddr, res->ai_addr, res->ai_addrlen);
377 bindaddrlen = res->ai_addrlen; 373 bindaddrlen = res->ai_addrlen;
378 } else if (options.bind_interface != NULL) { 374 } else if (options.bind_interface != NULL) {