diff options
| author |   florian <florian@openbsd.org> | 2018-10-15 11:30:37 +0000 |
|---|---|---|
| committer | florian <florian@openbsd.org> | 2018-10-15 11:30:37 +0000 |
| commit | 26386affd82fabd0413d11a8d122c19484c1217a (patch) | |
| tree | 1c495de8d70d0172c5eb3906b470fee9642e2406 /usr.sbin/switchctl/parser.c | |
| parent | struct sockaddr_storage is guaranteed to be large enough, no need to check (diff) | |
| download | wireguard-openbsd-26386affd82fabd0413d11a8d122c19484c1217a.tar.xz wireguard-openbsd-26386affd82fabd0413d11a8d122c19484c1217a.zip | |
struct sockaddr_storage is guaranteed to be large enough, no need to check
the size.
OK kn, deraadt
Diffstat (limited to 'usr.sbin/switchctl/parser.c')
| -rw-r--r-- | usr.sbin/switchctl/parser.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/usr.sbin/switchctl/parser.c b/usr.sbin/switchctl/parser.c index adb42f33ce9..02870e560bd 100644 --- a/usr.sbin/switchctl/parser.c +++ b/usr.sbin/switchctl/parser.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parser.c,v 1.8 2017/08/01 13:11:11 deraadt Exp $ */ +/* $OpenBSD: parser.c,v 1.9 2018/10/15 11:30:37 florian Exp $ */ /* * Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org> @@ -273,10 +273,6 @@ parse_addr(const char *word, struct sockaddr_storage *ss) hints.ai_family = PF_UNSPEC; hints.ai_flags = AI_NUMERICHOST; if (getaddrinfo(word, "0", &hints, &ai) == 0) { - if (ai->ai_addrlen > sizeof(*ss)) { - warnx("invalid address length"); - return (-1); - } memcpy(ss, ai->ai_addr, ai->ai_addrlen); ss->ss_len = ai->ai_addrlen; freeaddrinfo(ai); @@ -290,10 +286,6 @@ parse_addr(const char *word, struct sockaddr_storage *ss) hints.ai_flags = AI_ADDRCONFIG; if (getaddrinfo(word, "0", &hints, &ai) == 0) { /* Pick first name only */ - if (ai->ai_addrlen > sizeof(*ss)) { - warnx("invalid address length"); - return (-1); - } memcpy(ss, ai->ai_addr, ai->ai_addrlen); ss->ss_len = ai->ai_addrlen; freeaddrinfo(ai); |