If the path refers to an absolute or relative path, do not check for the default include paths, eg. /etc/nftables/. Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=1040 Signed-off-by: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx> --- src/scanner.l | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/src/scanner.l b/src/scanner.l index 88669d0..6f1a551 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -611,6 +611,13 @@ err: return -1; } +static bool search_in_include_path(const char *filename) +{ + return (strncmp(filename, "./", strlen("./") != 0) && + strncmp(filename, "../", strlen("../") != 0) && + filename[0] != '/'); +} + int scanner_include_file(void *scanner, const char *filename, const struct location *loc) { @@ -622,13 +629,16 @@ int scanner_include_file(void *scanner, const char *filename, FILE *f; f = NULL; - for (i = 0; i < INCLUDE_PATHS_MAX; i++) { - if (include_paths[i] == NULL) - break; - snprintf(buf, sizeof(buf), "%s/%s", include_paths[i], filename); - f = fopen(buf, "r"); - if (f != NULL) - break; + if (search_in_include_path(filename)) { + for (i = 0; i < INCLUDE_PATHS_MAX; i++) { + if (include_paths[i] == NULL) + break; + snprintf(buf, sizeof(buf), "%s/%s", + include_paths[i], filename); + f = fopen(buf, "r"); + if (f != NULL) + break; + } } if (f == NULL) { f = fopen(filename, "r"); -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
