Messages in this thread | | | Date | Fri, 30 Apr 2021 07:42:52 +0200 | From | Greg Kroah-Hartman <> | Subject | Re: [PATCH] dyndbg: fix parsing file query without a line-range suffix |
| |
On Thu, Apr 29, 2021 at 05:08:28PM -0400, Jason Baron wrote: > > > On 4/26/21 12:38 PM, Eric Dumazet wrote: > > > > > > On 4/14/21 11:24 PM, Shuo Chen wrote: > >> From: Shuo Chen <shuochen@google.com> > >> > >> Query like 'file tcp_input.c line 1234 +p' was broken by > >> commit aaebe329bff0 ("dyndbg: accept 'file foo.c:func1' and 'file > >> foo.c:10-100'") because a file name without a ':' now makes the loop in > >> ddebug_parse_query() exits early before parsing the 'line 1234' part. > >> As a result, all pr_debug() in tcp_input.c will be enabled, instead of only > >> the one on line 1234. Changing 'break' to 'continue' fixes this. > >> > >> Fixes: aaebe329bff0 ("dyndbg: accept 'file foo.c:func1' and 'file foo.c:10-100'") > >> Signed-off-by: Shuo Chen <shuochen@google.com> > >> --- > >> lib/dynamic_debug.c | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > >> > >> diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c > >> index c70d6347afa2..921d0a654243 100644 > >> --- a/lib/dynamic_debug.c > >> +++ b/lib/dynamic_debug.c > >> @@ -396,7 +396,7 @@ static int ddebug_parse_query(char *words[], int nwords, > >> /* tail :$info is function or line-range */ > >> fline = strchr(query->filename, ':'); > >> if (!fline) > >> - break; > >> + continue; > >> *fline++ = '\0'; > >> if (isalpha(*fline) || *fline == '*' || *fline == '?') { > >> /* take as function name */ > >> > > > > SGTM, thanks ! > > > > Reviewed-by: Eric Dumazet <edumazet@google.com> > > > > Hi Greg, > > I acked this previously and is an important fix. > Can you please pick it up if you haven't done so?
Will do, sorry for the delay.
greg k-h
| |