Anders & Thor Eivind reported dhcpd-pools to mess console and
crash at the end of execution. Reason was missing boundary check.
The fix this time is more of less just a increase to max numbers.
That will work ot some extent.
The memory allocations has to be made fully dynamic, but that is
a little bit difficult with the way default.h and parse_config
are working. Basically problem is globals gone crazy & re-entrant
issue with parse function. The true fix to the issue will have to
wait for complete redesign of internals of the command.
Reported-by: Anders LĂ„stad <ala@nextgentel.com>
Reported-by: Thor Eivind Brantzeg <tbr@nextgentel.com>
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
static const int MAXLEN = 1024;
/* Total number of characters in all shared network names */
static const int MAXLEN = 1024;
/* Total number of characters in all shared network names */
-static const int SHARED_NETWORKS_NAMES = 24576;
+static const int SHARED_NETWORKS_NAMES = 65536;
/* Maximum number of shared networks */
/* Maximum number of shared networks */
-static const int SHARED_NETWORKS = 1024;
+static const int SHARED_NETWORKS = 8192;
/* Maximum number of ranges */
static const unsigned int RANGES = 65536;
/* Maximum number of ranges */
static const unsigned int RANGES = 65536;
num_ranges++;
if (RANGES < num_ranges) {
errx(EXIT_FAILURE,
num_ranges++;
if (RANGES < num_ranges) {
errx(EXIT_FAILURE,
- "parse_config: Range space full! Increase RANGES and recompile.");
+ "parse_config: increase default.h RANGES and recompile.");
}
newclause = true;
break;
}
newclause = true;
break;
* away by reallocationg
* more space. */
errx(EXIT_FAILURE,
* away by reallocationg
* more space. */
errx(EXIT_FAILURE,
- "parse_config: End of shared-network space, increase SHARED_NETWORKS_NAMES and recompile");
+ "parse_config: increase default.h SHARED_NETWORKS_NAMES and recompile");
+ if (SHARED_NETWORKS < num_shared_networks) {
+ /* FIXME: make this go
+ * away by reallocationg
+ * more space. */
+ errx(EXIT_FAILURE,
+ "parse_config: increase default.h SHARED_NETWORKS and recompile");
+ }
argument = 0;
braces_shared = braces;
break;
argument = 0;
braces_shared = braces;
break;