ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

fix a crash from using an empty string for "include"

Browse Source 
the parser could crash when "include" specified an empty string in place
of the filename. this has been fixed by returning ISC_R_FILENOTFOUND
when the string length is 0.
This commit is contained in:
Evan Hunt
2023-02-21 14:31:58 -08:00
parent 7aa0ee4f5e
commit 4dfc3f056d
2 changed files with 49 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bin/tests/system/checkconf/bad-empty-include.conf Normal file
View File

@@ -0,0 +1,14 @@
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
*
* SPDX-License-Identifier: MPL-2.0
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, you can obtain one at https://mozilla.org/MPL/2.0/.
*
* See the COPYRIGHT file distributed with this work for additional
* information regarding copyright ownership.
*/
include "";

47
lib/isccfg/parser.c
View File

@@ -41,6 +41,7 @@
#include <ctype.h>
#include <errno.h>
#include <glob.h>
#include <inttypes.h>
#include <stdbool.h>
#include <stdlib.h>
@@ -50,7 +51,6 @@
#include <isc/dir.h>
#include <isc/errno.h>
#include <isc/formatcheck.h>
#include <isc/glob.h>
#include <isc/lex.h>
#include <isc/log.h>
#include <isc/mem.h>
@@ -2257,6 +2257,9 @@ cfg_parse_mapbody(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) {
* clause can occur.
*/
if (strcasecmp(TOKEN_STRING(pctx), "include") == 0) {
glob_t g;
int rc;
/*
* Turn the file name into a temporary configuration
* object just so that it is not overwritten by the
@@ -2266,19 +2269,39 @@ cfg_parse_mapbody(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) {
&includename));
CHECK(parse_semicolon(pctx));
/* Allow include to specify a pattern that follows
* the same rules as the shell e.g "/path/zone*.conf" */
glob_t glob_obj;
CHECK(isc_glob(includename->value.string.base,
&glob_obj));
cfg_obj_destroy(pctx, &includename);
for (size_t i = 0; i < glob_obj.gl_pathc; ++i) {
CHECK(parser_openfile(pctx,
glob_obj.gl_pathv[i]));
if (includename->value.string.length == 0) {
CHECK(ISC_R_FILENOTFOUND);
}
isc_globfree(&glob_obj);
/*
* Allow include to specify a pattern that follows
* the same rules as the shell e.g "/path/zone*.conf"
*/
rc = glob(cfg_obj_asstring(includename), GLOB_ERR, NULL,
&g);
switch (rc) {
case 0:
break;
case GLOB_NOMATCH:
CHECK(ISC_R_FILENOTFOUND);
break;
case GLOB_NOSPACE:
CHECK(ISC_R_NOMEMORY);
break;
default:
if (errno == 0) {
CHECK(ISC_R_IOERROR);
}
CHECK(isc_errno_toresult(errno));
}
for (size_t i = 0; i < g.gl_pathc; ++i) {
CHECK(parser_openfile(pctx, g.gl_pathv[i]));
}
cfg_obj_destroy(pctx, &includename);
globfree(&g);
goto redo;
}