From 3a5cc989025eefe03fda0552b253a4a8f015a761 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 12 Feb 2016 23:26:51 -0500 Subject: modprobe: only parse files that end in .conf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This matches behavior with kmod which has been the standard for a long time at this point. URL: https://bugs.busybox.net/8021 Reported-by: Jö Signed-off-by: Mike Frysinger --- modutils/modprobe.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'modutils') diff --git a/modutils/modprobe.c b/modutils/modprobe.c index ec490b74d..997ee3c67 100644 --- a/modutils/modprobe.c +++ b/modutils/modprobe.c @@ -220,8 +220,16 @@ static int FAST_FUNC config_file_action(const char *filename, parser_t *p; struct module_entry *m; int rc = TRUE; + const char *base, *ext; - if (bb_basename(filename)[0] == '.') + /* Skip files that begin with a ".". */ + base = bb_basename(filename); + if (base[0] == '.') + goto error; + + /* Skip files that do not end with a ".conf". */ + ext = strrchr(base, '.'); + if (ext == NULL || strcmp(ext + 1, "conf")) goto error; p = config_open2(filename, fopen_for_read); -- cgit v1.2.3