Mercurial > hg > nginx
changeset 5472:ab493c60d9ff
Resolver: fixes in PTR processing.
Verify that class of RR is "IN".
Verify that RR data length is non-zero.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Fri, 06 Dec 2013 14:30:27 +0400 |
parents | 9c96782d9d05 |
children | d39ef821d03e |
files | src/core/ngx_resolver.c |
diffstat | 1 files changed, 12 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_resolver.c Fri Dec 06 14:30:27 2013 +0400 +++ b/src/core/ngx_resolver.c Fri Dec 06 14:30:27 2013 +0400 @@ -1517,7 +1517,7 @@ int32_t ttl; ngx_int_t octet; ngx_str_t name; - ngx_uint_t i, mask, qident; + ngx_uint_t i, mask, qident, class; ngx_resolver_an_t *an; ngx_resolver_ctx_t *ctx, *next; ngx_resolver_node_t *rn; @@ -1526,7 +1526,7 @@ buf + sizeof(ngx_resolver_hdr_t), buf + n) != NGX_OK) { - goto invalid_in_addr_arpa; + return; } addr = 0; @@ -1599,7 +1599,7 @@ i += sizeof("\7in-addr\4arpa") + sizeof(ngx_resolver_qs_t); - if (i + 2 + sizeof(ngx_resolver_an_t) > n) { + if (i + 2 + sizeof(ngx_resolver_an_t) >= n) { goto short_response; } @@ -1612,10 +1612,17 @@ an = (ngx_resolver_an_t *) &buf[i + 2]; + class = (an->class_hi << 8) + an->class_lo; len = (an->len_hi << 8) + an->len_lo; ttl = (an->ttl[0] << 24) + (an->ttl[1] << 16) + (an->ttl[2] << 8) + (an->ttl[3]); + if (class != 1) { + ngx_log_error(r->log_level, r->log, 0, + "unexpected RR class %ui", class); + goto failed; + } + if (ttl < 0) { ttl = 0; } @@ -1623,7 +1630,7 @@ ngx_log_debug3(NGX_LOG_DEBUG_CORE, r->log, 0, "resolver qt:%ui cl:%ui len:%uz", (an->type_hi << 8) + an->type_lo, - (an->class_hi << 8) + an->class_lo, len); + class, len); i += 2 + sizeof(ngx_resolver_an_t); @@ -1632,7 +1639,7 @@ } if (ngx_resolver_copy(r, &name, buf, buf + i, buf + n) != NGX_OK) { - return; + goto failed; } ngx_log_debug1(NGX_LOG_DEBUG_CORE, r->log, 0, "resolver an:%V", &name);