From: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Date: Sun, 23 Apr 2017 17:23:43 +0000 (+0530)
Subject: kallsyms: Use bounded strnchr() when parsing string
X-Git-Tag: v4.12-rc1~104^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=17586188276980ff10d1244a35aeb31ae199705e;p=karo-tx-linux.git

kallsyms: Use bounded strnchr() when parsing string

When parsing for the <module:name> format, we use strchr() to look for
the separator, when we know that the module name can't be longer than
MODULE_NAME_LEN. Enforce the same using strnchr().

Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Reviewed-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Jessica Yu <jeyu@redhat.com>
---

diff --git a/kernel/module.c b/kernel/module.c
index 7eba6dea4f41..d3bd56ed3541 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -4017,7 +4017,7 @@ unsigned long module_kallsyms_lookup_name(const char *name)
 
 	/* Don't lock: we're in enough trouble already. */
 	preempt_disable();
-	if ((colon = strchr(name, ':')) != NULL) {
+	if ((colon = strnchr(name, MODULE_NAME_LEN, ':')) != NULL) {
 		if ((mod = find_module_all(name, colon - name, false)) != NULL)
 			ret = mod_find_symname(mod, colon+1);
 	} else {