PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-06 04:31:29 +00:00
Code Issues Projects Releases Wiki Activity

Set limits on PCRE matches to avoid issues like #1147

Browse Source
This commit is contained in:
dmiller
2018-08-08 16:36:21 +00:00
parent 8ae3ee2c7c
commit 6d8bb6df22
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
service_scan.cc
View File

@@ -489,6 +489,15 @@ void ServiceProbeMatch::InitMatch(const char *matchtext, int lineno) {
if (pcre_errptr != NULL) if (pcre_errptr != NULL)
fatal("%s: failed to pcre_study regexp on line %d of nmap-service-probes: %s\n", __func__, lineno, pcre_errptr); fatal("%s: failed to pcre_study regexp on line %d of nmap-service-probes: %s\n", __func__, lineno, pcre_errptr);
// Set some limits to avoid evil match cases.
// These are flexible; if they cause problems, increase them.
#ifdef PCRE_ERROR_MATCHLIMIT
regex_extra->match_limit = 100000; // 100K
#endif
#ifdef PCRE_ERROR_RECURSIONLIMIT
regex_extra->match_limit_recursion = 10000; // 10K
#endif
free(modestr); free(modestr);
free(flags); free(flags);
@@ -568,6 +577,12 @@ const struct MatchDetails *ServiceProbeMatch::testMatch(const u8 *buf, int bufle
if (o.debugging || o.verbose > 1) if (o.debugging || o.verbose > 1)
error("Warning: Hit PCRE_ERROR_MATCHLIMIT when probing for service %s with the regex '%s'", servicename, matchstr); error("Warning: Hit PCRE_ERROR_MATCHLIMIT when probing for service %s with the regex '%s'", servicename, matchstr);
} else } else
#endif // PCRE_ERROR_MATCHLIMIT
#ifdef PCRE_ERROR_RECURSIONLIMIT
if (rc == PCRE_ERROR_RECURSIONLIMIT) {
if (o.debugging || o.verbose > 1)
error("Warning: Hit PCRE_ERROR_RECURSIONLIMIT when probing for service %s with the regex '%s'", servicename, matchstr);
} else
#endif // PCRE_ERROR_MATCHLIMIT #endif // PCRE_ERROR_MATCHLIMIT
if (rc != PCRE_ERROR_NOMATCH) { if (rc != PCRE_ERROR_NOMATCH) {
fatal("Unexpected PCRE error (%d) when probing for service %s with the regex '%s'", rc, servicename, matchstr); fatal("Unexpected PCRE error (%d) when probing for service %s with the regex '%s'", rc, servicename, matchstr);