diff options
| author | Eric Faurot <eric@cvs.openbsd.org> | 2018-08-29 17:56:18 +0000 |
|---|---|---|
| committer | Eric Faurot <eric@cvs.openbsd.org> | 2018-08-29 17:56:18 +0000 |
| commit | 4c8e5a0c1638b02581ad9a2caafc81aea17d81b5 (patch) | |
| tree | 146cdb9f1b2b987acac25d07ec3b392c8a0846ac /usr.sbin | |
| parent | e1a19d7953c6f0e56b51307e78e9541f93bdc71c (diff) | |
clean up the imsg structure for getnameinfo lookup results.
fix a crash with ill-configured reverse address.
found by jturner@
ok jturner@ gilles@
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/smtpd/resolver.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/usr.sbin/smtpd/resolver.c b/usr.sbin/smtpd/resolver.c index fbb6ee03d78..c906cea9899 100644 --- a/usr.sbin/smtpd/resolver.c +++ b/usr.sbin/smtpd/resolver.c @@ -1,4 +1,4 @@ -/* $OpenBSD: resolver.c,v 1.1 2018/07/25 16:00:48 eric Exp $ */ +/* $OpenBSD: resolver.c,v 1.2 2018/08/29 17:56:17 eric Exp $ */ /* * Copyright (c) 2017-2018 Eric Faurot <eric@openbsd.org> @@ -207,8 +207,6 @@ resolver_dispatch_request(struct mproc *proc, struct imsg *imsg) m_create(proc, IMSG_GETNAMEINFO, reqid, 0, -1); m_add_int(proc, EAI_SYSTEM); m_add_int(proc, save_errno); - m_add_string(proc, ""); - m_add_string(proc, ""); m_close(proc); break; @@ -286,13 +284,15 @@ resolver_dispatch_result(struct mproc *proc, struct imsg *imsg) case IMSG_GETNAMEINFO: m_get_int(&m, &gai_errno); m_get_int(&m, &errno); - m_get_string(&m, &host); - m_get_string(&m, &serv); + if (gai_errno == 0) { + m_get_string(&m, &host); + m_get_string(&m, &serv); + } m_end(&m); SPLAY_REMOVE(reqtree, &reqs, req); - req->cb_ni(req->arg, gai_errno, host[0] ? host : NULL, - serv[0] ? serv : NULL); + req->cb_ni(req->arg, gai_errno, gai_errno ? NULL : host, + gai_errno ? NULL : serv); free(req); break; } @@ -344,8 +344,10 @@ resolver_getnameinfo_cb(struct asr_result *ar, void *arg) m_create(s->proc, IMSG_GETNAMEINFO, s->reqid, 0, -1); m_add_int(s->proc, ar->ar_gai_errno); m_add_int(s->proc, ar->ar_errno); - m_add_string(s->proc, s->host ? s->host : ""); - m_add_string(s->proc, s->serv ? s->serv : ""); + if (ar->ar_gai_errno == 0) { + m_add_string(s->proc, s->host); + m_add_string(s->proc, s->serv); + } m_close(s->proc); free(s->host); |