mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-02 07:35:26 +00:00
Code Issues Releases Wiki Activity

2496. [bug] Add sanity length checks to NSID option. [RT #18813]

Browse Source
This commit is contained in:
Mark Andrews
2008-11-16 20:57:55 +00:00
parent 49960a74b5
commit 81e5de1741
3 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
bin/named/client.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: client.c,v 1.258 2008/06/23 19:41:18 jinmei Exp $ */
/* $Id: client.c,v 1.259 2008/11/16 20:57:54 marka Exp $ */
#include <config.h>
@@ -1222,7 +1222,7 @@ client_addopt(ns_client_t *client) {
* + 2 bytes for NSID length
* + NSID itself
*/
char nsid[BUFSIZ];
char nsid[BUFSIZ], *nsidp;
isc_buffer_t *buffer = NULL;
if (ns_g_server->server_usehostname) {
@@ -1231,19 +1231,19 @@ client_addopt(ns_client_t *client) {
if (result != ISC_R_SUCCESS) {
goto no_nsid;
}
} else {
strncpy(nsid, ns_g_server->server_id, sizeof(nsid));
}
nsidp = nsid;
} else
nsidp = ns_g_server->server_id;
rdata->length = strlen(nsid) + 4;
rdata->length = strlen(nsidp) + 4;
result = isc_buffer_allocate(client->mctx, &buffer,
rdata->length);
if (result != ISC_R_SUCCESS)
goto no_nsid;
isc_buffer_putuint16(buffer, DNS_OPT_NSID);
isc_buffer_putuint16(buffer, strlen(nsid));
isc_buffer_putstr(buffer, nsid);
isc_buffer_putuint16(buffer, strlen(nsidp));
isc_buffer_putstr(buffer, nsidp);
rdata->data = buffer->base;
dns_message_takebuffer(client->message, &buffer);
} else {