mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-29 05:28:00 +00:00
Code Issues Releases Wiki Activity

Increase the BUFSIZ-long buffers

Browse Source 
The BUFSIZ value varies between platforms, it could be 8K on Linux and
512 bytes on mingw.  Make sure the buffers are always big enough for the
output data to prevent truncation of the output by appropriately
enlarging or sizing the buffers.
This commit is contained in:
Ondřej Surý 2022-07-14 13:48:45 +02:00 committed by Aram Sargsyan
parent f7066bb71a
commit b35861f1eb
6 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bin/named/server.c
View File

@ -14921,7 +14921,12 @@ named_server_signing(named_server_t *server, isc_lex_t *lex,
result = dns_rdataset_next(&privset))
{
dns_rdata_t priv = DNS_RDATA_INIT;
char output[BUFSIZ];
/*
* In theory, the output buffer could hold a full RDATA
* record which is 16-bit and then some text around
* it
*/
char output[UINT16_MAX + BUFSIZ];
isc_buffer_t buf;
dns_rdataset_current(&privset, &priv);

11
bin/tests/system/feature-test.c
View File

@ -11,6 +11,7 @@
* information regarding copyright ownership.
*/
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -22,14 +23,6 @@
#include <dns/edns.h>
#ifndef MAXHOSTNAMELEN
#ifdef HOST_NAME_MAX
#define MAXHOSTNAMELEN HOST_NAME_MAX
#else /* ifdef HOST_NAME_MAX */
#define MAXHOSTNAMELEN 256
#endif /* ifdef HOST_NAME_MAX */
#endif /* ifndef MAXHOSTNAMELEN */
static void
usage(void) {
fprintf(stderr, "usage: feature-test <arg>\n");
@ -91,7 +84,7 @@ main(int argc, char **argv) {
}
if (strcmp(argv[1], "--gethostname") == 0) {
char hostname[MAXHOSTNAMELEN];
char hostname[_POSIX_HOST_NAME_MAX + 1];
int n;
n = gethostname(hostname, sizeof(hostname));

2
lib/dns/adb.c
View File

@ -3010,7 +3010,7 @@ dns_adb_dumpquota(dns_adb_t *adb, isc_buffer_t **buf) {
entry = ISC_LIST_NEXT(entry, plink))
{
char addrbuf[ISC_NETADDR_FORMATSIZE];
char text[BUFSIZ];
char text[ISC_NETADDR_FORMATSIZE + BUFSIZ];
isc_netaddr_t netaddr;
if (entry->atr == 0.0 && entry->quota == adb->quota) {

3
lib/dns/private.c
View File

@ -383,7 +383,8 @@ dns_private_totext(dns_rdata_t *private, isc_buffer_t *buf) {
} else if (private->length == 5) {
unsigned char alg = private->data[0];
dns_keytag_t keyid = (private->data[2] | private->data[1] << 8);
char keybuf[BUFSIZ], algbuf[DNS_SECALG_FORMATSIZE];
char keybuf[DNS_SECALG_FORMATSIZE + BUFSIZ],
algbuf[DNS_SECALG_FORMATSIZE];
bool del = private->data[3];
bool complete = private->data[4];

3
lib/dns/resolver.c
View File

@ -11538,7 +11538,8 @@ dns_resolver_dumpquota(dns_resolver_t *res, isc_buffer_t **buf) {
for (fctxcount_t *fc = ISC_LIST_HEAD(bucket->list); fc != NULL;
fc = ISC_LIST_NEXT(fc, link))
{
char nb[DNS_NAME_FORMATSIZE], text[BUFSIZ];
char nb[DNS_NAME_FORMATSIZE],
text[DNS_NAME_FORMATSIZE + BUFSIZ];
if (fc->count < spill) {
continue;

3
lib/ns/client.c
View File

@ -12,6 +12,7 @@
*/
#include <inttypes.h>
#include <limits.h>
#include <stdbool.h>
#include <isc/aes.h>
@ -955,7 +956,7 @@ isc_result_t
ns_client_addopt(ns_client_t *client, dns_message_t *message,
dns_rdataset_t **opt) {
unsigned char ecs[ECS_SIZE];
char nsid[BUFSIZ], *nsidp = NULL;
char nsid[_POSIX_HOST_NAME_MAX + 1], *nsidp = NULL;
unsigned char cookie[COOKIE_SIZE];
isc_result_t result;
dns_view_t *view = NULL;