diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2021-10-22 12:51:57 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2021-10-22 13:03:05 +0200 |
| commit | 22b2681d88619e5247dc53c9f112058a7e248d48 (patch) | |
| tree | 2add94abca4be498f5468abddd857756c3c1d0c9 /addr.c | |
| parent | upstream: Remove unnecessary semicolons (diff) | |
| download | openssh-22b2681d88619e5247dc53c9f112058a7e248d48.tar.xz openssh-22b2681d88619e5247dc53c9f112058a7e248d48.zip | |
upstream: Plug mem addrinfo mem leaks.
Prevent mem leaks in the (unlikely) event that getaddrinfo returns
no addresses. ALso, remove an unneeded NULL check in addr_ntop. From
khaleesicodes via github PR#281, ok deraadt@
OpenBSD-Commit-ID: e8a5afc686376637c355c5f7e122dc4b080b9c1a
Diffstat (limited to 'addr.c')
| -rw-r--r-- | addr.c | 22 |
1 files changed, 17 insertions, 5 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: addr.c,v 1.3 2021/10/22 09:22:04 dtucker Exp $ */ +/* $OpenBSD: addr.c,v 1.4 2021/10/22 10:51:57 dtucker Exp $ */ /* * Copyright (c) 2004-2008 Damien Miller <djm@mindrot.org> @@ -312,9 +312,14 @@ addr_pton(const char *p, struct xaddr *n) if (p == NULL || getaddrinfo(p, NULL, &hints, &ai) != 0) return -1; - if (ai == NULL || ai->ai_addr == NULL) + if (ai == NULL) return -1; + if (ai->ai_addr == NULL) { + freeaddrinfo(ai); + return -1; + } + if (n != NULL && addr_sa_to_xaddr(ai->ai_addr, ai->ai_addrlen, n) == -1) { freeaddrinfo(ai); @@ -336,12 +341,19 @@ addr_sa_pton(const char *h, const char *s, struct sockaddr *sa, socklen_t slen) if (h == NULL || getaddrinfo(h, s, &hints, &ai) != 0) return -1; - if (ai == NULL || ai->ai_addr == NULL) + if (ai == NULL) return -1; + if (ai->ai_addr == NULL) { + freeaddrinfo(ai); + return -1; + } + if (sa != NULL) { - if (slen < ai->ai_addrlen) + if (slen < ai->ai_addrlen) { + freeaddrinfo(ai); return -1; + } memcpy(sa, &ai->ai_addr, ai->ai_addrlen); } @@ -357,7 +369,7 @@ addr_ntop(const struct xaddr *n, char *p, size_t len) if (addr_xaddr_to_sa(n, _SA(&ss), &slen, 0) == -1) return -1; - if (n == NULL || p == NULL || len == 0) + if (p == NULL || len == 0) return -1; if (getnameinfo(_SA(&ss), slen, p, len, NULL, 0, NI_NUMERICHOST) == -1) |