DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com AA5391555A
Date: Mon, 24 Apr 2017 14:27:07 -0700
From: Jessica Yu <jeyu@redhat.com>
To: "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>,
        Michael Ellerman <mpe@ellerman.id.au>,
        Masami Hiramatsu <mhiramat@kernel.org>, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] kallsyms: Use bounded strnchr() when parsing string
Message-ID: <20170424212706.mp6vfa4dbgep3kzw@jeyu>
References: <20170423172343.12739-1-naveen.n.rao@linux.vnet.ibm.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Disposition: inline
In-Reply-To: <20170423172343.12739-1-naveen.n.rao@linux.vnet.ibm.com>
User-Agent: NeoMutt/20161126 (1.7.1)
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 955
Lines: 31

+++ Naveen N. Rao [23/04/17 22:53 +0530]:
>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>

Applied, thanks!

Jessica

>---
> kernel/module.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>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 {
>-- 
>2.12.1
>