From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965540AbbDQNwG (ORCPT ); Fri, 17 Apr 2015 09:52:06 -0400 Received: from smtprelay0199.hostedemail.com ([216.40.44.199]:52115 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965516AbbDQNv5 (ORCPT ); Fri, 17 Apr 2015 09:51:57 -0400 X-Session-Marker: 726F737465647440676F6F646D69732E6F7267 X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,rostedt@goodmis.org,:::::::::::::::::::::::,RULES_HIT:41:355:379:541:599:800:960:973:988:989:1260:1277:1311:1313:1314:1345:1359:1431:1437:1515:1516:1518:1534:1541:1593:1594:1711:1730:1747:1777:1792:2393:2553:2559:2562:2898:3138:3139:3140:3141:3142:3353:3622:3865:3866:3867:3868:3870:3871:3872:3873:3874:5007:6119:6261:6742:7875:8660:10004:10400:10848:10967:11026:11232:11658:11914:12517:12519:12555:12740:13069:13148:13230:13255:13311:13357:21080,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0 X-HE-Tag: books83_6804edfcd4408 X-Filterd-Recvd-Size: 3072 Date: Fri, 17 Apr 2015 09:51:53 -0400 From: Steven Rostedt To: Andrey Ryabinin Cc: Sasha Levin , linux-kernel@vger.kernel.org, Ingo Molnar , Andrew Morton , Arnaldo Carvalho de Melo , Namhyung Kim , Masami Hiramatsu , Mathieu Desnoyers , Guilherme Cox , Tony Luck , Xie XiuQi Subject: Re: [PATCH 07/18 v3] tracing: Add TRACE_DEFINE_ENUM() macro to map enums to their values Message-ID: <20150417095153.54953f33@gandalf.local.home> In-Reply-To: <20150417092902.630bcb95@gandalf.local.home> References: <20150403013802.220157513@goodmis.org> <20150403014123.997385206@goodmis.org> <552E661D.5060502@oracle.com> <20150415100549.09cabb59@gandalf.local.home> <552F0937.4010009@oracle.com> <20150416232116.39cd9f74@grimm.local.home> <5530852A.70202@oracle.com> <5530B9EA.9070203@samsung.com> <20150417092902.630bcb95@gandalf.local.home> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 17 Apr 2015 09:29:02 -0400 Steven Rostedt wrote: > On Fri, 17 Apr 2015 10:44:42 +0300 > Andrey Ryabinin wrote: > > > > And kasan is not needed to debug this further. > > Just stick WARN_ON(ptr > call->print_fmt + strlen(call->print_fmt)) into the 'for' loop in update_event_printk(). > > Thanks, although I think I found the bug with just inspection. I put in > WARN_ON(*ptr) at various locations to see if it triggers. Yep, that's the issue. Can you guys test this patch please: -- Steve diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index 39bcfc3f071d..97d454a4dbfb 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -1753,6 +1753,8 @@ static void update_event_printk(struct ftrace_event_call *call, ptr++; /* Check for alpha chars like ULL */ } while (isalnum(*ptr)); + if (!*ptr) + break; /* * A number must have some kind of delimiter after * it, and we can ignore that too. @@ -1779,12 +1781,16 @@ static void update_event_printk(struct ftrace_event_call *call, do { ptr++; } while (isalnum(*ptr) || *ptr == '_'); + if (!*ptr) + break; /* * If what comes after this variable is a '.' or * '->' then we can continue to ignore that string. */ if (*ptr == '.' || (ptr[0] == '-' && ptr[1] == '>')) { ptr += *ptr == '.' ? 1 : 2; + if (!*ptr) + break; goto skip_more; } /*