Blame SOURCES/ntp-4.2.6p5-cve-2015-5195.patch
|
|
6e16f6 |
diff -up ntp-4.2.6p5/ntpd/ntp_config.c.cve-2015-5195 ntp-4.2.6p5/ntpd/ntp_config.c
|
|
|
6e16f6 |
--- ntp-4.2.6p5/ntpd/ntp_config.c.cve-2015-5195 2015-08-20 12:14:23.911585026 +0200
|
|
|
6e16f6 |
+++ ntp-4.2.6p5/ntpd/ntp_config.c 2015-08-20 12:15:14.850462173 +0200
|
|
|
6e16f6 |
@@ -2019,6 +2019,13 @@ config_monitor(
|
|
|
6e16f6 |
while (pfilegen_token != NULL) {
|
|
|
6e16f6 |
filegen_string = keyword(*pfilegen_token);
|
|
|
6e16f6 |
filegen = filegen_get(filegen_string);
|
|
|
6e16f6 |
+ if (NULL == filegen) {
|
|
|
6e16f6 |
+ msyslog(LOG_ERR,
|
|
|
6e16f6 |
+ "stats %s unrecognized",
|
|
|
6e16f6 |
+ filegen_string);
|
|
|
6e16f6 |
+ pfilegen_token = next_node(pfilegen_token);
|
|
|
6e16f6 |
+ continue;
|
|
|
6e16f6 |
+ }
|
|
|
6e16f6 |
|
|
|
6e16f6 |
DPRINTF(4, ("enabling filegen for %s statistics '%s%s'\n",
|
|
|
6e16f6 |
filegen_string, filegen->prefix,
|
|
|
6e16f6 |
@@ -2032,6 +2039,13 @@ config_monitor(
|
|
|
6e16f6 |
while (my_node != NULL) {
|
|
|
6e16f6 |
filegen_file = keyword(my_node->filegen_token);
|
|
|
6e16f6 |
filegen = filegen_get(filegen_file);
|
|
|
6e16f6 |
+ if (NULL == filegen) {
|
|
|
6e16f6 |
+ msyslog(LOG_ERR,
|
|
|
6e16f6 |
+ "filegen category '%s' unrecognized",
|
|
|
6e16f6 |
+ filegen_file);
|
|
|
6e16f6 |
+ my_node = next_node(my_node);
|
|
|
6e16f6 |
+ continue;
|
|
|
6e16f6 |
+ }
|
|
|
6e16f6 |
|
|
|
6e16f6 |
/* Initialize the filegen variables to their pre-configurtion states */
|
|
|
6e16f6 |
filegen_flag = filegen->flag;
|