Subject: + dynamic_debug-fix-ddebug_parse_query.patch added to -mm tree To: a.ryabinin@xxxxxxxxxxx,jbaron@xxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Fri, 24 Jan 2014 13:49:31 -0800 The patch titled Subject: dynamic_debug: fix ddebug_parse_query() has been added to the -mm tree. Its filename is dynamic_debug-fix-ddebug_parse_query.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/dynamic_debug-fix-ddebug_parse_query.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/dynamic_debug-fix-ddebug_parse_query.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrey Ryabinin <a.ryabinin@xxxxxxxxxxx> Subject: dynamic_debug: fix ddebug_parse_query() This fixes following scenario: $ echo 'file dynamic_debug.c line 1-123 +p' > /sys/kernel/debug/dynamic_debug/control -bash: echo: write error: Invalid argument $ dmesg | grep dynamic_debug dynamic_debug:ddebug_parse_query: last-line:123 < 1st-line:1 dynamic_debug:ddebug_parse_query: query parse failed Signed-off-by: Andrey Ryabinin <a.ryabinin@xxxxxxxxxxx> Cc: Jason Baron <jbaron@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- lib/dynamic_debug.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff -puN lib/dynamic_debug.c~dynamic_debug-fix-ddebug_parse_query lib/dynamic_debug.c --- a/lib/dynamic_debug.c~dynamic_debug-fix-ddebug_parse_query +++ a/lib/dynamic_debug.c @@ -352,8 +352,10 @@ static int ddebug_parse_query(char *word return -EINVAL; if (last) { /* range <first>-<last> */ - if (parse_lineno(last, &query->last_lineno) - < query->first_lineno) { + if (parse_lineno(last, &query->last_lineno) < 0) + return -EINVAL; + + if (query->last_lineno < query->first_lineno) { pr_err("last-line:%d < 1st-line:%d\n", query->last_lineno, query->first_lineno); _ Patches currently in -mm which might be from a.ryabinin@xxxxxxxxxxx are dynamic_debug-remove-wrong-error-message.patch dynamic_debug-fix-ddebug_parse_query.patch dynamic_debug-replace-obselete-simple_strtoul-with-kstrtouint.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html